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 e893c94..3b1700b 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 @@ -50,18 +50,32 @@ public class CheckDataUtils { //违规提示 public static String violations_message = "内容存在违规信息，请修改后重新提交！"; + //工作类别：工作端 + public static String cate_one = "1"; + + //工作类别：居民端 + public static String cate_two = "2"; + + //违规判定方式：系统判定 + public static String decision_one = "1"; + + //违规判定方式：人工判定 + public static String decision_two = "2"; + private static Logger log = LogManager.getLogger(HttpClientUtils.class); - 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); - } + + +// public static void main(String[] args) { +// String a = ModuleName.WORK_DAILY.getCode(); +// System.out.println(a); +// } /** * @param ：[ title :文本标题, content：文本内容] * @return java.lang.Object - * @describe:内容审核 + * @describe: 内容审核 * @author wangtong * @date 2020/7/6 10:13 */ @@ -216,68 +230,54 @@ public class CheckDataUtils { /** - * @param [userId :用户ID, - * userName：用户名称, - * category：工作类别:1工作2居民, - * decision:判定方式:1系统2人工 - * module：模块编码, - * content：要审核的文本, - * imgUrls：要审核的图片, - * contentResult：文本审核的结果, - * imgResult：图片审核的结果] + * @param :[ userId :用户ID, + * userName：用户名称, + * category：工作类别:1工作2居民, + * decision:判定方式:1系统2人工 + * module：模块编码, + * textList：要审核的文本集合, + * imgUrls：要审核的图片集合, + * relationId：关联信息ID， + * contentResult：文本审核的结果, + * imgResult：图片审核的结果， + * twoTypes：判断为通过或者待审核的结果] * @return com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO - * @describe: 组装违规记录信息 + * @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) { + public static SaveCheckRecordsDTO getPackageRecords(String userId, String userName, String category, + String decision, String module, List textList, + List imgUrls, String relationId, + CheckResultDTO contentResult, CheckResultDTO imgResult, + CheckResultMessageDTO twoTypes) { SaveCheckRecordsDTO record = new SaveCheckRecordsDTO(); record.setUserId(userId); record.setName(userName); record.setCategory(category);//居民 record.setDecision(decision);//判定方式 record.setModule(module);//功能模块 - record.setContent(content); + if (textList == null || textList.size() == 0) { + return null; + } + String text = StringUtils.join(textList.toArray(), "。"); + record.setContent(text); record.setImgUrls(imgUrls); - CheckResultMessageDTO messageResult = getCheckResultMessage(contentResult, imgResult); - record.setSuggestion(messageResult.getSuggestion()); - record.setLabel(messageResult.getLabel()); - record.setRate(messageResult.getRate()); + if (StringUtils.isNotBlank(relationId)) { + record.setRelationId(relationId); + } + if (twoTypes != null) { + record.setSuggestion(twoTypes.getSuggestion()); + record.setLabel(twoTypes.getLabel()); + record.setRate(twoTypes.getRate()); + } else { + CheckResultMessageDTO messageResult = getCheckResultMessage(contentResult, imgResult); + record.setSuggestion(messageResult.getSuggestion()); + record.setLabel(messageResult.getLabel()); + record.setRate(messageResult.getRate()); + } return record; } - /** - * @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 - */ - 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); - record.setCategory(category);//居民 - record.setModule(module);//功能模块 - record.setContent(content); - record.setImgUrls(imgUrls); - record.setRelationId(relationId); - record.setSuggestion(twoTypes.getSuggestion()); - record.setLabel(twoTypes.getLabel()); - record.setRate(twoTypes.getRate()); - return record; - } } \ No newline at end of file diff --git a/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/content/ModuleName.java b/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/content/ModuleName.java new file mode 100644 index 0000000..85cec2c --- /dev/null +++ b/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/content/ModuleName.java @@ -0,0 +1,42 @@ +package com.elink.esua.epdc.commons.tools.security.content; + +/** +* @describe: 功能模块名 枚举类 +* @author wangtong +* @date 2020/7/8 15:14 +* @param +* @return +*/ +public enum ModuleName { + + WORK_DAILY("work_daily","工作日志-随手记"), + WORK_WEEK("work_week","工作日志-周报"), + WORK_MONTH("work_month","工作日志-月报"), + SECRETARY_NOTICE("secretary_notice","书记在线-发布通知"), + SECRETARY_TOPIC("secretary_topic","书记在线-我有话说"), + SECRETARY_TOPIC_COMMENT("secretary_topic_comment","书记在线-我有话说-评论"), + HELP_ACTIVITY("help_activity","初心互助-发布活动"), + ISSUE_SUBMIT("issue_submit","议题项目-我要报事"), + ISSUE_COMMENT("issue_comment","议题项目-评论"), + ITEM_SATISFACTION("item_satisfaction","项目详情-满意度评价"), + GROUP_TOPIC("group_topic","邻里党群-我有话说"), + GROUP_TOPIC_COMMENT("group_topic_comment","邻里党群-我有话说-评论"), + HELP_SIGNIN("help_signIn","初心互助-已报名活动-我要打卡"); + + private String name; + + private String code; + + ModuleName(String code,String name){ + this.code=code; + this.name=name; + } + + public String getName() { + return name; + } + + public String getCode() { + return code; + } +}