From a577a304acc47d576d9de10c12b9dc308f8068c2 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 8 Jul 2020 16:35:37 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E3=80=91-=E3=80=90=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E6=BB=A1=E6=84=8F=E5=BA=A6=E8=AF=84=E4=BB=B7=E3=80=91-?= =?UTF-8?q?=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/07/08?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index d7795f34b..6a774e54d 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -30,6 +30,11 @@ import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.redis.RedisKeys; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; +import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils; +import com.elink.esua.epdc.commons.tools.security.content.ModuleName; +import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO; +import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO; +import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.*; @@ -68,6 +73,7 @@ import com.elink.esua.epdc.modules.events.entity.ImgEntity; import com.elink.esua.epdc.modules.events.service.EpdcEventsService; import com.elink.esua.epdc.modules.events.service.ImgService; import com.elink.esua.epdc.modules.feign.AdminFeignClient; +import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; import com.elink.esua.epdc.modules.feign.OssFeignClient; import com.elink.esua.epdc.modules.interfacelog.entity.InterfaceLogEntity; import com.elink.esua.epdc.modules.interfacelog.service.InterfaceLogService; @@ -155,6 +161,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Autowired private OssFeignClient ossFeignClient; + @Autowired + private ContentSecurityFeignClient contentSecurityFeign; + @Override public PageData page(Map params) { @@ -300,12 +309,47 @@ public class ItemServiceImpl extends BaseServiceImpl implem public Result evaluation(EvaluationFormDTO evaluationFormDTO) { ItemEntity itemEntityResult = baseDao.selectById(evaluationFormDTO.getItemId()); if (itemEntityResult.getUserId().equals(evaluationFormDTO.getUserId()) && itemEntityResult.getEvaluationScore() == null) { + + //内容审核 + String userName = null; + if(null != SecurityUser.getUser()){ + userName = SecurityUser.getUser().getUsername(); + } + List textList = new ArrayList<>(); + textList.add(evaluationFormDTO.getEvaluationContent()); + CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); + if (contentResult != null && 200 == contentResult.getDetails().get(0).getCode()) { + if (!contentResult.getAllPass()) { + //组装要保存的信息 + SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), + userName,CheckDataUtils.cate_two , CheckDataUtils.decision_one, + ModuleName.ITEM_SATISFACTION.getCode(), textList,null, null,contentResult, + null,null); + contentSecurityFeign.insertViolationsRecord(record); + return new Result().error(CheckDataUtils.violations_message); + } + } else { + logger.error("解析审核结果异常:" + contentResult); + } + ItemEntity itemEntity = new ItemEntity(); itemEntity.setId(evaluationFormDTO.getItemId()); itemEntity.setEvaluationScore(evaluationFormDTO.getEvaluationScore()); itemEntity.setEvaluationContent(evaluationFormDTO.getEvaluationContent()); itemEntity.setEvaluationTime(new Date()); baseDao.updateById(itemEntity); + + //判断是否为待审核 + if (contentResult != null && 200 == contentResult.getDetails().get(0).getCode()) { + CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null); + if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { + //组装要保存的信息 + SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), + userName, CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, + null,itemEntity.getId(), null,null,twoTypes); + contentSecurityFeign.insertRecords(record); + } + }//如果是审核状态是pass,不作任何处理 return new Result(); } else { return new Result().error("您无法评价");