【内容审核】-【接口异常调整】-（王童）-2020/07/17

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

@@ -173,13 +173,6 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
             contentSecurityFeign.insertViolationsRecord(record);
             return new Result().error(CheckDataUtils.violations_message);
         }
-        //接口异常，保存至待审核信息
-        if(contentResult == null) {
-            SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
-                    commentFormDTO.getUserName(), CheckDataUtils.cate_two, null,ModuleName.ISSUE_COMMENT.getCode(), textList,
-                    null, null,null,null, null,mobile,"1");
-            contentSecurityFeign.insertRecords(record);
-        }
 
         IssueEntity issueEntity = null;
         ItemEntity itemEntity = null;
@@ -281,8 +274,15 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
         // 发送消息
         newsTask.insertUserInformation(informationFormDTO);
 
+        //接口异常，保存至待审核信息
+        if(contentResult == null) {
+            SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
+                    commentFormDTO.getUserName(), CheckDataUtils.cate_two, null,ModuleName.ISSUE_COMMENT.getCode(), textList,
+                    null, commentEntity.getId(),null,null, null,mobile,"1");
+            contentSecurityFeign.insertRecords(record);
+        }
+
         //判断是否为待审核
-        if (contentResult != null) {
         CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
         if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
             //组装要保存的信息
@@ -291,7 +291,6 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
                      null,commentEntity.getId(), null,null,twoTypes,mobile,"0");
                 contentSecurityFeign.insertRecords(record);
         }
-        }//如果是审核状态是pass，不作任何处理
         return new Result();
     }
 

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

@@ -186,13 +186,6 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
             throw new RenException(CheckDataUtils.violations_message);
 //                return new Result().error(CheckDataUtils.violations_message);
         }
-        //接口异常，保存至待审核信息
-        if(contentResult == null || imgResult == null) {
-            SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(),
-                    dto.getNickName(), CheckDataUtils.cate_two, null,ModuleName.ISSUE_SUBMIT.getCode(), textList,
-                    dto.getImages(), null,null,null, null,dto.getMobile(),"1");
-            contentSecurityFeign.insertRecords(record);
-        }
 
         EpdcEventsEntity entity = ConvertUtils.sourceToTarget(dto, EpdcEventsEntity.class);
         insert(entity);
@@ -206,8 +199,15 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         //短信通知 所有有菜单权限的议题审核员
         issueOverseeResultsTask.getSysGridLeaderPhone(dto.getGridId());
 
+        //接口异常，保存至待审核信息
+        if(contentResult == null || imgResult == null) {
+            SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(),
+                    dto.getNickName(), CheckDataUtils.cate_two, null,ModuleName.ISSUE_SUBMIT.getCode(), textList,
+                    dto.getImages(), entity.getId(),null,null, null,dto.getMobile(),"1");
+            contentSecurityFeign.insertRecords(record);
+        }
+
         //保存待审核记录
-        if (contentResult != null || imgResult != null) {
         CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
         if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
             //组装要保存的信息
@@ -216,7 +216,6 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
                     dto.getImages(), entity.getId(),null,null, twoTypes,dto.getMobile(),"0");
                 contentSecurityFeign.insertRecords(record);
         }
-        }
         return entity;
     }
 

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

@@ -337,13 +337,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             contentSecurityFeign.insertViolationsRecord(record);
                 return new Result().error(CheckDataUtils.violations_message);
             }
-            //接口异常，保存至待审核信息
-            if(contentResult == null) {
-                SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
-                        userName, CheckDataUtils.cate_two, null,ModuleName.ITEM_SATISFACTION.getCode(), textList,
-                        null, null,null,null, null,mobile,"1");
-                contentSecurityFeign.insertRecords(record);
-            }
 
             ItemEntity itemEntity = new ItemEntity();
             itemEntity.setId(evaluationFormDTO.getItemId());
@@ -352,8 +345,15 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             itemEntity.setEvaluationTime(new Date());
             baseDao.updateById(itemEntity);
 
+            //接口异常，保存至待审核信息
+            if(contentResult == null) {
+                SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
+                        userName, CheckDataUtils.cate_two, null,ModuleName.ITEM_SATISFACTION.getCode(), textList,
+                        null, itemEntity.getId(),null,null, null,mobile,"1");
+                contentSecurityFeign.insertRecords(record);
+            }
+
             //判断是否为待审核
-            if (contentResult != null) {
             CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
             if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                 //组装要保存的信息
@@ -362,7 +362,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                         null,itemEntity.getId(), null,null,twoTypes,mobile,"0");
                 contentSecurityFeign.insertRecords(record);
             }
-            }//如果是审核状态是pass，不作任何处理
             return new Result();
         } else {
             return new Result().error("您无法评价");

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

@@ -154,13 +154,6 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
             contentSecurityFeign.insertViolationsRecord(record);
             return new Result().error(CheckDataUtils.violations_message);
         }
-        //接口异常，保存至待审核信息
-        if(contentResult == null ) {
-            SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
-                    commentFormDTO.getUserName(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList,
-                    null, null,null,null, null,mobile,"1");
-            contentSecurityFeign.insertRecords(record);
-        }
 
         TopicCommentEntity commentEntity = new TopicCommentEntity();
         commentEntity.setContent(commentFormDTO.getContent());
@@ -223,8 +216,15 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
         // 发送消息
         newsTask.insertUserInformation(informationFormDTO);
 
+        //接口异常，保存至待审核信息
+        if(contentResult == null ) {
+            SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
+                    commentFormDTO.getUserName(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList,
+                    null, commentEntity.getId(),null,null, null,mobile,"1");
+            contentSecurityFeign.insertRecords(record);
+        }
+
         //判断是否为待审核
-        if (contentResult != null) {
         CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
         if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
             //组装要保存的信息
@@ -233,7 +233,6 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
                     null,commentEntity.getId(), null,null,twoTypes,mobile,"0");
                 contentSecurityFeign.insertRecords(record);
         }
-        }//如果是审核状态是pass，不作任何处理
 
         return new Result();
     }

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

@@ -210,13 +210,6 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
             contentSecurityFeign.insertViolationsRecord(record);
             return new Result().error(CheckDataUtils.violations_message);
         }
-        //接口异常，保存至待审核信息
-        if(contentResult == null || imgResult == null) {
-            SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(),
-                    formDto.getNickname(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC.getCode(), textList,
-                    formDto.getImages(), null,null,null, null,formDto.getMobile(),"1");
-            contentSecurityFeign.insertRecords(record);
-        }
 
         TopicEntity entity = ConvertUtils.sourceToTarget(formDto, TopicEntity.class);
         if (insert(entity)) {
@@ -241,8 +234,15 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
 
             groupTopicUserReadService.insertBatch(readEntities);
 
+
+            //接口异常，保存至待审核信息
+            if(contentResult == null || imgResult == null) {
+                SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(),
+                        formDto.getNickname(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC.getCode(), textList,
+                        formDto.getImages(), entity.getId(),null,null, null,formDto.getMobile(),"1");
+                contentSecurityFeign.insertRecords(record);
+            }
             //保存待审核记录
-            if (contentResult != null || imgResult != null) {
             CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
             if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                 //组装要保存的信息
@@ -251,7 +251,6 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
                         formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile(),"0");
                 contentSecurityFeign.insertRecords(record);
             }
-            }
 
             return new Result();
         }

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

@@ -165,13 +165,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
             contentSecurityFeign.insertViolationsRecord(record);
             return new Result().error(CheckDataUtils.violations_message);
         }
-        //接口异常，保存至待审核信息
+
-        if(contentResult == null || imgResult == null) {
-            SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
-                    userName, CheckDataUtils.cate_one, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
-                    imgList, null,null,null, null,dto.getTel(),"1");
-            contentSecurityFeign.insertRecords(record);
-        }
 
         ActInfoEntity entity = ConvertUtils.sourceToTarget(dto, ActInfoEntity.class);
         if (insert(entity)) {
@@ -183,8 +177,15 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
             return this.saveActToScheduleJob(entity.getId(), dto.getActStartTime());
         }
 
+        //接口异常，保存至待审核信息
+        if(contentResult == null || imgResult == null) {
+            SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
+                    userName, CheckDataUtils.cate_one, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
+                    imgList, entity.getId(),null,null, null,dto.getTel(),"1");
+            contentSecurityFeign.insertRecords(record);
+        }
+
         //保存待审核记录
-        if (contentResult != null || imgResult != null) {
         CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
         if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
             //组装要保存的信息
@@ -193,7 +194,6 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
                     imgList, entity.getId(),null,null, twoTypes,dto.getTel(),"0");
                 contentSecurityFeign.insertRecords(record);
         }
-        }
         return new Result().error();
     }
 

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

@@ -325,13 +325,6 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
             contentSecurityFeign.insertViolationsRecord(record);
             return new Result().error(CheckDataUtils.violations_message);
         }
-        //接口异常，保存至待审核信息
-        if(contentResult == null || imgResult == null) {
-            SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
-                    userName, CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
-                    appActUserClockLogDTO.getImages(), null,null,null, null,mobile,"1");
-            contentSecurityFeign.insertRecords(record);
-        }
         //查询人员活动关系Id(可打卡的)
         List<String> statusList = new ArrayList<>();
         statusList.add(ActUserRelationStatusConstant.APPROVED);
@@ -366,8 +359,15 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
             actClockPicService.save(actClockPicDTO);
         }
         actInfoService.addClockNum(appActUserClockLogDTO.getActId());
+
+        //接口异常，保存至待审核信息
+        if(contentResult == null || imgResult == null) {
+            SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
+                    userName, CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
+                    appActUserClockLogDTO.getImages(), entity.getId(),null,null, null,mobile,"1");
+            contentSecurityFeign.insertRecords(record);
+        }
         //保存待审核记录
-        if (contentResult != null || imgResult != null) {
         CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
         if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
             //组装要保存的信息
@@ -376,7 +376,6 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
                     appActUserClockLogDTO.getImages(), entity.getId(),null,null, twoTypes,mobile,"0");
                 contentSecurityFeign.insertRecords(record);
         }
-        }
         return new Result().ok("打卡成功");
     }