Merge branch 'feature/contentSecurityDev' of http://121.42.41.42:7070/r/esua-epdc-cloud into feature/contentSecurityDev

esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/pom.xml

@@ -166,9 +166,7 @@
                 <analysis.wx.ma.secret>394f47d4e08fc0fd629231d3f68a34dc</analysis.wx.ma.secret>
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
-                <rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
+                <rocketmq.producer.contentSecurity.group>contentSecurityGroup</rocketmq.producer.contentSecurity.group>
-                <rocketmq.producer.category.group>categoryGroup</rocketmq.producer.category.group>
-                <rocketmq.consumer.category.group>categoryGroup</rocketmq.consumer.category.group>
             </properties>
         </profile>
 

esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/controller/CheckCodeController.java

@@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.CheckCodeDTO;
+import com.elink.esua.epdc.entity.CheckCodeEntity;
 import com.elink.esua.epdc.excel.CheckCodeExcel;
 import com.elink.esua.epdc.service.CheckCodeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +92,16 @@ public class CheckCodeController {
         ExcelUtils.exportExcelToTarget(response, null, list, CheckCodeExcel.class);
     }
 
+    /**
+    * @describe: 根据type获取字典数据
+    * @author wangtong
+    * @date 2020/7/14 9:33
+    * @param [type]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.entity.CheckCodeEntity>>
+    */
+    @GetMapping("getResourcesByType")
+    public Result<List<CheckCodeEntity>> getResourcesByType(String type){
+        return checkCodeService.getResourcesByType(type);
+    }
+
 }

esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/dao/CheckCodeDao.java

@@ -20,6 +20,9 @@ package com.elink.esua.epdc.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.entity.CheckCodeEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 检测编码信息表
@@ -30,4 +33,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface CheckCodeDao extends BaseDao<CheckCodeEntity> {
 
+    /**
+    * @describe: 根据type获取字典数据
+    * @author wangtong
+    * @date 2020/7/14 9:35
+    * @param [type]
+    * @return java.util.List<com.elink.esua.epdc.entity.CheckCodeEntity>
+    */
+    List<CheckCodeEntity> getResourcesByType(@Param("type") String type);
 }

esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/RejectRecordDTO.java

@@ -0,0 +1,27 @@
+package com.elink.esua.epdc.rocketmq.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 组织机构信息修改-发送MQ消息DTO
+ *
+ * @Author： wangtong
+ * @Date： 2020/7/14 14:58
+ */
+@Data
+public class RejectRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 3032661994413974324L;
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 关联信息ID
+     */
+    private String relationId;
+}

esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/rocketmq/producer/RejectCheckRecordProducer.java

@@ -0,0 +1,42 @@
+package com.elink.esua.epdc.rocketmq.producer;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.client.producer.SendResult;
+import org.apache.rocketmq.common.message.Message;
+import org.apache.rocketmq.spring.core.RocketMQTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ *
+ * 驳回待审核信息-发送MQ消息
+ *
+ * @Author：wangtong
+ * @Date：2020/7/14 11:22
+ */
+@Slf4j
+@Component
+public class RejectCheckRecordProducer {
+
+    @Autowired
+    private RocketMQTemplate rocketMQTemplate;
+
+    /**
+    * @describe: 发送消息
+    * @author wangtong
+    * @date 2020/7/14 11:22
+    * @params [topic, tag, keys, body]
+    * @return void
+    */
+    public void sendMessage(String topic, String tag, String keys, String body) {
+        Message message = new Message(topic, tag, keys, body.getBytes());
+        try {
+            SendResult sendResult = rocketMQTemplate.getProducer().send(message);
+            log.info("EPDC-CONTENT-SECURITY-SERVER发送消息结果：{sendStatus:{}, topic:{}, msgId:{}}", sendResult.getSendStatus(), topic, sendResult.getMsgId());
+        } catch (Exception e) {
+            log.error("EPDC-CONTENT-SECURITY-SERVER发送消息异常：{topic:{}, tag:{}, keys:{}, body:{}}", topic, tag, keys, body);
+            e.printStackTrace();
+        }
+    }
+
+}

esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/CheckCodeService.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CheckCodeDTO;
 import com.elink.esua.epdc.entity.CheckCodeEntity;
 
@@ -92,4 +93,13 @@ public interface CheckCodeService extends BaseService<CheckCodeEntity> {
      * @date 2020-07-03
      */
     void delete(String[] ids);
+
+    /**
+    * @describe: 根据type获取字典数据
+    * @author wangtong
+    * @date 2020/7/14 9:33
+    * @param [type]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.entity.CheckCodeEntity>>
+    */
+    Result<List<CheckCodeEntity>> getResourcesByType(String type);
 }

esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckCodeServiceImpl.java

@@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.CheckCodeDao;
 import com.elink.esua.epdc.dto.CheckCodeDTO;
 import com.elink.esua.epdc.entity.CheckCodeEntity;
@@ -101,4 +102,10 @@ public class CheckCodeServiceImpl extends BaseServiceImpl<CheckCodeDao, CheckCod
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public Result<List<CheckCodeEntity>> getResourcesByType(String type) {
+        List<CheckCodeEntity> result = baseDao.getResourcesByType(type);
+        return new Result<List<CheckCodeEntity>>().ok(result);
+    }
+
 }

esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/CheckResultServiceImpl.java

@@ -17,12 +17,15 @@
 
 package com.elink.esua.epdc.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 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.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -31,6 +34,8 @@ import com.elink.esua.epdc.dto.CheckResultDTO;
 import com.elink.esua.epdc.dto.form.HandleRecordsFormDTO;
 import com.elink.esua.epdc.entity.*;
 import com.elink.esua.epdc.redis.CheckResultRedis;
+import com.elink.esua.epdc.rocketmq.dto.RejectRecordDTO;
+import com.elink.esua.epdc.rocketmq.producer.RejectCheckRecordProducer;
 import com.elink.esua.epdc.service.CheckResultService;
 import com.elink.esua.epdc.service.ViolationsRecordsImgsService;
 import org.apache.commons.lang3.StringUtils;
@@ -67,6 +72,9 @@ public class CheckResultServiceImpl extends BaseServiceImpl<CheckResultDao, Chec
     @Autowired
     private ViolationsRecordsImgsService violationsRecordsImgsService;
 
+    @Autowired
+    private RejectCheckRecordProducer rejectCheckRecordProducer;
+
     @Override
     public PageData<CheckResultDTO> page(Map<String, Object> params) {
         IPage<CheckResultEntity> page = baseDao.selectPage(
@@ -120,12 +128,13 @@ public class CheckResultServiceImpl extends BaseServiceImpl<CheckResultDao, Chec
     }
 
     @Override
+    @Transactional
     public Result handleRecords(HandleRecordsFormDTO formDto) {
         //更新待审核记录信息
-        CheckRecordsEntity records = checkRecordsDao.selectById(formDto.getId());
+        CheckRecordsEntity record = checkRecordsDao.selectById(formDto.getId());
-        records.setAuditTime(new Date());
+        record.setAuditTime(new Date());
-        records.setSuggestion(formDto.getResult());
+        record.setSuggestion(formDto.getResult());
-        checkRecordsDao.updateById(records);
+        checkRecordsDao.updateById(record);
         //保存审核记录
         CheckResultEntity entity = new CheckResultEntity();
         entity.setRecordId(formDto.getId());
@@ -139,12 +148,12 @@ public class CheckResultServiceImpl extends BaseServiceImpl<CheckResultDao, Chec
         entity.setSuggestion(formDto.getSuggestion());
         baseDao.insert(entity);
         if(CheckDataUtils.block.equals(formDto.getResult())){
-            ViolationsRecordsEntity violationEntity = ConvertUtils.sourceToTarget(records, ViolationsRecordsEntity.class);
+            ViolationsRecordsEntity violationEntity = ConvertUtils.sourceToTarget(record, ViolationsRecordsEntity.class);
             violationEntity.setDecision("2");//人工审核
             violationsRecordsDao.insert(violationEntity);
             //保存图片
             List<ViolationsRecordsImgsEntity> vioImgList = new ArrayList<>();
-            List<CheckRecordsImgsEntity> recordImgs = checkRecordsImgsDao.selectListByRecordId(records.getId());
+            List<CheckRecordsImgsEntity> recordImgs = checkRecordsImgsDao.selectListByRecordId(record.getId());
             for(CheckRecordsImgsEntity recordImg : recordImgs){
                 ViolationsRecordsImgsEntity vioImgEntity = new ViolationsRecordsImgsEntity();
                 vioImgEntity.setReferenceId(violationEntity.getId());
@@ -153,6 +162,24 @@ public class CheckResultServiceImpl extends BaseServiceImpl<CheckResultDao, Chec
                 vioImgList.add(vioImgEntity);
             }
             violationsRecordsImgsService.insertBatch(vioImgList);
+
+            //后台人工审核驳回，发送MQ消息
+            String topic = null;
+            String tag = null;
+            if(ModuleName.WORK_DAILY.getCode().equals(record.getModule())){
+                topic = RocketMqConstant.MQ_TOPIC_WORKRECORD_CONTENTSECURITY;
+                tag = RocketMqConstant.MQ_TAG_WORKRECORD_DAILY_ORGANIZATION;
+            }else if(ModuleName.WORK_WEEK.getCode().equals(record.getModule())){
+                topic = RocketMqConstant.MQ_TOPIC_WORKRECORD_CONTENTSECURITY;
+                tag = RocketMqConstant.MQ_TAG_WORKRECORD_WEEK_ORGANIZATION;
+            }else if(ModuleName.WORK_MONTH.getCode().equals(record.getModule())){
+                topic = RocketMqConstant.MQ_TOPIC_WORKRECORD_CONTENTSECURITY;
+                tag = RocketMqConstant.MQ_TAG_WORKRECORD_MONTH_ORGANIZATION;
+            }
+            RejectRecordDTO body = new RejectRecordDTO();
+            body.setUserId(violationEntity.getUserId());
+            body.setRelationId(violationEntity.getRelationId());
+            rejectCheckRecordProducer.sendMessage(topic, tag,violationEntity.getId(), JSONObject.toJSONString(body));
         }
         return new Result<>().ok("处理成功");
     }

esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/application.yml

@@ -137,7 +137,5 @@ wx:
 rocketmq:
   name-server: @rocketmq.name.server@
   producer:
-    group: @rocketmq.producer.category.group@
+    group: @rocketmq.producer.contentSecurity.group@
-  consumer:
+
-    group: @rocketmq.consumer.group@
-    category-group: @rocketmq.consumer.category.group@

esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckCodeDao.xml

@@ -15,6 +15,9 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="getResourcesByType" resultType="com.elink.esua.epdc.entity.CheckCodeEntity">
+        select * from epdc_check_code where type=#{type} and DEL_FLAG=0
+    </select>
 
 
 </mapper>

esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml

@@ -70,6 +70,7 @@
         <result property="module" column="module"/>
         <result property="content" column="CONTENT"/>
         <result property="suggestion" column="SUGGESTION"/>
+        <result property="suggestionCode" column="suggestionCode"/>
         <result property="label" column="LABEL"/>
         <result property="rate" column="RATE"/>
         <result property="createdTime" column="CREATED_TIME"/>

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())) {
                 //组装要保存的信息