Merge remote-tracking branch 'remotes/origin/dev'

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java

@@ -18,6 +18,7 @@
 package com.epmet.modules.notice.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -512,10 +513,11 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
                 textScanParamDTO.getTasks().add(taskDTO);
                 Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
                 if (!textSyncScanResult.success()) {
+                    logger.error("safetyCheck textScan return failed,result:"+ JSON.toJSONString(textSyncScanResult));
                     throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
                 } else {
                     if (!textSyncScanResult.getData().isAllPass()) {
-                        logger.error(String.format(TopicConstant.CREATE_TOPIC, word));
+                        logger.warn(EpmetErrorCode.TEXT_SCAN_FAILED.getMsg().concat(String.format(TopicConstant.CREATE_TOPIC, word)));
                         throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
                     }
                 }
@@ -532,12 +534,14 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
             });
             Result<SyncScanResult> imgScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO);
             if (!imgScanResult.success()) {
+                logger.error("safetyCheck imgScan return failed,result:"+ JSON.toJSONString(imgScanResult));
                 throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
-            } else {
-                if (!imgScanResult.getData().isAllPass()) {
-                    throw new RenException(EpmetErrorCode.IMG_SCAN_FAILED.getCode());
-                }
             }
+            if (!imgScanResult.getData().isAllPass()) {
+                logger.warn(EpmetErrorCode.IMG_SCAN_FAILED.getMsg());
+                throw new RenException(EpmetErrorCode.IMG_SCAN_FAILED.getCode());
+            }
+
         }
     }