Merge remote-tracking branch 'origin/feature/contentSecurityDev' into feature/contentSecurityDev

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

@@ -169,11 +169,16 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
                     commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one,
                     ModuleName.ISSUE_COMMENT.getCode(), textList,null, null,contentResult,
-                    null,null,mobile);
+                    null,null,mobile,"0");
             contentSecurityFeign.insertViolationsRecord(record);
             return new Result().error(CheckDataUtils.violations_message);
-        } else {
+        }
-            logger.error("未进入违规信息记录：" + contentResult);
+        //接口异常，保存至待审核信息
+        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;
@@ -283,8 +288,8 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
                         commentFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ISSUE_COMMENT.getCode(), textList,
-                         null,commentEntity.getId(), null,null,twoTypes,mobile);
+                         null,commentEntity.getId(), null,null,twoTypes,mobile,"0");
-                contentSecurityFeign.insertRecords(record);
+                    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

@@ -181,12 +181,17 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(),
                     dto.getNickName(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.ISSUE_SUBMIT.getCode(), textList,
-                    dto.getImages(), null,contentResult, imgResult,null,dto.getMobile());
+                    dto.getImages(), null,contentResult, imgResult,null,dto.getMobile(),"0");
             contentSecurityFeign.insertViolationsRecord(record);
             throw new RenException(CheckDataUtils.violations_message);
 //                return new Result().error(CheckDataUtils.violations_message);
-        } else {
+        }
-            logger.info("未进入违规信息记录contentResult：" + contentResult + "---imgResult:" + imgResult);
+        //接口异常，保存至待审核信息
+        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);
@@ -208,8 +213,8 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(),
                         dto.getNickName(), CheckDataUtils.cate_two, null,ModuleName.ISSUE_SUBMIT.getCode(), textList,
-                        dto.getImages(), entity.getId(),null,null, twoTypes,dto.getMobile());
+                        dto.getImages(), entity.getId(),null,null, twoTypes,dto.getMobile(),"0");
-                contentSecurityFeign.insertRecords(record);
+                    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

@@ -333,11 +333,16 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
                         userName,CheckDataUtils.cate_two , CheckDataUtils.decision_one,
                         ModuleName.ITEM_SATISFACTION.getCode(), textList,null, null,contentResult,
-                        null,null,mobile);
+                        null,null,mobile,"0");
-                contentSecurityFeign.insertViolationsRecord(record);
+            contentSecurityFeign.insertViolationsRecord(record);
                 return new Result().error(CheckDataUtils.violations_message);
-            } else {
+            }
-                logger.error("未进入违规信息记录：" + contentResult);
+            //接口异常，保存至待审核信息
+            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();
@@ -354,7 +359,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                     //组装要保存的信息
                     SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
                             userName, CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList,
-                            null,itemEntity.getId(), null,null,twoTypes,mobile);
+                            null,itemEntity.getId(), null,null,twoTypes,mobile,"0");
                     contentSecurityFeign.insertRecords(record);
                 }
             }//如果是审核状态是pass，不作任何处理

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

@@ -150,11 +150,16 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
             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,mobile);
+                    null,null,mobile,"0");
             contentSecurityFeign.insertViolationsRecord(record);
             return new Result().error(CheckDataUtils.violations_message);
-        } else {
+        }
-            logger.error("未进入违规信息记录：" + contentResult);
+        //接口异常，保存至待审核信息
+        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();
@@ -225,8 +230,8 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
                         commentFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList,
-                        null,commentEntity.getId(), null,null,twoTypes,mobile);
+                        null,commentEntity.getId(), null,null,twoTypes,mobile,"0");
-                contentSecurityFeign.insertRecords(record);
+                    contentSecurityFeign.insertRecords(record);
             }
         }//如果是审核状态是pass，不作任何处理
 

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

@@ -206,11 +206,16 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
             //组装要保存的信息
             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,formDto.getMobile());
+                    formDto.getImages(), null,contentResult, imgResult,null,formDto.getMobile(),"0");
             contentSecurityFeign.insertViolationsRecord(record);
             return new Result().error(CheckDataUtils.violations_message);
-        } else {
+        }
-            logger.info("未进入违规信息记录contentResult：" + contentResult + "---imgResult:" + imgResult);
+        //接口异常，保存至待审核信息
+        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);
@@ -243,7 +248,7 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
                     //组装要保存的信息
                     SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(),
                             formDto.getNickname(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC.getCode(), textList,
-                            formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile());
+                            formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile(),"0");
                     contentSecurityFeign.insertRecords(record);
                 }
             }

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

@@ -161,11 +161,16 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
                     userName, CheckDataUtils.cate_one, CheckDataUtils.decision_one, ModuleName.HELP_ACTIVITY.getCode(), textList,
-                    imgList, null,contentResult, imgResult,null,dto.getTel());
+                    imgList, null,contentResult, imgResult,null,dto.getTel(),"0");
             contentSecurityFeign.insertViolationsRecord(record);
             return new Result().error(CheckDataUtils.violations_message);
-        } else {
+        }
-            logger.info("未进入违规信息记录contentResult：" + contentResult + "---imgResult:" + imgResult);
+        //接口异常，保存至待审核信息
+        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);
@@ -185,8 +190,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
                         userName, CheckDataUtils.cate_two, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
-                        imgList, entity.getId(),null,null, twoTypes,dto.getTel());
+                        imgList, entity.getId(),null,null, twoTypes,dto.getTel(),"0");
-                contentSecurityFeign.insertRecords(record);
+                    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

@@ -321,11 +321,16 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
                     userName, CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.HELP_SIGNIN.getCode(), textList,
-                    appActUserClockLogDTO.getImages(), null,contentResult, imgResult,null,mobile);
+                    appActUserClockLogDTO.getImages(), null,contentResult, imgResult,null,mobile,"0");
             contentSecurityFeign.insertViolationsRecord(record);
             return new Result().error(CheckDataUtils.violations_message);
-        } else {
+        }
-            logger.info("未进入违规信息记录contentResult：" + contentResult + "---imgResult:" + imgResult);
+        //接口异常，保存至待审核信息
+        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<>();
@@ -368,8 +373,8 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
                         userName, CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
-                        appActUserClockLogDTO.getImages(), entity.getId(),null,null, twoTypes,mobile);
+                        appActUserClockLogDTO.getImages(), entity.getId(),null,null, twoTypes,mobile,"0");
-                contentSecurityFeign.insertRecords(record);
+                    contentSecurityFeign.insertRecords(record);
             }
         }
         return new Result().ok("打卡成功");