From ca41e26470010b6ff32b7fde2954657a43ad463d Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 14 Jul 2020 17:52:57 +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=E6=95=B4=E4=BD=93=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9=E3=80=91-=EF=BC=88?= =?UTF-8?q?=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/07/14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EventCommentServiceImpl.java | 22 ++++++++--------- .../service/impl/EpdcEventsServiceImpl.java | 24 +++++++------------ .../item/service/impl/ItemServiceImpl.java | 22 ++++++++--------- .../service/impl/TopicCommentServiceImpl.java | 22 ++++++++--------- .../topic/service/impl/TopicServiceImpl.java | 24 +++++++------------ .../service/impl/ActInfoServiceImpl.java | 24 +++++++------------ .../impl/ActUserClockLogServiceImpl.java | 24 +++++++------------ 7 files changed, 66 insertions(+), 96 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java index c95881d24..dce538d99 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java @@ -153,18 +153,16 @@ public class EventCommentServiceImpl extends BaseServiceImpl textList = new ArrayList<>(); textList.add(commentFormDTO.getContent()); CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); - if (contentResult != null && 200 == contentResult.getDetails().get(0).getCode()) { - if (!contentResult.getAllPass()) { - //组装要保存的信息 - SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(), - commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one, - ModuleName.ISSUE_COMMENT.getCode(), textList,null, null,contentResult, - null,null); - contentSecurityFeign.insertViolationsRecord(record); - return new Result().error(CheckDataUtils.violations_message); - } + if (contentResult != null && !contentResult.getAllPass()) { + //组装要保存的信息 + SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(), + commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one, + ModuleName.ISSUE_COMMENT.getCode(), textList,null, null,contentResult, + null,null); + contentSecurityFeign.insertViolationsRecord(record); + return new Result().error(CheckDataUtils.violations_message); } else { - logger.error("解析审核结果异常：" + contentResult); + logger.error("未进入违规信息记录：" + contentResult); } IssueEntity issueEntity = null; @@ -268,7 +266,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl implem 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); - } + if (contentResult != null && !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); + logger.error("未进入违规信息记录：" + contentResult); } ItemEntity itemEntity = new ItemEntity(); @@ -340,7 +338,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem baseDao.updateById(itemEntity); //判断是否为待审核 - if (contentResult != null && 200 == contentResult.getDetails().get(0).getCode()) { + if (contentResult != null) { CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null); if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { //组装要保存的信息 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java index 2e607332e..ed50f24bb 100755 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java @@ -134,18 +134,16 @@ public class TopicCommentServiceImpl extends BaseServiceImpl textList = new ArrayList<>(); textList.add(commentFormDTO.getContent()); CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); - if (contentResult != null && 200 == contentResult.getDetails().get(0).getCode()) { - if (!contentResult.getAllPass()) { - //组装要保存的信息 - SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(), - commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one, - ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList,null, null,contentResult, - null,null); - contentSecurityFeign.insertViolationsRecord(record); - return new Result().error(CheckDataUtils.violations_message); - } + if (contentResult != null && !contentResult.getAllPass()) { + //组装要保存的信息 + SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(), + commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one, + ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList,null, null,contentResult, + null,null); + contentSecurityFeign.insertViolationsRecord(record); + return new Result().error(CheckDataUtils.violations_message); } else { - logger.error("解析审核结果异常：" + contentResult); + logger.error("未进入违规信息记录：" + contentResult); } TopicCommentEntity commentEntity = new TopicCommentEntity(); @@ -210,7 +208,7 @@ public class TopicCommentServiceImpl extends BaseServiceImpl imp textList.add(formDto.getTopicContent()); CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); CheckResultDTO imgResult = CheckDataUtils.checkImgs(formDto.getImages()); - if (contentResult != null && imgResult != null - && 200 == contentResult.getDetails().get(0).getCode() - && 200 == imgResult.getDetails().get(0).getCode()) { - if (!contentResult.getAllPass() || !imgResult.getAllPass()) { - //组装要保存的信息 - SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(), - formDto.getNickname(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.GROUP_TOPIC.getCode(), textList, - formDto.getImages(), null,contentResult, imgResult,null); - contentSecurityFeign.insertViolationsRecord(record); - return new Result().error(CheckDataUtils.violations_message); - } + if((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass())){ + //组装要保存的信息 + SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(), + formDto.getNickname(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.GROUP_TOPIC.getCode(), textList, + formDto.getImages(), null,contentResult, imgResult,null); + contentSecurityFeign.insertViolationsRecord(record); + return new Result().error(CheckDataUtils.violations_message); } else { - logger.error("解析审核结果异常contentResult：" + contentResult + "---imgResult:" + imgResult); + logger.info("未进入违规信息记录contentResult：" + contentResult + "---imgResult:" + imgResult); } TopicEntity entity = ConvertUtils.sourceToTarget(formDto, TopicEntity.class); @@ -236,9 +232,7 @@ public class TopicServiceImpl extends BaseServiceImpl imp groupTopicUserReadService.insertBatch(readEntities); //保存待审核记录 - if (contentResult != null && imgResult != null - && 200 == contentResult.getDetails().get(0).getCode() - && 200 == imgResult.getDetails().get(0).getCode()) { + if (contentResult != null || imgResult != null) { CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult); if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { //组装要保存的信息 diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java index 3c5a4c607..5aafdb57d 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java @@ -154,19 +154,15 @@ public class ActInfoServiceImpl extends BaseServiceImpl statusList = new ArrayList<>(); @@ -361,9 +357,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl