From b2ed4347568e59b91d1d8a3b1fa1d6750eced974 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 17 Jul 2020 21:08:41 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E3=80=91-=E3=80=90=E5=B7=A5=E5=85=B7=E7=B1=BB=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=20=E5=BC=82=E5=B8=B8=E6=8E=A5=E5=8F=A3=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E7=8A=B6=E6=80=81=E3=80=91-=EF=BC=88=E7=8E=8B?=
 =?UTF-8?q?=E7=AB=A5=EF=BC=89-2020/07/17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../security/content/CheckDataUtils.java      | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/content/CheckDataUtils.java b/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/content/CheckDataUtils.java
index 3f31db2..951e942 100644
--- a/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/content/CheckDataUtils.java
+++ b/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/content/CheckDataUtils.java
@@ -67,7 +67,6 @@ public class CheckDataUtils {
     private static Logger log = LogManager.getLogger(HttpClientUtils.class);
 
 
-
 //    public static void main(String[] args) {
 //        String a  = ModuleName.WORK_DAILY.getCode();
 //        System.out.println(a);
@@ -81,8 +80,8 @@ public class CheckDataUtils {
      * @date 2020/7/6 10:13
      */
     public static CheckResultDTO checkContent(List<String> textList) {
-        for(Iterator<String> text = textList.iterator(); text.hasNext();){
-            if(StringUtils.isBlank(text.next())){
+        for (Iterator<String> text = textList.iterator(); text.hasNext(); ) {
+            if (StringUtils.isBlank(text.next())) {
                 text.remove();
             }
         }
@@ -115,9 +114,9 @@ public class CheckDataUtils {
         //审核成功
         if (0 == Integer.valueOf(res.get("code").toString())) {
             CheckResultDTO result = (CheckResultDTO) JSONObject.toJavaObject((JSONObject) res.get("data"), CheckResultDTO.class);
-            if(200 == result.getDetails().get(0).getCode()){
+            if (200 == result.getDetails().get(0).getCode()) {
                 return result;
-            }else{
+            } else {
                 log.error("内容审核返回信息错误：" + res);
                 return null;
             }
@@ -169,9 +168,9 @@ public class CheckDataUtils {
         //审核成功
         if (0 == Integer.valueOf(res.get("code").toString())) {
             CheckResultDTO result = (CheckResultDTO) JSONObject.toJavaObject((JSONObject) res.get("data"), CheckResultDTO.class);
-            if(200 == result.getDetails().get(0).getCode()){
+            if (200 == result.getDetails().get(0).getCode()) {
                 return result;
-            }else{
+            } else {
                 log.error("内容审核返回信息错误：" + res);
                 return null;
             }
@@ -266,7 +265,7 @@ public class CheckDataUtils {
                                                         String decision, String module, List<String> textList,
                                                         List<String> imgUrls, String relationId,
                                                         CheckResultDTO contentResult, CheckResultDTO imgResult,
-                                                        CheckResultMessageDTO twoTypes,String mobile,String system) {
+                                                        CheckResultMessageDTO twoTypes, String mobile, String system) {
         SaveCheckRecordsDTO record = new SaveCheckRecordsDTO();
         record.setUserId(userId);
         record.setName(userName);
@@ -288,12 +287,16 @@ public class CheckDataUtils {
             record.setSuggestion(twoTypes.getSuggestion());
             record.setLabel(twoTypes.getLabel());
             record.setRate(twoTypes.getRate());
-        } else {
+        } else if (contentResult != null || imgResult != null) {
             CheckResultMessageDTO messageResult = getCheckResultMessage(contentResult, imgResult);
             record.setSuggestion(messageResult.getSuggestion());
             record.setLabel(messageResult.getLabel());
             record.setRate(messageResult.getRate());
+        } else {
+            //文本检测接口异常用
+            record.setSuggestion(review);
         }
+
         return record;
     }