From 8b4c08cac41e2038a316bce634a1119b7b1bfdfe Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 30 Jul 2020 13:56:48 +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=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5?= =?UTF-8?q?=EF=BC=89-2020/07/30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/content/CheckDataUtils.java | 18 ++++++- .../content/dto/form/ParentAndAllDeptDTO.java | 51 +++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/content/dto/form/ParentAndAllDeptDTO.java 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 951e942..26471cc 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 @@ -5,6 +5,7 @@ import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONObject; import com.elink.esua.epdc.commons.tools.security.content.dto.form.CheckContentFormDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.form.CheckDataFromDTO; +import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckDetailResultsDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO; @@ -255,7 +256,10 @@ public class CheckDataUtils { * relationId：关联信息ID， * contentResult：文本审核的结果, * imgResult：图片审核的结果， - * twoTypes：判断为通过或者待审核的结果] + * twoTypes：判断为通过或者待审核的结果 + * mobile：手机号 + * system：系统审核状态：0正常1异常 + * deptDTO:部门及父部门、所有父部门信息] * @return com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO * @describe: 组装违规记录/待审核信息 * @author wangtong @@ -265,7 +269,8 @@ public class CheckDataUtils { String decision, String module, List textList, List imgUrls, String relationId, CheckResultDTO contentResult, CheckResultDTO imgResult, - CheckResultMessageDTO twoTypes, String mobile, String system) { + CheckResultMessageDTO twoTypes, String mobile, String system, + ParentAndAllDeptDTO deptDTO) { SaveCheckRecordsDTO record = new SaveCheckRecordsDTO(); record.setUserId(userId); record.setName(userName); @@ -296,6 +301,15 @@ public class CheckDataUtils { //文本检测接口异常用 record.setSuggestion(review); } + // 父所有部门 + record.setParentDeptIds(deptDTO.getParentDeptIds()); + record.setParentDeptNames(deptDTO.getParentDeptNames()); + // 所有部门 + record.setAllDeptIds(deptDTO.getAllDeptIds()); + record.setAllDeptNames(deptDTO.getAllDeptNames()); + // 部门 + record.setDeptId(deptDTO.getGridId().toString()); + record.setDeptName(deptDTO.getGrid()); return record; } diff --git a/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/content/dto/form/ParentAndAllDeptDTO.java b/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/content/dto/form/ParentAndAllDeptDTO.java new file mode 100644 index 0000000..e287354 --- /dev/null +++ b/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/content/dto/form/ParentAndAllDeptDTO.java @@ -0,0 +1,51 @@ +package com.elink.esua.epdc.commons.tools.security.content.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 机构拼接信息 + * + * @author yujintao + * @email yujintao@elink-cn.com + * @date 2019/9/7 9:8 + */ +@Data +public class ParentAndAllDeptDTO implements Serializable { + + private static final long serialVersionUID = 8264059305193996215L; +// /** +// * 部门名称 +// */ +// private String deptName; +// /** +// * 部门id +// */ +// private Long deptId; + /** + * 网格名称/部门名称 + */ + private String grid; + /** + * 网格ID/部门id + */ + private Long gridId; + + /** + * 父所有部门ID + */ + private String parentDeptIds; + /** + * 父所有部门 + */ + private String parentDeptNames; + /** + * 所有部门ID + */ + private String allDeptIds; + /** + * 所有部门 + */ + private String allDeptNames; +}