diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckImgsDetailsDTO.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckImgsDetailsDTO.java new file mode 100644 index 000000000..cddeb428d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckImgsDetailsDTO.java @@ -0,0 +1,19 @@ +package com.elink.esua.epdc.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: esua-epdc + * @description: 待审核详情图片 + * @author: wangtong + * @create: 2020-07-13 14:32 + **/ +@Data +public class CheckImgsDetailsDTO implements Serializable { + + private static final long serialVersionUID = 889405718937714779L; + + private String url; +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckRecordsDTO.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckRecordsDTO.java index 07dee5a24..9c974fb94 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckRecordsDTO.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckRecordsDTO.java @@ -21,6 +21,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; +import java.util.List; /** * 待审核记录 @@ -85,9 +86,19 @@ public class CheckRecordsDTO implements Serializable { /** * 审核状态 + */ + private String checkState; + + /** + * 审核建议 */ private String suggestion; + /** + * 审核状态编码 + */ + private String suggestionCode; + /** * 检测结果分类 */ @@ -133,4 +144,6 @@ public class CheckRecordsDTO implements Serializable { */ private String auditTime; + private List imgUrls; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/CheckRecordsController.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/CheckRecordsController.java index de5f22dc0..29449ac14 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/CheckRecordsController.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/CheckRecordsController.java @@ -57,7 +57,7 @@ public class CheckRecordsController { @GetMapping("{id}") public Result get(@PathVariable("id") String id){ - CheckRecordsDTO data = checkRecordsService.get(id); + CheckRecordsDTO data = checkRecordsService.getDetails(id); return new Result().ok(data); } diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/HandleResultController.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/HandleResultController.java index fea54c21a..aba8c0b2e 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/HandleResultController.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/HandleResultController.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.service.CheckRecordsService; import com.elink.esua.epdc.service.ViolationsRecordsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -22,6 +23,9 @@ public class HandleResultController{ @Autowired private ViolationsRecordsService violationsRecordsService; + @Autowired + private CheckRecordsService checkRecordsService; + /** * @describe: 保存违规记录 * @author wangtong @@ -45,6 +49,6 @@ public class HandleResultController{ @PostMapping("insertRecords") public Result insertRecords(@RequestBody SaveCheckRecordsDTO formDto) { // ValidatorUtils.validateEntity(formDto); - return violationsRecordsService.insertRecords(formDto); + return checkRecordsService.insertRecords(formDto); } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/CheckRecordsDao.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/CheckRecordsDao.java index e461b3d46..0584a3836 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/CheckRecordsDao.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/CheckRecordsDao.java @@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.CheckRecordsDTO; import com.elink.esua.epdc.entity.CheckRecordsEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -42,4 +43,13 @@ public interface CheckRecordsDao extends BaseDao { * @return java.util.List */ List getCheckRecords(Map params); + + /** + * @describe: 待审核详情 + * @author wangtong + * @date 2020/7/13 14:13 + * @param [id] + * @return com.elink.esua.epdc.dto.CheckRecordsDTO + */ + CheckRecordsDTO getDetails(@Param("id") String id); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/CheckRecordsService.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/CheckRecordsService.java index 7c53eecb5..8abe09e7e 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/CheckRecordsService.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/CheckRecordsService.java @@ -19,6 +19,8 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.CheckRecordsDTO; import com.elink.esua.epdc.entity.CheckRecordsEntity; @@ -92,4 +94,22 @@ public interface CheckRecordsService extends BaseService { * @date 2020-07-03 */ void delete(String[] ids); + + /** + * @describe: 保存待审核记录 + * @author wangtong + * @date 2020/7/7 10:39 + * @param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result insertRecords(SaveCheckRecordsDTO formDto); + + /** + * @describe: 待审核详情 + * @author wangtong + * @date 2020/7/13 14:10 + * @param [id] + * @return com.elink.esua.epdc.dto.CheckRecordsDTO + */ + CheckRecordsDTO getDetails(String id); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/ViolationsRecordsService.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/ViolationsRecordsService.java index ccc2216c6..1727c0675 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/ViolationsRecordsService.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/ViolationsRecordsService.java @@ -104,14 +104,7 @@ public interface ViolationsRecordsService extends BaseService page(Map params) { IPage page = getPage(params); @@ -99,4 +105,17 @@ public class CheckRecordsServiceImpl extends BaseServiceImpl + and ecr.name like '%${name}%' + + + and ecr.CATEGORY = #{category} + + + + + + and ecr.CONTENT like '%${content}%' + + + and mo.DESCRIPTION like '%${module}%' + + + AND DATE_FORMAT( ecr.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} + order by st.SORT asc,ecr.CREATED_TIME desc + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml index 40c4ae35e..7c815afb6 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml @@ -99,6 +99,7 @@ left join epdc_check_code la on evr.LABEL=la.`CODE` left join epdc_violations_records_imgs img on img.REFERENCE_ID=evr.ID where evr.ID=#{id} + order by img.sort asc diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/ContentSecurityFeignClient.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/ContentSecurityFeignClient.java index 5caad7b1f..5a3654dba 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/ContentSecurityFeignClient.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/ContentSecurityFeignClient.java @@ -19,9 +19,9 @@ import org.springframework.web.bind.annotation.RequestBody; @FeignClient(name = ServiceConstant.EPDC_CONTENT_SECURITY_SERVER, fallback = ContentSecurityFeignClientFallback.class) public interface ContentSecurityFeignClient { - @PostMapping(value = "content-sercurity/handleResult/insertViolationsRecord", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + @PostMapping(value = "contentSecurity/handleResult/insertViolationsRecord", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result insertViolationsRecord(@RequestBody SaveCheckRecordsDTO record); - @PostMapping(value = "content-sercurity/handleResult/insertRecords", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + @PostMapping(value = "contentSecurity/handleResult/insertRecords", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result insertRecords(@RequestBody SaveCheckRecordsDTO record); } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/ContentSecurityFeignClient.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/ContentSecurityFeignClient.java index 5caad7b1f..5a3654dba 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/ContentSecurityFeignClient.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/ContentSecurityFeignClient.java @@ -19,9 +19,9 @@ import org.springframework.web.bind.annotation.RequestBody; @FeignClient(name = ServiceConstant.EPDC_CONTENT_SECURITY_SERVER, fallback = ContentSecurityFeignClientFallback.class) public interface ContentSecurityFeignClient { - @PostMapping(value = "content-sercurity/handleResult/insertViolationsRecord", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + @PostMapping(value = "contentSecurity/handleResult/insertViolationsRecord", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result insertViolationsRecord(@RequestBody SaveCheckRecordsDTO record); - @PostMapping(value = "content-sercurity/handleResult/insertRecords", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + @PostMapping(value = "contentSecurity/handleResult/insertRecords", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result insertRecords(@RequestBody SaveCheckRecordsDTO record); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/ContentSecurityFeignClient.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/ContentSecurityFeignClient.java index 5caad7b1f..5a3654dba 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/ContentSecurityFeignClient.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/ContentSecurityFeignClient.java @@ -19,9 +19,9 @@ import org.springframework.web.bind.annotation.RequestBody; @FeignClient(name = ServiceConstant.EPDC_CONTENT_SECURITY_SERVER, fallback = ContentSecurityFeignClientFallback.class) public interface ContentSecurityFeignClient { - @PostMapping(value = "content-sercurity/handleResult/insertViolationsRecord", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + @PostMapping(value = "contentSecurity/handleResult/insertViolationsRecord", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result insertViolationsRecord(@RequestBody SaveCheckRecordsDTO record); - @PostMapping(value = "content-sercurity/handleResult/insertRecords", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + @PostMapping(value = "contentSecurity/handleResult/insertRecords", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result insertRecords(@RequestBody SaveCheckRecordsDTO record); }