diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/form/HandleRecordsFormDTO.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/form/HandleRecordsFormDTO.java new file mode 100644 index 000000000..140f1e649 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/form/HandleRecordsFormDTO.java @@ -0,0 +1,33 @@ +package com.elink.esua.epdc.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: esua-epdc + * @description: 处理待审核记录 + * @author: wangtong + * @create: 2020-07-13 17:49 + **/ +@Data +public class HandleRecordsFormDTO implements Serializable { + + private static final long serialVersionUID = -9152257649225080975L; + + /** + * 待审核记录ID + */ + private String id; + + /** + * 处理操作:pass通过 + * block驳回 + */ + private String result; + + /** + * 审核意见 + */ + private String suggestion; +} \ 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/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 aba8c0b2e..a0f819fbb 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,7 +2,9 @@ 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.dto.form.HandleRecordsFormDTO; import com.elink.esua.epdc.service.CheckRecordsService; +import com.elink.esua.epdc.service.CheckResultService; import com.elink.esua.epdc.service.ViolationsRecordsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -26,6 +28,9 @@ public class HandleResultController{ @Autowired private CheckRecordsService checkRecordsService; + @Autowired + private CheckResultService checkResultService; + /** * @describe: 保存违规记录 * @author wangtong @@ -35,7 +40,6 @@ public class HandleResultController{ */ @PostMapping("insertViolationsRecord") public Result insertViolationsRecord(@RequestBody SaveCheckRecordsDTO formDto) { -// ValidatorUtils.validateEntity(formDto); return violationsRecordsService.insertViolationsRecord(formDto); } @@ -51,4 +55,16 @@ public class HandleResultController{ // ValidatorUtils.validateEntity(formDto); return checkRecordsService.insertRecords(formDto); } + + /** + * @describe: 处理待审核记录 + * @author wangtong + * @date 2020/7/13 17:48 + * @param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("handleRecords") + public Result handleRecords(@RequestBody HandleRecordsFormDTO formDto) { + return checkResultService.handleRecords(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/CheckRecordsImgsDao.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/CheckRecordsImgsDao.java index b76b24739..ecccca795 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/CheckRecordsImgsDao.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/CheckRecordsImgsDao.java @@ -20,6 +20,9 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.entity.CheckRecordsImgsEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 待审核图片信息 @@ -29,5 +32,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface CheckRecordsImgsDao extends BaseDao { - + + /** + * @describe: 根据待审核ID获取图片信息 + * @author wangtong + * @date 2020/7/13 19:35 + * @param [id] + * @return java.util.List + */ + List selectListByRecordId(@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/CheckResultService.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/CheckResultService.java index 10e43d2b5..9f00330d7 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/CheckResultService.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/CheckResultService.java @@ -19,7 +19,9 @@ 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.utils.Result; import com.elink.esua.epdc.dto.CheckResultDTO; +import com.elink.esua.epdc.dto.form.HandleRecordsFormDTO; import com.elink.esua.epdc.entity.CheckResultEntity; import java.util.List; @@ -92,4 +94,13 @@ public interface CheckResultService extends BaseService { * @date 2020-07-03 */ void delete(String[] ids); + + /** + * @describe: 处理待审核记录 + * @author wangtong + * @date 2020/7/13 17:53 + * @param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result handleRecords(HandleRecordsFormDTO 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/service/impl/CheckResultServiceImpl.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java index 2144342e7..853476889 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java @@ -20,22 +20,25 @@ package com.elink.esua.epdc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.dao.CheckResultDao; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dao.*; import com.elink.esua.epdc.dto.CheckResultDTO; -import com.elink.esua.epdc.entity.CheckResultEntity; +import com.elink.esua.epdc.dto.form.HandleRecordsFormDTO; +import com.elink.esua.epdc.entity.*; import com.elink.esua.epdc.redis.CheckResultRedis; import com.elink.esua.epdc.service.CheckResultService; +import com.elink.esua.epdc.service.ViolationsRecordsImgsService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 审核结果 @@ -49,6 +52,21 @@ public class CheckResultServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -101,4 +119,42 @@ public class CheckResultServiceImpl extends BaseServiceImpl vioImgList = new ArrayList<>(); + List recordImgs = checkRecordsImgsDao.selectListByRecordId(records.getId()); + for(CheckRecordsImgsEntity recordImg : recordImgs){ + ViolationsRecordsImgsEntity vioImgEntity = new ViolationsRecordsImgsEntity(); + vioImgEntity.setReferenceId(violationEntity.getId()); + vioImgEntity.setUrl(recordImg.getUrl()); + vioImgEntity.setSort(recordImg.getSort()); + vioImgList.add(vioImgEntity); + } + violationsRecordsImgsService.insertBatch(vioImgList); + } + return new Result<>().ok("处理成功"); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsImgsDao.xml b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsImgsDao.xml index b2d25889f..e2c870fbe 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsImgsDao.xml +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsImgsDao.xml @@ -15,6 +15,9 @@ + \ No newline at end of file