修改 内容审核

src/main/java/org/rcisoft/baidu/censor/dto/CensorResult.java

@@ -4,6 +4,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -17,7 +19,7 @@ public class CensorResult {
     /**
      * 审核失败原因
      */
-    String errorMsg;
+    List<String> errorMsg;
 
 }
 

src/main/java/org/rcisoft/baidu/censor/service/impl/ContentCensorServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @Service
@@ -93,7 +94,7 @@ public class ContentCensorServiceImpl implements ContentCensorService {
         //获取代表审核结果的字段
         //审核结果类型，可取值1.合规，2.不合规，3.疑似，4.审核失败
         int conclusionType = 4;
-
+        List<String> error = new ArrayList<>();
         //如果是null就直接判定为失败
         if (clientJsonObject != null) {
             try {
@@ -101,21 +102,20 @@ public class ContentCensorServiceImpl implements ContentCensorService {
                 log.info("审核结果"+clientJsonObject.getString(CENSOR_CONCLUSION_KEY));
                 log.info("请求唯一id"+clientJsonObject.getString(CENSOR_LOG_ID_KEY));
                 boolean isPass = conclusionType == 1;
-                List<String> msg = new ArrayList<>();
                 if (clientJsonObject.has("data")) {
                     JSONArray array = clientJsonObject.getJSONArray("data");
                     for (int i = 0; i < array.length(); i++) {
-                        cn.hutool.json.JSONObject json = JSONUtil.parseObj(array.get(i).toString());
-                        msg.add(json.getStr("msg"));
+                        error.add(array.get(i).toString());
                     }
                 }
-                return new CensorResult(isPass, String.join("，", msg)  );
+                return new CensorResult(isPass, error);
             } catch (JSONException e) {
                 log.error(""+e);
-                return new CensorResult(false, "获取审核结果失败");
+                String json = "{\"msg\":\"获取审核结果失败\"}";
+                return new CensorResult(false, Arrays.asList(json));
             }
         } else
-            return new CensorResult(false, "获取审核结果失败");
+            return new CensorResult(false, Arrays.asList("{\"msg\":\"获取审核结果失败\"}"));
 
     }
 

src/main/java/org/rcisoft/business/opmArticle/service/impl/OpmArticleServiceImpl.java

@@ -72,14 +72,14 @@ public class OpmArticleServiceImpl extends ServiceImpl<OpmArticleRepository, Opm
             flag = result.getIsPass();
             List<String> msg = new ArrayList<>();
             if (!flag)
-                msg.add(result.getErrorMsg());
+                msg.addAll(result.getErrorMsg());
             if (StringUtils.isNotBlank(opmArticle.getPictureId())){
                 JSONArray ids = JSONUtil.parseObj(opmArticle.getPictureId()).getJSONArray("id");
                 for (Object id : ids) {
                     String url = cyFileStorageService.getOssUrl((Integer)id);
                     CensorResult imgResult = contentCensorService.getImageCensorResult(url);
                     if (!imgResult.getIsPass())
-                        msg.add(imgResult.getErrorMsg());
+                        msg.addAll(imgResult.getErrorMsg());
                     flag = flag && imgResult.getIsPass();
                 }
             }
@@ -87,7 +87,7 @@ public class OpmArticleServiceImpl extends ServiceImpl<OpmArticleRepository, Opm
                 opmArticle.setExamStatus("1");
             else {
                 opmArticle.setExamStatus("3");
-                opmArticle.setRemarks(String.join("，", msg));
+                opmArticle.setRemarks(msg.toString());
             }
         }
         //增加操作