Hn可视化接口管理修改bug

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/HnRygxExport.java

 package com.founder.commonutils.model.newPublicEntity.hnkshEntity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class HnRygxExport {
     @ApiModelProperty(value = "标签")
-    private String describe;
+    private String description;
 
     @ApiModelProperty(value = "标识")
     private String name;
@@ -17,41 +18,56 @@ public class HnRygxExport {
     @ApiModelProperty(value = "性别")
     private String xb;
 
-    @ApiModelProperty(value = "年龄")
-    private String nl;
+    @ApiModelProperty(value = "民族")
+    private String mz;
 
     @ApiModelProperty(value = "身份证号")
     private String sfzh;
 
+    @ApiModelProperty(value = "背景")
+    private String bj;
+
     @ApiModelProperty(value = "综合评分")
     private String zhpf;
 
-    @ApiModelProperty(value = "民族")
-    private String mz;
+    @ApiModelProperty(value = "同住址")
+    private String tzz;
+
+    @ApiModelProperty(value = "同户号")
+    private String thh;
+
+    @ApiModelProperty(value = "婚姻")
+    private String hy;
+
+    @ApiModelProperty(value = "邻居")
+    private String lj;
+
+    @ApiModelProperty(value = "同机构")
+    private String tjg;
 
-    @ApiModelProperty(value = "出生日期")
-    private String csrq;
+    @ApiModelProperty(value = "铁路同乘车")
+    private String tltcc;
 
-    @ApiModelProperty(value = "服务处所")
-    private String fwcs;
+    @ApiModelProperty(value = "同乘机")
+    private String tzj;
 
-    @ApiModelProperty(value = "出生地国家")
-    private String csdgj;
+    @ApiModelProperty(value = "同出入境")
+    private String tcrj;
 
-    @ApiModelProperty(value = "出生地")
-    private String csd;
+    @ApiModelProperty(value = "同车违章")
+    private String tcwz;
 
-    @ApiModelProperty(value = "籍贯")
-    private String jg;
+    @ApiModelProperty(value = "同案人员")
+    private String tary;
 
-    @ApiModelProperty(value = "职业")
-    private String zy;
+    @ApiModelProperty(value = "同住宿")
+    private String tzs;
 
-    @ApiModelProperty(value = "户籍登记地址")
-    private String hjdjdz;
+    @ApiModelProperty(value = "在逃同案人员")
+    private String zttary;
 
-    @ApiModelProperty(value = "姓名注音")
-    private String xmpy;
+    @ApiModelProperty(value = "在逃同撤销")
+    private String zttcx;
 
     @ApiModelProperty(value = "关系集合")
     private String value;

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/HnTbStRygx.java

@@ -27,7 +27,7 @@ public class HnTbStRygx implements Serializable {
 
     @ApiModelProperty(value = "标签")
     @TableField("DESCRIPTION")
-    private String describe;
+    private String description;
 
     @ApiModelProperty(value = "标识")
     @TableField("NAME")
@@ -41,14 +41,18 @@ public class HnTbStRygx implements Serializable {
     @TableField("XB")
     private String xb;
 
-    @ApiModelProperty(value = "年龄")
-    @TableField("NL")
-    private String nl;
+    @ApiModelProperty(value = "民族")
+    @TableField("MZ")
+    private String mz;
 
     @ApiModelProperty(value = "身份证号")
     @TableField("SFZH")
     private String sfzh;
 
+    @ApiModelProperty(value = "背景")
+    @TableField("BJ")
+    private String bj;
+
     @ApiModelProperty(value = "综合评分")
     @TableField("ZHPF")
     private String zhpf;
@@ -57,6 +61,14 @@ public class HnTbStRygx implements Serializable {
     @TableField("TZZ")
     private String tzz;
 
+    @ApiModelProperty(value = "同户号")
+    @TableField("THH")
+    private String thh;
+
+    @ApiModelProperty(value = "婚姻")
+    @TableField("HY")
+    private String hy;
+
     @ApiModelProperty(value = "邻居")
     @TableField("LJ")
     private String lj;
@@ -65,19 +77,11 @@ public class HnTbStRygx implements Serializable {
     @TableField("TJG")
     private String tjg;
 
-    @ApiModelProperty(value = "民航同订票")
-    @TableField("MHTDP")
-    private String mhtdp;
-
-    @ApiModelProperty(value = "民航同换票")
-    @TableField("MHTHP")
-    private String mhthp;
-
     @ApiModelProperty(value = "铁路同乘车")
     @TableField("TLTCC")
     private String tltcc;
 
-    @ApiModelProperty(value = "同值机")
+    @ApiModelProperty(value = "同乘机")
     @TableField("TZJ")
     private String tzj;
 
@@ -93,18 +97,10 @@ public class HnTbStRygx implements Serializable {
     @TableField("TARY")
     private String tary;
 
-    @ApiModelProperty(value = "婚姻")
-    @TableField("HY")
-    private String hy;
-
     @ApiModelProperty(value = "同住宿")
     @TableField("TZS")
     private String tzs;
 
-    @ApiModelProperty(value = "同户号")
-    @TableField("THH")
-    private String thh;
-
     @ApiModelProperty(value = "在逃同案人员")
     @TableField("ZTTARY")
     private String zttary;
@@ -113,42 +109,6 @@ public class HnTbStRygx implements Serializable {
     @TableField("ZTTCX")
     private String zttcx;
 
-    @ApiModelProperty(value = "民族")
-    @TableField("MZ")
-    private String mz;
-
-    @ApiModelProperty(value = "出生日期")
-    @TableField("CSRQ")
-    private String csrq;
-
-    @ApiModelProperty(value = "服务处所")
-    @TableField("FWCS")
-    private String fwcs;
-
-    @ApiModelProperty(value = "出生地国家")
-    @TableField("CSDGJ")
-    private String csdgj;
-
-    @ApiModelProperty(value = "出生地")
-    @TableField("CSD")
-    private String csd;
-
-    @ApiModelProperty(value = "籍贯")
-    @TableField("JG")
-    private String jg;
-
-    @ApiModelProperty(value = "职业")
-    @TableField("ZY")
-    private String zy;
-
-    @ApiModelProperty(value = "户籍登记地址")
-    @TableField("HJDJDZ")
-    private String hjdjdz;
-
-    @ApiModelProperty(value = "姓名注音")
-    @TableField("XMPY")
-    private String xmpy;
-
     @TableField("TYPE")
     private String type;
 

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/HnTbStRygxDTO.java

 package com.founder.commonutils.model.newPublicEntity.hnkshEntity;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -18,39 +17,9 @@ public class HnTbStRygxDTO implements Serializable  {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "标签")
-    private String describe;
-
-    @ApiModelProperty(value = "标识")
-    private String name;
-
-/*    @ApiModelProperty(value = "姓名")
-    private String xm;
-
-    @ApiModelProperty(value = "身份证号")
-    private String sfzh;*/
-
-    @ApiModelProperty(value = "ID随机")
     private String id;
+    private String label;
 
-    @ApiModelProperty(value = "图片")
-    private String img;
-
-    @ApiModelProperty(value = "类型")
-    private String type;
-
-    private String value;
-
-    /**
-     * 是否为黑色节点
-     */
-    private Boolean gen;
-
-    /**
-     * 是否为黄色节点
-     */
-    private Boolean yellow;
-
-    private List<HnTbStRygxDTO> children;
+    private Kshpropertice properties;
 
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/Hnkshresult.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
 public class Hnkshresult implements Serializable {
 
 
-    private kshdata kshdata;
+    private kshdata kshData;
 
 
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/Kshpropertice.java

+package com.founder.commonutils.model.newPublicEntity.hnkshEntity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class Kshpropertice implements Serializable {
+
+
+    private String id;
+    private String label;
+
+    private String imgType;
+    private String borderColor;
+
+   /* @ApiModelProperty(value = "标签")
+    private String describe;
+
+    @ApiModelProperty(value = "标识")
+    private String name;
+
+*//*    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;*//*
+
+    @ApiModelProperty(value = "ID随机")
+    private String id;
+
+    @ApiModelProperty(value = "图片")
+    private String img;
+
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+    private String value;
+
+    *//**
+     * 是否为黑色节点
+     *//*
+    private Boolean gen;
+
+    *//**
+     * 是否为黄色节点
+     *//*
+    private Boolean yellow;*/
+}

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/kshdata.java

@@ -9,5 +9,5 @@ public class kshdata {
 
     private List<HnTbStRygxDTO> nodes;
 
-    private List<HnTbStRygxDTO> links;
+    private List<kshlinks> links;
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/kshlinks.java

+package com.founder.commonutils.model.newPublicEntity.hnkshEntity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class kshlinks implements Serializable {
+
+    private String source;
+
+    private String target;
+
+    private String label;
+
+    private kshlinks properties;
+}

common/common_utils/src/main/java/com/founder/commonutils/util/ExcelUtil.java

@@ -190,7 +190,7 @@ public class ExcelUtil {
         Cell cell;
         //标签
         cell = row.createCell(cellNum++);
-        cell.setCellValue(StringUtils.isBlank(data.getDescribe()) ? "" : data.getDescribe());
+        cell.setCellValue(StringUtils.isBlank(data.getDescription()) ? "" : data.getDescription());
         //标识
         cell = row.createCell(cellNum++);
         cell.setCellValue(StringUtils.isBlank(data.getName()) ? "" : data.getName());
@@ -200,25 +200,20 @@ public class ExcelUtil {
         //性别
         cell = row.createCell(cellNum++);
         cell.setCellValue(StringUtils.isBlank(data.getXb()) ? "" : data.getXb());
-        //年龄
+        //民族
         cell = row.createCell(cellNum++);
-        cell.setCellValue(StringUtils.isBlank(data.getNl()) ? "" : data.getNl());
+        cell.setCellValue(StringUtils.isBlank(data.getMz()) ? "" : data.getMz());
         //身份证号
         cell = row.createCell(cellNum++);
         cell.setCellValue(StringUtils.isBlank(data.getSfzh()) ? "" : data.getSfzh());
+        //背景
+        cell = row.createCell(cellNum++);
+        cell.setCellValue(StringUtils.isBlank(data.getBj()) ? "" : data.getBj());
         //综合评分
         cell = row.createCell(cellNum++);
         cell.setCellValue(StringUtils.isBlank(data.getZhpf()) ? "" : data.getZhpf());
-        //关系
-        cell = row.createCell(cellNum++);
-        cell.setCellValue(StringUtils.isBlank(data.getValue()) ? "" : data.getValue());
-        //民族
-        cell = row.createCell(cellNum++);
-        cell.setCellValue(StringUtils.isBlank(data.getMz()) ? "" : data.getMz());
-        //出生日期
-        cell = row.createCell(cellNum++);
-        cell.setCellValue(StringUtils.isBlank(data.getCsrq()) ? "" : data.getCsrq());
-        //服务处所
+
+        /*//服务处所
         cell = row.createCell(cellNum++);
         cell.setCellValue(StringUtils.isBlank(data.getFwcs()) ? "" : data.getFwcs());
         //出生地国家
@@ -238,7 +233,7 @@ public class ExcelUtil {
         cell.setCellValue(StringUtils.isBlank(data.getHjdjdz()) ? "" : data.getHjdjdz());
         //姓名拼音
         cell = row.createCell(cellNum++);
-        cell.setCellValue(StringUtils.isBlank(data.getXmpy()) ? "" : data.getXmpy());
+        cell.setCellValue(StringUtils.isBlank(data.getXmpy()) ? "" : data.getXmpy());*/
 
     }
 

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/HnTbStRygxMapper.xml

@@ -25,21 +25,19 @@
 
     <select id="getInfoBySfzh" resultType="com.founder.commonutils.model.newPublicEntity.hnkshEntity.HnTbStRygx">
         select
-        name,description,xm,sfzh,type,img,bimg,nl,xb,mz,csrq,fwcs,csdgj,zhpf,csd,jg,zy,hjdjdz,xmpy,
+        name,description,xm,xb,mz,sfzh,bj,zhpf,
         trim( TRAILING ',' FROM RTRIM( CONCAT  (
         case when tzz != '0' then '同住址,' else '' end ,
+        case when thh != '0' then '同户号,'  else ''end ,
+        case when hy != '0' then '婚姻,' else '' end ,
         case when lj != '0' then '邻居,'  else '' end ,
         case when tjg != '0' then '同机构,'  else '' end ,
-        case when mhtdp != '0' then '民航同订票,'  else '' end ,
-        case when mhthp != '0' then '民航同订票,'  else ''end ,
         case when tltcc != '0' then '铁路同乘车,' else '' end ,
         case when tzj != '0' then '同值机,' else '' end ,
         case when tcrj != '0' then '同出入境,'  else ''end ,
         case when tcwz != '0' then '同车违章,'  else ''end ,
         case when tary != '0' then '同案人员,'  else ''end ,
-        case when hy != '0' then '婚姻,' else '' end ,
         case when tzs != '0' then '同住宿,'  else ''end ,
-        case when thh != '0' then '同户号,'  else ''end ,
         case when zttary != '0' then '在逃同案人员' when zttcx != '0' then '在逃同撤销'  else ''end
         ))) as value
         from hn_tb_st_rygx where rwid = #{taskId} and sfzh = #{sfzh} and name in

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/HnTbStRygxServiceImpl.java

@@ -138,8 +138,10 @@ public class HnTbStRygxServiceImpl extends ServiceImpl<HnTbStRygxMapper, HnTbStR
             Set map_nameSet = new HashSet();
             Map<String, Object> resultMap = new HashMap();
             for (String n : sfzhList) {
+//                nameSet根据sfz和rwid查xm和sfz
                 List<Map<String, Object>> maps = baseMapper.getXmAndSfzhBySfzh(n, taskId);
                 map_nameSet.addAll(maps);
+//                childrenSet 根据sfz namelist rwid
                 List<HnTbStRygx> list = baseMapper.getInfoBySfzh(n, nameList, taskId);
                 map_childrenSet.addAll(list);
             }