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 4805263..3f31db2 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 @@ -16,6 +16,7 @@ import org.apache.logging.log4j.Logger; import org.springframework.cloud.netflix.ribbon.apache.HttpClientUtils; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; /** @@ -80,6 +81,11 @@ public class CheckDataUtils { * @date 2020/7/6 10:13 */ public static CheckResultDTO checkContent(List textList) { + for(Iterator text = textList.iterator(); text.hasNext();){ + if(StringUtils.isBlank(text.next())){ + text.remove(); + } + } if (textList == null || textList.size() == 0) { return new CheckResultDTO(); } @@ -215,7 +221,7 @@ public class CheckDataUtils { public static CheckResultMessageDTO checkTwoTypes(CheckResultDTO contentResult, CheckResultDTO imgResult) { CheckResultMessageDTO result = new CheckResultMessageDTO(); //如果是文字待审核 - if (contentResult != null && 200 == contentResult.getDetails().get(0).getCode()) { + if (contentResult != null && contentResult.getDetails() != null && 200 == contentResult.getDetails().get(0).getCode()) { if (review.equals(contentResult.getDetails().get(0).getResults().get(0).getSuggestion())) { result.setSuggestion(review); result.setLabel(contentResult.getDetails().get(0).getResults().get(0).getLabel()); @@ -223,7 +229,7 @@ public class CheckDataUtils { return result; } } - if (imgResult != null && 200 == imgResult.getDetails().get(0).getCode()) {//如果是图片待审核 + if (imgResult != null && imgResult.getDetails() != null && 200 == imgResult.getDetails().get(0).getCode()) {//如果是图片待审核 for (CheckResultDetailsDTO details : imgResult.getDetails()) { for (CheckDetailResultsDTO detailResult : details.getResults()) { if (review.equals(detailResult.getSuggestion())) { diff --git a/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/content/dto/result/CheckResultDTO.java b/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/content/dto/result/CheckResultDTO.java index 35f4d17..2c940f4 100644 --- a/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/content/dto/result/CheckResultDTO.java +++ b/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/content/dto/result/CheckResultDTO.java @@ -34,5 +34,5 @@ public class CheckResultDTO implements Serializable { /** *提交的任务是否全部通过,true-是;false-否 */ - private Boolean allPass; + private Boolean allPass = true; } \ No newline at end of file