From c873343fe50a857c39927024d8cc56270fe57a7f Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 8 Jul 2020 13:32:28 +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=85=9A=E7=BE=A4=E8=AE=AE=E4=BA=8B-?= =?UTF-8?q?=E8=AE=AE=E9=A2=98=E9=A1=B9=E7=9B=AE-=E8=AF=84=E8=AE=BA-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5?= =?UTF-8?q?=EF=BC=89-2020/07/08?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/content/CheckDataUtils.java | 155 +++++++++--------- 1 file changed, 77 insertions(+), 78 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 c4f4c71..e893c94 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 @@ -24,7 +24,7 @@ import java.util.List; * @author: wangtong * @create: 2020-07-03 17:02 **/ -public class CheckDataUtils{ +public class CheckDataUtils { //内容审核地址 private static String contentUrl = "https://epmet-dev.elinkservice.cn/epmetscan/api/textSyncScan"; @@ -53,27 +53,24 @@ public class CheckDataUtils{ private static Logger log = LogManager.getLogger(HttpClientUtils.class); -// public static void main(String[] args) { + public static void main(String[] args) { // checkContent(null,"bbb"); // checkImgs("https://epdc-shibei.elinkservice.cn/epdcFile/M00/06/80/rBAAM17wjcKACqqXAAIyYyB0O-8107.png,,https://epdc-shibei.elinkservice.cn/epdcFile/M00/06/80/rBAAM17wjcKACqqXAAIyYyB0O-8107.png,",null); -// } + } /** - * @describe:内容审核 - * @author wangtong - * @date 2020/7/6 10:13 - * @param ：[ title :文本标题, content：文本内容] - * @return java.lang.Object - */ - public static CheckResultDTO checkContent(String title, String content) { - String text = ""; - if (StringUtils.isBlank(content)) { + * @param ：[ title :文本标题, content：文本内容] + * @return java.lang.Object + * @describe:内容审核 + * @author wangtong + * @date 2020/7/6 10:13 + */ + public static CheckResultDTO checkContent(List textList) { + if (textList == null || textList.size() == 0) { return null; - } else if(StringUtils.isNotBlank(title)){ - text = title + ":" + content; - } else { - text = content; } + String text = StringUtils.join(textList.toArray(), "。"); + CheckDataFromDTO tasks = new CheckDataFromDTO(); List contentList = new ArrayList<>(); CheckContentFormDTO contentDto = new CheckContentFormDTO(); @@ -91,42 +88,42 @@ public class CheckDataUtils{ .header("Content-Type", "application/json").execute(); } catch (Exception e) { e.printStackTrace(); - log.error("内容校验接口异常："+e.getMessage()); + log.error("内容校验接口异常：" + e.getMessage()); } log.info("审核返回数据:" + response.body()); JSONObject res = JSONObject.parseObject(response.body()); //审核成功 if (0 == Integer.valueOf(res.get("code").toString())) { - CheckResultDTO result = (CheckResultDTO)JSONObject.toJavaObject((JSONObject)res.get("data"),CheckResultDTO.class); + CheckResultDTO result = (CheckResultDTO) JSONObject.toJavaObject((JSONObject) res.get("data"), CheckResultDTO.class); return result; - }else{ - log.error("内容审核返回信息错误："+res); + } else { + log.error("内容审核返回信息错误：" + res); return null; } } /** - * @describe: 图片审核:只要有一张图片被驳回，本次审核判定为不通过 - * @author wangtong - * @date 2020/7/7 17:42 - * @param ：[ imgArray：集合类型的图片地址] - * @return com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO - */ - public static CheckResultDTO checkImgs(List imgArray){ + * @param ：[ imgArray：集合类型的图片地址] + * @return com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO + * @describe: 图片审核:只要有一张图片被驳回，本次审核判定为不通过 + * @author wangtong + * @date 2020/7/7 17:42 + */ + public static CheckResultDTO checkImgs(List imgArray) { CheckDataFromDTO tasks = new CheckDataFromDTO(); List contentList = new ArrayList<>(); - if(imgArray != null && imgArray.size()>0){ + if (imgArray != null && imgArray.size() > 0) { int i = 1; - for(String url : imgArray){ - if(StringUtils.isNotBlank(url)){//图片地址为空会报错 + for (String url : imgArray) { + if (StringUtils.isNotBlank(url)) {//图片地址为空会报错 CheckContentFormDTO imgDto = new CheckContentFormDTO(); - imgDto.setDataId(i+""); + imgDto.setDataId(i + ""); imgDto.setUrl(url); contentList.add(imgDto); i++; } } - }else{ + } else { return null; } @@ -140,27 +137,27 @@ public class CheckDataUtils{ .header("Content-Type", "application/json").execute(); } catch (Exception e) { e.printStackTrace(); - log.error("内容校验接口异常："+e.getMessage()); + log.error("内容校验接口异常：" + e.getMessage()); } log.info("审核返回数据:" + response.body()); JSONObject res = JSONObject.parseObject(response.body()); //审核成功 if (0 == Integer.valueOf(res.get("code").toString())) { - CheckResultDTO result = (CheckResultDTO)JSONObject.toJavaObject((JSONObject)res.get("data"),CheckResultDTO.class); + CheckResultDTO result = (CheckResultDTO) JSONObject.toJavaObject((JSONObject) res.get("data"), CheckResultDTO.class); return result; - }else{ - log.error("内容审核返回信息错误："+res); + } else { + log.error("内容审核返回信息错误：" + res); return null; } } /** - * @describe: 获取违规记录的分类占比，所属类别，审核状态 - * @author wangtong - * @date 2020/7/7 16:18 - * @param ：[ contentResult：文本审核结果, imgResult：图片审核结果] - * @return com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO - */ + * @param ：[ contentResult：文本审核结果, imgResult：图片审核结果] + * @return com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO + * @describe: 获取违规记录的分类占比，所属类别，审核状态 + * @author wangtong + * @date 2020/7/7 16:18 + */ public static CheckResultMessageDTO getCheckResultMessage(CheckResultDTO contentResult, CheckResultDTO imgResult) { CheckResultMessageDTO result = new CheckResultMessageDTO(); //如果是文字违规 @@ -185,23 +182,24 @@ public class CheckDataUtils{ } /** + * @param ：[ contentResult：文本审核结果, imgResult：图片审核结果] + * @return com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO * @describe: 判断审核结果是review还是pass * @author wangtong * @date 2020/7/7 17:19 - * @param ：[ contentResult：文本审核结果, imgResult：图片审核结果] - * @return com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO */ - public static CheckResultMessageDTO checkTwoTypes(CheckResultDTO contentResult, CheckResultDTO imgResult){ + public static CheckResultMessageDTO checkTwoTypes(CheckResultDTO contentResult, CheckResultDTO imgResult) { CheckResultMessageDTO result = new CheckResultMessageDTO(); //如果是文字待审核 - if (contentResult != null) { + if (contentResult != 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()); result.setRate(contentResult.getDetails().get(0).getResults().get(0).getRate()); return result; } - } else if (imgResult != null) {//如果是图片待审核 + } + if (imgResult != null && 200 == imgResult.getDetails().get(0).getCode()) {//如果是图片待审核 for (CheckResultDetailsDTO details : imgResult.getDetails()) { for (CheckDetailResultsDTO detailResult : details.getResults()) { if (review.equals(detailResult.getSuggestion())) { @@ -218,32 +216,33 @@ public class CheckDataUtils{ /** - * @describe: 组装违规记录信息 - * @author wangtong - * @date 2020/7/7 19:26 - * @param [userId :用户ID, - * userName：用户名称, - * category：工作类别:1工作2居民, - * module：模块编码, - * content：要审核的文本, - * imgUrls：要审核的图片, - * contentResult：文本审核的结果, - * imgResult：图片审核的结果] - * @return com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO - */ - public static SaveCheckRecordsDTO getViolationsRecords(String userId,String userName,String category, - String module,String content,List imgUrls, - CheckResultDTO contentResult, - CheckResultDTO imgResult){ + * @param [userId :用户ID, + * userName：用户名称, + * category：工作类别:1工作2居民, + * decision:判定方式:1系统2人工 + * module：模块编码, + * content：要审核的文本, + * imgUrls：要审核的图片, + * contentResult：文本审核的结果, + * imgResult：图片审核的结果] + * @return com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO + * @describe: 组装违规记录信息 + * @author wangtong + * @date 2020/7/7 19:26 + */ + public static SaveCheckRecordsDTO getViolationsRecords(String userId, String userName, String category, + String decision, String module, String content, + List imgUrls, CheckResultDTO contentResult, + CheckResultDTO imgResult) { SaveCheckRecordsDTO record = new SaveCheckRecordsDTO(); record.setUserId(userId); record.setName(userName); record.setCategory(category);//居民 - record.setDecision("1");//系统判定 + record.setDecision(decision);//判定方式 record.setModule(module);//功能模块 record.setContent(content); record.setImgUrls(imgUrls); - CheckResultMessageDTO messageResult = getCheckResultMessage(contentResult,imgResult); + CheckResultMessageDTO messageResult = getCheckResultMessage(contentResult, imgResult); record.setSuggestion(messageResult.getSuggestion()); record.setLabel(messageResult.getLabel()); record.setRate(messageResult.getRate()); @@ -251,22 +250,22 @@ public class CheckDataUtils{ } /** + * @param [userId :用户ID, + * userName：用户名称, + * category：工作类别:1工作2居民, + * module：模块编码, + * content：要审核的文本, + * imgUrls：要审核的图片, + * contentResult：文本审核的结果, + * imgResult：图片审核的结果] + * @return com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO * @describe: 组装待审核信息 * @author wangtong * @date 2020/7/7 19:26 - * @param [userId :用户ID, - * userName：用户名称, - * category：工作类别:1工作2居民, - * module：模块编码, - * content：要审核的文本, - * imgUrls：要审核的图片, - * contentResult：文本审核的结果, - * imgResult：图片审核的结果] - * @return com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO */ - public static SaveCheckRecordsDTO getUnCheckRecords(String userId,String userName,String category, - String module,String content,List imgUrls, - String relationId,CheckResultMessageDTO twoTypes){ + public static SaveCheckRecordsDTO getUnCheckRecords(String userId, String userName, String category, + String module, String content, List imgUrls, + String relationId, CheckResultMessageDTO twoTypes) { SaveCheckRecordsDTO record = new SaveCheckRecordsDTO(); record.setUserId(userId); record.setName(userName);