【内容审核】-【整体逻辑判断修改】-（王童）-2020/07/14

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java

@@ -153,8 +153,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
         List<String> textList = new ArrayList<>();
         textList.add(commentFormDTO.getContent());
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
-        if (contentResult != null && 200 == contentResult.getDetails().get(0).getCode()) {
+        if (contentResult != null && !contentResult.getAllPass()) {
-            if (!contentResult.getAllPass()) {
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
                     commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one,
@@ -162,9 +161,8 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
                     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<EventCommentDao, Ev
         newsTask.insertUserInformation(informationFormDTO);
 
         //判断是否为待审核
-        if (contentResult != null && 200 == contentResult.getDetails().get(0).getCode()) {
+        if (contentResult != null) {
             CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
             if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                 //组装要保存的信息

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@@ -176,10 +176,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         textList.add(dto.getEventContent());
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
         CheckResultDTO imgResult = CheckDataUtils.checkImgs(dto.getImages());
-        if (contentResult != null && imgResult != null
+        if((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass())){
-                && 200 == contentResult.getDetails().get(0).getCode()
-                && 200 == imgResult.getDetails().get(0).getCode()) {
-            if (!contentResult.getAllPass() || !imgResult.getAllPass()) {
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(),
                     dto.getNickName(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.ISSUE_SUBMIT.getCode(), textList,
@@ -187,9 +184,8 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
             contentSecurityFeign.insertViolationsRecord(record);
             throw new RenException(CheckDataUtils.violations_message);
 //                return new Result().error(CheckDataUtils.violations_message);
-            }
         } else {
-            logger.error("解析审核结果异常contentResult：" + contentResult + "---imgResult:" + imgResult);
+            logger.info("未进入违规信息记录contentResult：" + contentResult + "---imgResult:" + imgResult);
         }
 
         EpdcEventsEntity entity = ConvertUtils.sourceToTarget(dto, EpdcEventsEntity.class);
@@ -205,9 +201,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         issueOverseeResultsTask.getSysGridLeaderPhone(dto.getGridId());
 
         //保存待审核记录
-        if (contentResult != null && imgResult != null
+        if (contentResult != null || imgResult != null) {
-                && 200 == contentResult.getDetails().get(0).getCode()
-                && 200 == imgResult.getDetails().get(0).getCode()) {
             CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
             if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                 //组装要保存的信息

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -318,8 +318,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             List<String> textList = new ArrayList<>();
             textList.add(evaluationFormDTO.getEvaluationContent());
             CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
-            if (contentResult != null && 200 == contentResult.getDetails().get(0).getCode()) {
+            if (contentResult != null && !contentResult.getAllPass()) {
-                if (!contentResult.getAllPass()) {
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
                         userName,CheckDataUtils.cate_two , CheckDataUtils.decision_one,
@@ -327,9 +326,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                         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<ItemDao, ItemEntity> 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())) {
                     //组装要保存的信息

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java

@@ -134,8 +134,7 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
         List<String> textList = new ArrayList<>();
         textList.add(commentFormDTO.getContent());
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
-        if (contentResult != null && 200 == contentResult.getDetails().get(0).getCode()) {
+        if (contentResult != null && !contentResult.getAllPass()) {
-            if (!contentResult.getAllPass()) {
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
                     commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one,
@@ -143,9 +142,8 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
                     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<TopicCommentDao, To
         newsTask.insertUserInformation(informationFormDTO);
 
         //判断是否为待审核
-        if (contentResult != null && 200 == contentResult.getDetails().get(0).getCode()) {
+        if (contentResult != null) {
             CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
             if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                 //组装要保存的信息

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java

@@ -197,19 +197,15 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
         textList.add(formDto.getTopicContent());
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
         CheckResultDTO imgResult = CheckDataUtils.checkImgs(formDto.getImages());
-        if (contentResult != null && imgResult != null
+        if((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass())){
-                && 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);
-            }
         } 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<TopicDao, TopicEntity> imp
             groupTopicUserReadService.insertBatch(readEntities);
 
             //保存待审核记录
-            if (contentResult != null && imgResult != null
+            if (contentResult != null || imgResult != null) {
-                    && 200 == contentResult.getDetails().get(0).getCode()
-                    && 200 == imgResult.getDetails().get(0).getCode()) {
                 CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
                 if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                     //组装要保存的信息

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<ActInfoDao, ActInfoEntit
         imgList.add(dto.getBannerUrl());
         CheckResultDTO contentResult = CheckDataUtils.checkContent(imgList);
         CheckResultDTO imgResult = CheckDataUtils.checkImgs(imgList);
-        if (contentResult != null && imgResult != null
+        if((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass())){
-                && 200 == contentResult.getDetails().get(0).getCode()
-                && 200 == imgResult.getDetails().get(0).getCode()) {
-            if (!contentResult.getAllPass() || !imgResult.getAllPass()) {
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
                     userName, CheckDataUtils.cate_one, CheckDataUtils.decision_one, ModuleName.HELP_ACTIVITY.getCode(), textList,
                     imgList, 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);
         }
 
         ActInfoEntity entity = ConvertUtils.sourceToTarget(dto, ActInfoEntity.class);
@@ -180,9 +176,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         }
 
         //保存待审核记录
-        if (contentResult != null && imgResult != null
+        if (contentResult != null || imgResult != null) {
-                && 200 == contentResult.getDetails().get(0).getCode()
-                && 200 == imgResult.getDetails().get(0).getCode()) {
             CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
             if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                 //组装要保存的信息

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java

@@ -312,19 +312,15 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         textList.add(appActUserClockLogDTO.getClockDesc());
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
         CheckResultDTO imgResult = CheckDataUtils.checkImgs(appActUserClockLogDTO.getImages());
-        if (contentResult != null && imgResult != null
+        if((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass())){
-                && 200 == contentResult.getDetails().get(0).getCode()
-                && 200 == imgResult.getDetails().get(0).getCode()) {
-            if (!contentResult.getAllPass() || !imgResult.getAllPass()) {
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
                     userName, CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.HELP_SIGNIN.getCode(), textList,
                     appActUserClockLogDTO.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);
         }
         //查询人员活动关系Id(可打卡的)
         List<String> statusList = new ArrayList<>();
@@ -361,9 +357,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         }
         actInfoService.addClockNum(appActUserClockLogDTO.getActId());
         //保存待审核记录
-        if (contentResult != null && imgResult != null
+        if (contentResult != null || imgResult != null) {
-                && 200 == contentResult.getDetails().get(0).getCode()
-                && 200 == imgResult.getDetails().get(0).getCode()) {
             CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
             if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                 //组装要保存的信息