|
@ -16,6 +16,7 @@ import org.apache.logging.log4j.Logger; |
|
|
import org.springframework.cloud.netflix.ribbon.apache.HttpClientUtils; |
|
|
import org.springframework.cloud.netflix.ribbon.apache.HttpClientUtils; |
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
import java.util.ArrayList; |
|
|
|
|
|
import java.util.Iterator; |
|
|
import java.util.List; |
|
|
import java.util.List; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
@ -80,6 +81,11 @@ public class CheckDataUtils { |
|
|
* @date 2020/7/6 10:13 |
|
|
* @date 2020/7/6 10:13 |
|
|
*/ |
|
|
*/ |
|
|
public static CheckResultDTO checkContent(List<String> textList) { |
|
|
public static CheckResultDTO checkContent(List<String> textList) { |
|
|
|
|
|
for(Iterator<String> text = textList.iterator(); text.hasNext();){ |
|
|
|
|
|
if(StringUtils.isBlank(text.next())){ |
|
|
|
|
|
text.remove(); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
if (textList == null || textList.size() == 0) { |
|
|
if (textList == null || textList.size() == 0) { |
|
|
return new CheckResultDTO(); |
|
|
return new CheckResultDTO(); |
|
|
} |
|
|
} |
|
@ -215,7 +221,7 @@ public class CheckDataUtils { |
|
|
public static CheckResultMessageDTO checkTwoTypes(CheckResultDTO contentResult, CheckResultDTO imgResult) { |
|
|
public static CheckResultMessageDTO checkTwoTypes(CheckResultDTO contentResult, CheckResultDTO imgResult) { |
|
|
CheckResultMessageDTO result = new CheckResultMessageDTO(); |
|
|
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())) { |
|
|
if (review.equals(contentResult.getDetails().get(0).getResults().get(0).getSuggestion())) { |
|
|
result.setSuggestion(review); |
|
|
result.setSuggestion(review); |
|
|
result.setLabel(contentResult.getDetails().get(0).getResults().get(0).getLabel()); |
|
|
result.setLabel(contentResult.getDetails().get(0).getResults().get(0).getLabel()); |
|
@ -223,7 +229,7 @@ public class CheckDataUtils { |
|
|
return result; |
|
|
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 (CheckResultDetailsDTO details : imgResult.getDetails()) { |
|
|
for (CheckDetailResultsDTO detailResult : details.getResults()) { |
|
|
for (CheckDetailResultsDTO detailResult : details.getResults()) { |
|
|
if (review.equals(detailResult.getSuggestion())) { |
|
|
if (review.equals(detailResult.getSuggestion())) { |
|
|