多维保存、详情bug

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/kshEntity/KshServiceCache.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.founder.commonutils.model.newPublicEntity.ztypEntity.KsjResultPojo;
+import com.founder.commonutils.model.newPublicEntity.kshResult.KshTreeResultPojo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -53,13 +53,13 @@ public class KshServiceCache implements Serializable {
     @TableField("bz")
     private String bz;
 
-    @ApiModelProperty(value = "可视化数据")
+    @ApiModelProperty(value = "可视化数据json")
     @TableField("kshdata")
     private String kshdataString;
 
-    @ApiModelProperty(value = "当前页")
+    @ApiModelProperty(value = "可视化数据entity")
     @TableField(exist = false)
-    private KsjResultPojo kshdata;
+    private KshTreeResultPojo kshdata;
 
     @ApiModelProperty(value = "当前页")
     @TableField(exist = false)

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/kshResult/KshTreeResultPojo.java

+package com.founder.commonutils.model.newPublicEntity.kshResult;
+
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * @author sjq
+ * @description 多维保存/点击详情 专用
+ */
+@Data
+public class KshTreeResultPojo {
+    /**
+     * 节点信息组（去重的）
+     */
+    private List<Nodes> nodes;
+    /**
+     * 关联关系组
+     */
+    private List<Links> links;
+
+    @Data
+    public static class Nodes {
+        /**
+         * 点信息的唯一值（例如证件号码），节点是否去重就是依据id
+         */
+        private String id;
+        /**
+         * 节点下面显示的名称，如果需要多个显示，请传
+         * "李xx\n23岁\n前端开发工程师" 单个的话就  "李xx"
+         */
+        private String label;
+        /**
+         * 将节点所有的信息全部放到这个字段中，包括id和label，注意的是，这个对象必须有一个字段imgType(idcard: 人，aj: 案件，cph：车，sjk：手机，yhk：银行卡)判断节点图片
+         */
+        private KshTreeResultPojo.Nodes.Properties properties;
+
+        @Data
+        public static class Properties {
+            /**
+             * 节点下面显示的名称，如果需要多个显示，请传
+             * "李xx\n23岁\n前端开发工程师" 单个的话就  "李xx"
+             */
+            private String id;
+            /**
+             * 节点信息的唯一值（例如证件号码），节点是否去重就是依据id
+             */
+            private String label;
+            /**
+             * (idcard: 人，aj: 案件，cph：车，sjk：手机，yhk：银行卡)判断节点图片
+             */
+            private String imgType;
+            /**
+             * 人员照片
+             */
+            private String imagePhoto;
+            /**
+             * 节点颜色 #FF00FF
+             */
+            private String boderColor;
+        }
+
+    }
+
+    @Data
+    public static class Links {
+        /**
+         * 源节点id值
+         */
+        private String source;
+        /**
+         * 目标节点id值
+         */
+        private String target;
+        /**
+         * 节点连线显示文字
+         */
+        private String label;
+        /**
+         * 将连线所有的信息全部放到这个字段中，注意事项同上，没有必要字段imgType
+         */
+        private KshTreeResultPojo.Links.Properties properties;
+
+        @Data
+        public static class Properties {
+            /**
+             * 源节点id值
+             */
+            private String source;
+            /**
+             * 目标节点id值
+             */
+            private String target;
+            /**
+             * 节点连线显示文字
+             */
+            private String label;
+
+            private List<GlgxData> glgxData;
+
+            @Data
+            public static class GlgxData {
+
+                //标识号
+                private String bsh;
+                //标识号类型
+                private String bshlx;
+                //关联标识号
+                private String glbsh;
+                //关联
+                private String glbshlx;
+                //数据类型
+                private String sjly;
+                //关联关系
+                private String glgx;
+                //关联时间
+                private String glsj;
+            }
+
+        }
+    }
+}

common/service_base/src/main/java/com/founder/servicebase/controller/KshServiceController.java

@@ -9,12 +9,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.api.ApiController;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.founder.commonutils.model.newPublicEntity.MapRestResult;
-import com.founder.commonutils.model.newPublicEntity.RyAndAjEntity.TbStXftpNew;
 import com.founder.commonutils.model.newPublicEntity.SysUser;
 import com.founder.commonutils.model.newPublicEntity.kshEntity.KshServiceCache;
+import com.founder.commonutils.model.newPublicEntity.kshResult.KshTreeResultPojo;
 import com.founder.commonutils.model.newPublicEntity.ztypEntity.KshServicePojo;
 import com.founder.commonutils.model.newPublicEntity.ztypEntity.KsjResultCheck;
-import com.founder.commonutils.model.newPublicEntity.ztypEntity.KsjResultPojo;
 import com.founder.commonutils.util.ExportExcelUtil;
 import com.founder.commonutils.util.JsonValidator;
 import com.founder.commonutils.util.KeyUtil;
@@ -457,7 +456,7 @@ public class KshServiceController extends ApiController {
         if (byId == null) {
             return new MapRestResult().error("不存在该数据");
         } else {
-            KsjResultPojo ksjResultPojo = JSONObject.parseObject(byId.getKshdataString(), KsjResultPojo.class);
+            KshTreeResultPojo ksjResultPojo = JSONObject.parseObject(byId.getKshdataString(), KshTreeResultPojo.class);
             return new MapRestResult(ksjResultPojo);
         }
     }
@@ -487,7 +486,7 @@ public class KshServiceController extends ApiController {
         IPage page1 = kshCacheService.page(page, queryWrapper);
         List<KshServiceCache> listResult = page1.getRecords();
         listResult.stream().forEach(q->{
-            q.setKshdata(JSON.parseObject(q.getKshdataString(),KsjResultPojo.class));
+            q.setKshdata(JSON.parseObject(q.getKshdataString(),KshTreeResultPojo.class));
             q.setByzd1(String.valueOf(q.getKshdata().getNodes().size()));
 
         });