西藏主题研判提交(西藏)

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)
@@ -68,4 +68,18 @@ public class KshServiceCache implements Serializable {
     @ApiModelProperty(value = "每页数")
     @TableField(exist = false)
     private int pageSize;
+
+    //最后三个用于多维查找筛选条件
+    @ApiModelProperty(value = "导出时间格式转换备用字段")
+    @TableField(exist = false)
+    private String byzd1; //前端传大于小于等于
+
+    @ApiModelProperty(value = "前端页面查询传参")
+    @TableField(exist = false)
+    private String param;
+
+    @ApiModelProperty(value = "前端页面查询类型")
+    @TableField(exist = false)
+    private String paramType;
+
 }

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/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/Accomplicee.java

+package com.founder.commonutils.model.newPublicEntity.ztypEntity;
+
+import lombok.Data;
+
+/**
+ * 团伙类
+ * create by lystar
+ * 2021/8/2 18:23
+ */
+@Data
+public class Accomplicee {
+    //团伙编号
+    String thbh;
+    //嫌疑人数量
+    Integer xyrCount;
+    //重点关注人员数量
+    Integer zdgzyrCount;
+    //案件数量
+    Integer ajCount;
+    //九类案件数量
+    Integer jlajCount;
+    //标记案件数量
+    int bjajCount;
+}

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/AjQueryParam.java

 package com.founder.commonutils.model.newPublicEntity.ztypEntity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -10,39 +12,64 @@ import java.util.List;
  * 查询案件参数
  */
 @Data
+@ApiModel(value="查询案件参数", description="")
 public class AjQueryParam {
-	//起始时间
+
+	@ApiModelProperty(value = "起始时间")
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	Date startDate;
-	//结束时间
+
+	@ApiModelProperty(value = "结束时间")
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	Date endDate;
+
+	@ApiModelProperty(value = "团伙类型")
 	//团伙类型 00：三人三案 01：三人两案 10：两人三案 11：两人两案
 	String ajlx;
-	//立案单位
+
+	@ApiModelProperty(value = "立案单位")
 	String ladwdm;
-	//案件类别
+
+	@ApiModelProperty(value = "案件类别")
 	String ajlbdm;
-	//案件名称
+
+	@ApiModelProperty(value = "案件名称")
 	String ajmc;
-	//人员姓名
+
+	@ApiModelProperty(value = "人员姓名")
 	String ryxm;
-	//户籍地
+
+	@ApiModelProperty(value = "户籍地")
 	String hjd;
-	//身份证号
+
+	@ApiModelProperty(value = "身份证号")
 	String zjhm;
-	//本级及其下级单位
+
+	@ApiModelProperty(value = "本级及其下级单位")
 	List<String> dwdmlist;
-	//按某列排序
+
+	@ApiModelProperty(value = "按某列排序")
 	String column;
+
+	@ApiModelProperty(value = "排序方式")
 	//排序方式 升序asc，降序desc
 	String type;
+
+	@ApiModelProperty(value = "当前页")
 	Integer page;
+
+	@ApiModelProperty(value = "每页数")
 	Integer limit;
-	//分析维度
+
+	@ApiModelProperty(value = "团伙编号")
 	private String thbh;
-	//分析维度
+
+	@ApiModelProperty(value = "分析维度")
 	private String fxwd;
-	//共同关系系数
+
+	@ApiModelProperty(value = "共同关系系数")
 	private String commonRelationshipNum;
+
+	@ApiModelProperty(value = "0否 1是")
+	private String sfdj;
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/AjQueryResult.java

+package com.founder.commonutils.model.newPublicEntity.ztypEntity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 案件查询返回类
+ */
+@Data
+public class AjQueryResult {
+    //信息主键编号
+    String xxzjbh;
+    //团伙编号
+    String thbh;
+    //案事件编号
+    String asjbh;
+    //案件类证
+    String ajlbdm;
+    //案件名称
+    String ajmc;
+    //立案单位代码
+    String ladwdm;
+    //立案日期
+    Date larq;
+    //是否刑事案件
+    String isXsAj;
+    // 是否九类案件
+    String isNine;
+}

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/AjThKshfxPojo.java

 package com.founder.commonutils.model.newPublicEntity.ztypEntity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.commons.lang.StringUtils;
 
@@ -13,48 +15,39 @@ import java.util.List;
  * @description 案件团伙可视化分析
  */
 @Data
+@ApiModel(value="案件团伙可视化分析", description="")
 public class AjThKshfxPojo {
-	/**
-	 * 节点id
-	 */
+
+	@ApiModelProperty(value = "节点id")
 	private String id;
-	/**
-	 * 节点name
-	 */
+
+	@ApiModelProperty(value = "节点name")
 	private String name;
-	/**
-	 * 节点value
-	 */
+
+	@ApiModelProperty(value = "节点value")
 	private String value;
-	/**
-	 * 节点type,group表示团伙
-	 */
+
+	@ApiModelProperty(value = "节点type,group表示团伙")
 	private String type;
-	/**
-	 * 子节点集合
-	 */
+
+	@ApiModelProperty(value = "子节点集合")
 	private List<AjThKshfxPojo> children;
-	/**
-	 * 是否高亮
-	 */
+
+	@ApiModelProperty(value = "是否高亮")
 	private boolean red;
-	/**
-	 * 父级类型
-	 */
+
+	@ApiModelProperty(value = "父级类型")
 	private String parentType;
-	/**
-	 * 父级id
-	 */
+
+	@ApiModelProperty(value = "父级id")
 	private String parentId;
 
-	/**
-	 * 父级name(资金流处理双向指向时使用，为节点赋予正确的name值)
-	 */
+
+	@ApiModelProperty(value = "父级name")
 	private String parentName;
 
-	/**
-	 * 进出标志(资金流使用：转入、转出)
-	 */
+
+	@ApiModelProperty(value = "进出标志")
 	private String jcbz;
 
 	/**

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/AjXyrResult.java

+package com.founder.commonutils.model.newPublicEntity.ztypEntity;
+
+import lombok.Data;
+
+/**
+ * 嫌疑人证件号码及是否被使用
+ * create by lystar
+ * 2021/8/2 18:55
+ */
+@Data
+public class AjXyrResult {
+    //信息主键编号
+    String xxzjbh;
+    //团伙编号
+    String thbh;
+    //证件号码
+    String zjhm;
+    //户籍地代码
+    String hjd;
+    //人员姓名
+    String xm;
+    //是否重点关注人员
+    String isZdgzyr = "0";
+}

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/AjypFxPojo.java

 package com.founder.commonutils.model.newPublicEntity.ztypEntity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
  * @author yangyang
  */
 @Data
+@ApiModel(value="案件研判fx实体", description="")
 public class AjypFxPojo {
-	/**
-	 * 团伙编号
-	 */
+
+
+	@ApiModelProperty(value = "团伙编号")
 	private String thbh;
-	/**
-	 * 团伙名称
-	 */
+
+	@ApiModelProperty(value = "团伙名称")
 	private String thName;
 
-	/**
-	 * 共同联系电话数量
-	 */
+	@ApiModelProperty(value = "共同联系电话数量")
 	private String commonPhoneCount;
-	/**
-	 * 共同访问ip数量
-	 */
+
+	@ApiModelProperty(value = "共同访问ip数量")
 	private String commonIpCount;
-	/**
-	 * 共同资金流水账号数量
-	 */
+
+	@ApiModelProperty(value = "共同资金流水账号数量")
 	private String commonCashAccountCount;
-	//证件号码
+
+	@ApiModelProperty(value = "证件号码")
 	private String zjhm;
-	//嫌疑人数量
+
+	@ApiModelProperty(value = "嫌疑人数量")
 	private Integer xyrCount;
-	//重点关注人员数量
+
+	@ApiModelProperty(value = "重点关注人员数量")
 	private Integer zdgzyrCount;
-	//案件数量
+
+	@ApiModelProperty(value = "案件数量")
 	private Integer ajCount;
-	//九类案件数量
+
+	@ApiModelProperty(value = "九类案件数量")
 	private Integer jlajCount;
-	//标记案件数量
+
+	@ApiModelProperty(value = "标记案件数量")
 	private int bjajCount;
-	//标记警情数量
+
+	@ApiModelProperty(value = "标记警情数量")
 	private int bjjqCount;
 
+	@ApiModelProperty(value = "0否 1是")
+	private int sfdj;
+
+
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/BankCardNumPojo.java

 package com.founder.commonutils.model.newPublicEntity.ztypEntity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,102 +12,76 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@ApiModel(value="银行卡num实体", description="")
 public class BankCardNumPojo extends TradingTaskPojo {
-	/**
-	 * 任务编号
-	 */
+
+	@ApiModelProperty(value = "任务编号")
 	private String taskId;
-	/**
-	 * 任务名称
-	 */
+
+	@ApiModelProperty(value = "任务名称")
 	private String taskName;
 
-	/**
-	 * 主键编号
-	 */
+	@ApiModelProperty(value = "主键编号")
 	private String xxzjbh;
-	/**
-	 * 本方卡号
-	 */
+
+	@ApiModelProperty(value = "本方卡号")
 	private String bfCardsNum;
-	/**
-	 * 本方持卡人姓名
-	 */
+
+	@ApiModelProperty(value = "本方持卡人姓名")
 	private String bfCardsName;
 
-	/**
-	 * 对方卡号
-	 */
+	@ApiModelProperty(value = "对方卡号")
 	private String dfCardsNum;
-	/**
-	 * 对方持卡人姓名
-	 */
+
+	@ApiModelProperty(value = "对方持卡人姓名")
 	private String dfCardsName;
 
-	/**
-	 * 交易时间 起始时间
-	 */
+	@ApiModelProperty(value = "交易时间 起始时间")
 	private String tradingTimeStart;
-	/**
-	 * 交易时间 截至时间
-	 */
+
+	@ApiModelProperty(value = "交易时间 截至时间")
 	private String tradingTimeEnd;
-	/**
-	 * 交易银行名称
-	 */
+
+	@ApiModelProperty(value = "交易银行名称")
 	private String tradingBankName;
-	/**
-	 * 交易金额
-	 */
+
+	@ApiModelProperty(value = "交易金额")
 	private String transactionAmount;
-	/**
-	 * 账户余额
-	 */
+
+	@ApiModelProperty(value = "账户余额")
 	private String accountBalance;
-	/**
-	 * 交易方式
-	 */
+
+	@ApiModelProperty(value = "交易方式")
 	private String transactionMode;
-	/**
-	 * 交易流水号
-	 */
+
+	@ApiModelProperty(value = "交易流水号")
 	private String transactionNumber;
-	/**
-	 * 转入转出
-	 */
+
+	@ApiModelProperty(value = "转入转出")
 	private String transferInOrOut;
 
-	/**
-	 * 交易数
-	 */
+	@ApiModelProperty(value = "交易数")
 	private String transCount;
-	/**
-	 * 周一交易数
-	 */
+
+	@ApiModelProperty(value = "周一交易数")
 	private String transCountMon;
-	/**
-	 * 周二交易数
-	 */
+
+	@ApiModelProperty(value = "周二交易数")
 	private String transCountTues;
-	/**
-	 * 周三交易数
-	 */
+
+	@ApiModelProperty(value = "周三交易数")
 	private String transCountWednes;
-	/**
-	 * 周四交易数
-	 */
+
+	@ApiModelProperty(value = "周四交易数")
 	private String transCountThurs;
-	/**
-	 * 周五交易数
-	 */
+
+	@ApiModelProperty(value = "周五交易数")
 	private String transCountFri;
-	/**
-	 * 周六交易数
-	 */
+
+	@ApiModelProperty(value = "周六交易数")
 	private String transCountSatur;
-	/**
-	 * 周日交易数
-	 */
+
+	@ApiModelProperty(value = "周日交易数")
 	private String transCountSun;
 
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/BankCardParamPojo.java

 package com.founder.commonutils.model.newPublicEntity.ztypEntity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -12,63 +14,48 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@ApiModel(value="银行卡param实体", description="")
 public class BankCardParamPojo {
-	/**
-	 * 任务id集合
-	 */
+
+	@ApiModelProperty(value = "任务id集合")
 	private List<String> taskIdList;
-	/**
-	 * 当前页
-	 */
+
+	@ApiModelProperty(value = "当前页")
 	private int page;
-	/**
-	 * 分页起始下标
-	 */
+
+	@ApiModelProperty(value = "分页起始下标")
 	private int start;
-	/**
-	 * 当前页显示数
-	 */
+
+	@ApiModelProperty(value = "当前页显示数")
 	private int limit;
-	/**
-	 * 交易时间规律统计-分析频次
-	 */
+
+	@ApiModelProperty(value = "交易时间规律统计-分析频次")
 	private String analysisFrequency;
-	/**
-	 * 交易时间-起始时间
-	 */
+
+	@ApiModelProperty(value = "交易时间-起始时间")
 	private String tradingTimeStart;
-	/**
-	 * 交易时间-截至时间
-	 */
+
+	@ApiModelProperty(value = "交易时间-截至时间")
 	private String tradingTimeEnd;
-	/**
-	 * 本方银行卡号
-	 */
+
+	@ApiModelProperty(value = "本方银行卡号")
 	private String bfCardsNum;
 
-	/**
-	 * 对方银行卡号
-	 */
+	@ApiModelProperty(value = "对方银行卡号")
 	private String dfCardsNum;
-	/**
-	 * 数据类型 01交易详情，02交易时间规律统计，03交易地域规律统计，04交易频度规律统计，05交易习惯统计
-	 */
+
+	@ApiModelProperty(value = "数据类型 01交易详情，02交易时间规律统计，03交易地域规律统计，04交易频度规律统计，05交易习惯统计")
 	private String dataType;
-	/**
-	 * 交易方
-	 */
+
+	@ApiModelProperty(value = "交易方")
 	private String traidParty;
-	/**
-	 * 交易银行（地点)
-	 */
+
+	@ApiModelProperty(value = "交易银行（地点)")
 	private String tradingBankName;
-	/**
-	 * 共同关系数，可视化分析专用
-	 */
+
+	@ApiModelProperty(value = "共同关系数，可视化分析专用")
 	private String commonRelationshipNum;
 
-	/**
-	 * 排序属性
-	 */
+	@ApiModelProperty(value = "排序属性")
 	private String orderField;
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/KshHdExcelImport.java

 package com.founder.commonutils.model.newPublicEntity.ztypEntity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,12 +13,15 @@ import java.io.Serializable;
  * @author yangyang
  */
 @Data
+@ApiModel(value="kshHdExcel导入", description="")
 public class KshHdExcelImport implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "本机号码")
 	@ExcelProperty(value = {"本机号码"},index = 0)
 	private String source;
 
+	@ApiModelProperty(value = "对方号码")
 	@ExcelProperty(value = {"对方号码"},index = 1)
 	private String target;
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/KshServicePojo.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -22,65 +24,65 @@ import java.util.Date;
 @Data
 @SuppressWarnings("serial")
 @TableName("ksh_service")
+@ApiModel(value=" 服务列表(ksh_service)表实体类", description="")
 public class KshServicePojo extends Model<KshServicePojo> {
+
     @TableId(type = IdType.INPUT)
-    /**信息主键编号（生成FW开头）*/
+    @ApiModelProperty(value = "信息主键编号（生成FW开头）")
     private String xxzjbh;
-    /**
-     * 算力名称
-     */
+
+    @ApiModelProperty(value = "算力名称")
     private String slname;
-    /**
-     * 算力描述
-     */
+
+    @ApiModelProperty(value = "算力描述")
     private String slms;
-    /**
-     * 请求url
-     */
+
+    @ApiModelProperty(value = "请求url")
     private String url;
-    /**
-     * 路由名称
-     */
+
+    @ApiModelProperty(value = "路由名称")
     private String lymc;
-    /**
-     * get/post方式
-     */
+
+    @ApiModelProperty(value = "get/post方式")
     private String type;
-    /**
-     是否带时间参数：0表示否，1表示是
-     */
+
+    @ApiModelProperty(value = "入参")
+    private String param;
+
+    @ApiModelProperty(value = "是否带时间参数：0表示否，1表示是")
     private String sfdsjcs;
-    /**
-     * 是否删除，0表示否，1表示是
-     */
+
+    @ApiModelProperty(value = "是否删除，0表示否，1表示是")
     private String isdeleted;
-    /**
-     * 创建时间
-     */
+
+    @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date cjsj;
-    /**
-     * 创建开始时间
-     */
+
+    @ApiModelProperty(value = "创建开始时间")
     @TableField(exist = false)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime cjkssj;
-    /**
-     * 创建结束时间
-     */
+
+    @ApiModelProperty(value = "创建结束时间")
     @TableField(exist = false)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime cjjssj;
-    /**
-     * 当前页
-     */
+
+    @ApiModelProperty(value = "当前页")
     @TableField(exist = false)
     private int page;
-    /**
-     * 路由名称
-     */
+
+    @ApiModelProperty(value = "路由名称")
     @TableField(exist = false)
     private int pageSize;
+    //双击节点查询 前端把类型传过来 后台做校验
+    @ApiModelProperty(value = "类型")
+    @TableField(exist = false)
+    private String objectType;
+
+    @TableField(exist = false)
+    private int num=2;
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/KshYhkExcelImport.java

 package com.founder.commonutils.model.newPublicEntity.ztypEntity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,12 +13,15 @@ import java.io.Serializable;
  * @author yangyang
  */
 @Data
+@ApiModel(value="KshYhkExcel导入", description="")
 public class KshYhkExcelImport implements Serializable {
 	private static final long serialVersionUID = 1L;
 
-	@ExcelProperty(value = {"本人卡号"},index = 0)
+	@ApiModelProperty(value = "本机号码")
+	@ExcelProperty(value = {"本机号码"},index = 0)
 	private String source;
 
-	@ExcelProperty(value = {"对方卡号"},index = 1)
+	@ApiModelProperty(value = "对方号码")
+	@ExcelProperty(value = {"对方号码"},index = 1)
 	private String target;
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/KsjResultParams.java

+package com.founder.commonutils.model.newPublicEntity.ztypEntity;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author yangyang
+ * @description 可视化分析实体
+ */
+@Data
+public class KsjResultParams {
+
+	private  Integer status;// 200成功   201失败
+
+	private  String  msg;// 自定义描述
+
+	private data data;
+
+	@Data
+	public static class data {
+		/**
+		 * 节点信息组（去重的）
+		 */
+		private List<Nodes> nodes;
+		/**
+		 * 关联关系组
+		 */
+		private List<Links> links;
+	}
+
+	@Data
+	public static class Nodes {
+		/**
+		 节点下面显示的名称，如果需要多个显示，请传
+		 "李xx\n23岁\n前端开发工程师" 单个的话就  "李xx"
+		 */
+		private String id;
+		/**
+		 * 节点信息的唯一值（例如证件号码），节点是否去重就是依据id
+		 */
+		private String label;
+		/**
+		 * 将节点所有的信息全部放到这个字段中，包括id和label，注意的是，这个对象必须有一个字段imgType(idcard: 人，aj: 案件，cph：车，sjk：手机，yhk：银行卡)判断节点图片
+		 */
+		private 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;
+		}
+
+	}
+
+	@Data
+	public static class Links {
+		/**
+		 * 源节点id值
+		 */
+		private String source;
+		/**
+		 * 目标节点id值
+		 */
+		private String target;
+		/**
+		 * 节点连线显示文字
+		 */
+		private String label;
+		/**
+		 * 将连线所有的信息全部放到这个字段中，注意事项同上，没有必要字段imgType
+		 */
+		private Properties properties;
+
+		@Data
+		public static class Properties {
+			/**
+			 * 源节点id值
+			 */
+			private String source;
+			/**
+			 * 目标节点id值
+			 */
+			private String target;
+			/**
+			 * 节点连线显示文字
+			 */
+			private String label;
+		}
+	}
+}

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/KsjResultPojo.java

@@ -50,6 +50,10 @@ public class KsjResultPojo {
 			 */
 			private String imgType;
 			/**
+			 * 人员照片
+			 */
+			private String imagePhoto;
+			/**
 			 * 节点颜色 #FF00FF
 			 */
 			private String boderColor;

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/NaoTuHdXx.java

 package com.founder.commonutils.model.newPublicEntity.ztypEntity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
+@ApiModel(value=" 脑图话单信息", description="")
 public class NaoTuHdXx implements Serializable {
-    private String yhsjhm;/*用户手机号*/
-    private String dfsjhm;/*对方手机号*/
-    private String hjsj;/*呼叫时间*/
-    private String thsc;/*通话时长*/
-    private String thcs;/*通话次数*/
-    private String thlx;/*通话类型*/
+
+    @ApiModelProperty(value = "用户手机号")
+    private String yhsjhm;
+    @ApiModelProperty(value = "对方手机号")
+    private String dfsjhm;
+    @ApiModelProperty(value = "呼叫时间")
+    private String hjsj;
+    @ApiModelProperty(value = "通话时长")
+    private String thsc;
+    @ApiModelProperty(value = "通话次数")
+    private String thcs;
+    @ApiModelProperty(value = "通话类型")
+    private String thlx;
+    @ApiModelProperty(value = "用户jz编号")
     private String yhjzbh;
+    @ApiModelProperty(value = "地方jz编号")
     private String dfjzbh;
 
     public String getYhsjhm() {

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/R.java

 package com.founder.commonutils.model.newPublicEntity.ztypEntity;
 
 import com.founder.commonutils.model.newPublicEntity.ResultCode;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,6 +10,7 @@ import java.util.Map;
 
 //统一返回结果的类
 @Data
+@ApiModel(value=" 统一返回结果的类R", description="")
 public class R {
 
     @ApiModelProperty(value = "是否成功")

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/TbStAsj3.java

@@ -24,7 +24,7 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("TB_ST_ASJ")
-@ApiModel(value="TbStAsj对象", description="案事件基本信息")
+@ApiModel(value="案事件基本信息3", description="案事件基本信息")
 public class TbStAsj3  implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -821,6 +821,7 @@ public class TbStAsj3  implements Serializable {
     @TableField("ajywztdm")
     private String ajywztdm;
 
+    @ApiModelProperty(value = "东莞专用-案别")
     @TableField("ab_dg")
     private String abDg;
 
@@ -829,8 +830,11 @@ public class TbStAsj3  implements Serializable {
     private String asjfsddGxpcs;
 
     //翻译
+    @ApiModelProperty(value = "案件类别翻译")
     private String ajlbdmStr;
+    @ApiModelProperty(value = "侦查阶段代码翻译")
     private String zcjddmStr;
+    @ApiModelProperty(value = "案事件发生地点行政区划代码翻译")
     private String asjfsddXzqhdmStr;
 
 

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/TbStRy.java

@@ -23,7 +23,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("TB_ST_RY")
-@ApiModel(value="TbStRy对象", description="人员基本信息")
+@ApiModel(value="人员基本信息", description="人员基本信息")
 public class TbStRy implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -337,21 +337,34 @@ public class TbStRy implements Serializable {
     private String gabxf;
 
     @TableField("RYSX")
+    @ApiModelProperty(value = "人员筛选")
     private String rysx;
 
     @TableField("BCRYBH")
+    @ApiModelProperty(value = "bc人员编号")
     private String bcrybh;
 
+    @ApiModelProperty(value = "性别代码翻译")
     private String xbdmStr;
+    @ApiModelProperty(value = "名字代码翻译")
     private String mzdmStr;
+    @ApiModelProperty(value = "籍贯代码翻译")
     private String jgssxdm;
+    @ApiModelProperty(value = "户籍地址行政区划代码翻译")
     private String hjdzXzqhdmStr;
+    @ApiModelProperty(value = "籍贯ss代码翻译")
     private String jgssxdmStr;
-	//文化程度
+
+
+    @ApiModelProperty(value = "文化程度")
 	private String whcd ;
+    @ApiModelProperty(value = "二代证照片路径")
 	private String edzzplj;
+    @ApiModelProperty(value = "工作单位")
 	private String fwcs;
+    @ApiModelProperty(value = "证件号码")
 	private String zjhm;
+    @ApiModelProperty(value = "出生日期_起始日期")
 	private Date csrqQsrq;
 
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/TbStZtypFwbsh.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.founder.commonutils.model.newPublicEntity.SysUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -17,72 +19,108 @@ import java.util.List;
  */
 @Data
 @TableName("tb_st_ztyp_fwbsh")
+@ApiModel(value="主题研判服务标识号研判实体", description="")
 public class TbStZtypFwbsh {
-	//信息主键编号
+
+	@ApiModelProperty(value = "信息主键编号")
 	@TableId(type = IdType.INPUT)
 	private String xxzjbh;
-	//服务标识号类别 CODE_FWBSH
+
+	@ApiModelProperty(value = "服务标识号类别")
 	private String fwbshLb;
+
+	@ApiModelProperty(value = "服务标识号类别翻译")
 	@TableField(exist = false)
 	private String fwbshLbStr;
-	//服务标识号号码
+
+	@ApiModelProperty(value = "服务标识号号码")
 	private String fwbshHm;
-	//服务标识号描述
+
+	@ApiModelProperty(value = "服务标识号描述")
 	private String fwbshMs;
 
+	@ApiModelProperty(value = "信息删除_判断标识")
 	private String xxscPdbz;
 
+	@ApiModelProperty(value = "信息登记单位_公安机关机构代码")
 	private String xxdjdwGajgjgdm;
 
+	@ApiModelProperty(value = "信息登记单位_公安机关名称")
 	private String xxdjdwGajgmc;
 
+	@ApiModelProperty(value = "信息登记人员_姓名")
 	private String xxdjryXm;
 
+	@ApiModelProperty(value = "信息登记人员_公民身份号码")
 	private String xxdjryGmsfhm;
 
+	@ApiModelProperty(value = "信息登记人员_联系电话")
 	private String xxdjryLxdh;
 
+	@ApiModelProperty(value = "登记时间")
 	private Date djsj;
 
+	@ApiModelProperty(value = "更新时间")
 	private Date gxsj;
 
+	@ApiModelProperty(value = "信息操作单位_公安机关机构代码")
 	private String xxczdwGajgjgdm;
 
+	@ApiModelProperty(value = "信息操作单位_公安机关名称")
 	private String xxczdwGajgmc;
 
+	@ApiModelProperty(value = "信息操作人员_姓名")
 	private String xxczryXm;
 
+	@ApiModelProperty(value = "信息操作人员_公民身份号码")
 	private String xxczryGmsfhm;
 
+	@ApiModelProperty(value = "信息来源描述")
 	private String xxlyms = "刑侦信息专业应用系统";
 
+	@ApiModelProperty(value = "信息入省库时间")
 	private Date xxrsksj;
 
+	@ApiModelProperty(value = "信息入部库时间")
 	private Date xxrbksj;
 
+	@ApiModelProperty(value = "信息入省库_判断标识")
 	private String xxrskPdbz;
 
+	@ApiModelProperty(value = "信息入部库_判断标识")
 	private String xxrbkPdbz;
 
+	@ApiModelProperty(value = "当前第几页")
+	@TableField(exist = false)
+	private int page;
+
+	@ApiModelProperty(value = "每页多少行")
 	@TableField(exist = false)
-	private int page;//当前第几页
+	private int limit;
 
+	@ApiModelProperty(value = "全省案件数量")
 	@TableField(exist = false)
-	private int limit;//每页多少行
+	private int qsajCount;
 
+	@ApiModelProperty(value = "全国案件数量")
 	@TableField(exist = false)
-	private int qsajCount;//全省案件数量
+	private int qgajCount;
 
+	@ApiModelProperty(value = "关联线索数量")
 	@TableField(exist = false)
-	private int qgajCount;//全国案件数量
+	private int glxsCount;
 
+	@ApiModelProperty(value = "单位代码")
 	@TableField(exist = false)
-	private int glxsCount;//关联线索数量
+	private String unitcode;
 
+	@ApiModelProperty(value = "全部下级单位代码")
 	@TableField(exist = false)
-	private String unitcode;//单位代码
+	private List<List<String>> unitcodeList;
+
+	@ApiModelProperty(value = "标识号表入参")
 	@TableField(exist = false)
-	private List<List<String>> unitcodeList;//全部下级单位代码
+	private List<String>  bshlb;
 
 	//登录人员
 	public void setDjUser(SysUser user){

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/TbXwLaShse.java

 package com.founder.commonutils.model.newPublicEntity.ztypEntity;
 
 import com.founder.commonutils.model.newPublicEntity.SysUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
+@ApiModel(value="涉黑涉恶案件立案信息", description="")
 public class TbXwLaShse  {
-    //关联信息_信息主键编号
+
+    @ApiModelProperty(value = "关联信息_信息主键编号")
     private String glxxXxzjbh;
 
-    //案事件编号
+    @ApiModelProperty(value = "案事件编号")
     private String asjbh;
 
-    //信息主键编号
+    @ApiModelProperty(value = "信息主键编号")
     private String xxzjbh;
 
-    //现场勘验编号
+    @ApiModelProperty(value = "现场勘验编号")
     private String xckybh;
 
-    //是否线下立案_判断标志
+    @ApiModelProperty(value = "是否线下立案_判断标志")
     private String sfxxlaPdbz;
 
-    //是否刑事案件_判断标志
+    @ApiModelProperty(value = "是否刑事案件_判断标志")
     private String sfxsajPdbz;
 
-    //立案_案件类别代码
+    @ApiModelProperty(value = "立案_案件类别代码")
     private String laAjlbdm;
+
+    @ApiModelProperty(value = "案件类别代码")
     private String ajlbdm;
 
-    //案件性质代码
+    @ApiModelProperty(value = "案件性质代码")
     private String laZatzJyqk;
 
-    //特殊手段代码
+    @ApiModelProperty(value = "特殊手段代码")
     private String tssddm;
 
-    //立案_案件名称
+    @ApiModelProperty(value = "立案_案件名称")
     private String laAjmc;
 
-    //立案_案事件发生时间_案事件发生开始时间
+    @ApiModelProperty(value = "立案_案事件发生时间_案事件发生开始时间")
     private String laAsjfssjAsjfskssj;
 
-    //立案_案事件发生时间_案事件发生结束时间
+    @ApiModelProperty(value = "立案_案事件发生时间_案事件发生结束时间")
     private String laAsjfssjAsjfsjssj;
 
-    //案发地区划代码
+    @ApiModelProperty(value = "案发地区划代码")
     private String laAsjfsddXzqhdm;
 
-    //案发地详址
+    @ApiModelProperty(value = "案发地详址")
     private String laAsjfsddDzmc;
 
-    //简要案情
+    @ApiModelProperty(value = "简要案情")
     private String laJyaq;
 
-    //立案_是否涉枪
+    @ApiModelProperty(value = "立案_是否涉枪")
     private String laSfsqPdbz;
 
-    //立案_是否涉爆
+    @ApiModelProperty(value = "立案_是否涉爆")
     private String laSfsbPdbz;
 
-    //立案_是否命案
+    @ApiModelProperty(value = "立案_是否命案")
     private String laSfmaPdbz;
 
-    //立案_是否涉外
+    @ApiModelProperty(value = "立案_是否涉外")
     private String laSfswPdbz;
 
-    //作案事由代码
+    @ApiModelProperty(value = "作案事由代码")
     private String laSyJyqk;
 
-    //立案日期
+    @ApiModelProperty(value = "立案日期")
     private String larq;
 
-    //立案单位代码
+    @ApiModelProperty(value = "立案单位代码")
     private String ladwGajgjgdm;
 
 
-    //立案单位名称
+    @ApiModelProperty(value = "立案单位名称")
     private String ladwGajgmc;
 
-    //主办人_姓名
+    @ApiModelProperty(value = "主办人_姓名")
     private String zbrXm;
 
-    //主办人_公民身份号码
+    @ApiModelProperty(value = "主办人_公民身份号码")
     private String zbrGmsfhm;
 
-    //主办人_联系电话
+    @ApiModelProperty(value = "主办人_联系电话")
     private String zbrLxdh;
 
-    //协办人_姓名
+    @ApiModelProperty(value = "协办人_姓名")
     private String xbrXm;
 
-    //协办人_公民身份号码
+    @ApiModelProperty(value = "协办人_公民身份号码")
     private String xbrGmsfhm;
 
-    //协办人_联系电话
+    @ApiModelProperty(value = "协办人_联系电话")
     private String xbrLxdh;
 
-    //刑事技术负责人_姓名
+    @ApiModelProperty(value = "刑事技术负责人_姓名")
     private String xsjsfzrXm;
 
-    //刑事技术负责人_公民身份号码
+    @ApiModelProperty(value = "刑事技术负责人_公民身份号码")
     private String xsjsfzrGmsfhm;
 
-    //刑事技术负责人_联系电话
+    @ApiModelProperty(value = "刑事技术负责人_联系电话")
     private String xsjsfzrLxdh;
 
-    //公安机关负责人_姓名
+    @ApiModelProperty(value = "公安机关负责人_姓名")
     private String gajgfzrXm;
 
-    //公安机关负责人_公民身份号码
+    @ApiModelProperty(value = "公安机关负责人_公民身份号码")
     private String gajgfzrGmsfhm;
 
-    //公安机关负责人_联系电话
+    @ApiModelProperty(value = "公安机关负责人_联系电话")
     private String gajgfzrLxdh;
 
 
 //    翻译为具体的值
-            //是否线下立案_判断标志
-        private String sfxxla;
-        //是否刑事案件_判断标志
-        private String sfxsaj;
-        //立案_案件类别代码
-        private String laAjlb;
-        //案件性质代码
-        private String laajxz;
-        //特殊手段代码
-        private String tssd;
-        //案发地区划代码
-        private String laAsjfsddXzqh;
-        //作案事由代码
-        private String zasy;
-        //立案单位字典码翻译
-        private String ladwStr;
+    @ApiModelProperty(value = "是否线下立案_判断标志")
+    private String sfxxla;
+
+    @ApiModelProperty(value = "是否刑事案件_判断标志")
+    private String sfxsaj;
+
+    @ApiModelProperty(value = "立案_案件类别代码")
+    private String laAjlb;
+
+    @ApiModelProperty(value = "案件性质代码")
+    private String laajxz;
+
+    @ApiModelProperty(value = "特殊手段代码")
+    private String tssd;
+
+    @ApiModelProperty(value = "案发地区划代码")
+    private String laAsjfsddXzqh;
+
+    @ApiModelProperty(value = "作案事由代码")
+    private String zasy;
+
+    @ApiModelProperty(value = "立案单位字典码翻译")
+    private String ladwStr;
+
+    @ApiModelProperty(value = "信息登记单位_公安机关机构代码")
     private String xxdjdwGajgjgdm;
 
+    @ApiModelProperty(value = "信息登记单位_公安机关名称")
     private String xxdjdwGajgmc;
 
+    @ApiModelProperty(value = "信息登记人员_姓名")
     private String xxdjryXm;
 
+    @ApiModelProperty(value = "信息登记人员_身份证")
     private String xxdjryGmsfhm;
 
+    @ApiModelProperty(value = "信息登记人员_联系电话")
     private String xxdjryLxdh;
 
+    @ApiModelProperty(value = "信息操作单位_公安机关机构代码")
     private String xxczdwGajgjgdm;
 
+    @ApiModelProperty(value = "信息操作单位_公安机关名称")
     private String xxczdwGajgmc;
 
+    @ApiModelProperty(value = "信息操作人员_姓名")
     private String xxczryXm;
 
+    @ApiModelProperty(value = "信息操作人员_身份证")
     protected String xxczryGmsfhm;
+    @ApiModelProperty(value = "信息操作人员_联系电话")
     protected String xxczryLxdh;
+
     public void setDjUser(SysUser user){
         this.xxdjryXm=user.getTrueName();
         this.xxdjdwGajgjgdm=user.getUnitcode();

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/TbYwShseTh.java

 package com.founder.commonutils.model.newPublicEntity.ztypEntity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author yangyang
  * @date 2022/7/27  --  19:19
  */
 
 @Data
+@ApiModel(value = "TbYwShseTh", description = "")
 public class TbYwShseTh{
 
-	//团伙编号
+	@ApiModelProperty(value = "团伙编号")
 	private String thbh;
 
-	//团伙关联嫌疑人数量
+	@ApiModelProperty(value = "团伙关联嫌疑人数量")
 	private Double thglxyrsl;
 
-	//团伙关联重点关注人员数量
+	@ApiModelProperty(value = "团伙关联重点关注人员数量")
 	private Double thglzdgzyrsl;
 
-	//团伙关联案件数量
+	@ApiModelProperty(value = "团伙关联案件数量")
 	private Double thglajsl;
 
-	//null
+	@ApiModelProperty(value = "null")
 	private Double thgljlajsl;
 
-	//是否删除
+	@ApiModelProperty(value = "是否删除")
 	private Double sfscPdbz;
 
+	@ApiModelProperty(value = "是否主团伙")
+	private String  sfzth;
 
-	private String  sfzth;//是否主团伙
+	@ApiModelProperty(value = "当前页")
+	private int  page;
 
-	private int  page;//当前页
+	@ApiModelProperty(value = "每页数")
+	private int  limit;
 
-	private int  limit;//每页数
+	List<String> ListBhs;
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/TbYwXshbXsglxyr.java

 package com.founder.commonutils.model.newPublicEntity.ztypEntity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -9,59 +11,75 @@ import lombok.Data;
  * @date 2021/11/22
  */
 @Data
+@ApiModel(value = "线索关联嫌疑人", description = "")
 public class TbYwXshbXsglxyr{
-	//出生日期
+
+	@ApiModelProperty(value = "出生日期")
 	private String csrq;
 
-	//国籍
+	@ApiModelProperty(value = "国籍代码")
 	private String gjdm;
+
+	@ApiModelProperty(value = "国籍代码翻译")
 	private String gjdmStr;
 
-	//身份证号码
+	@ApiModelProperty(value = "身份证号码")
 	private String gmsfzh;
 
-	//户籍地名称
+	@ApiModelProperty(value = "户籍地名称")
 	private String hjdzDzmc;
 
-	//户籍地区划
+	@ApiModelProperty(value = "户籍地区划代码")
 	private String hjdzXzqhdm;
+
+	@ApiModelProperty(value = "户籍地区划代码翻译")
 	private String hjdzXzqhdmStr;
 
-	//境外住址名称
+	@ApiModelProperty(value = "境外住址名称")
 	private String jwzzDzmc;
 
-	//境外住址区划
+	@ApiModelProperty(value = "境外住址区划代码")
 	private String jwzzGjhdqdm;
+
+	@ApiModelProperty(value = "境外住址区划代码翻译")
 	private String jwzzGjhdqdmStr;
 
-	//联系电话
+	@ApiModelProperty(value = "联系电话")
 	private String lxdh;
 
-	//民族
+	@ApiModelProperty(value = "民族代码")
 	private String mzdm;
+
+	@ApiModelProperty(value = "民族代码翻译")
 	private String mzdmStr;
 
-	//性别
+	@ApiModelProperty(value = "性别代码")
 	private String xbdm;
+
+	@ApiModelProperty(value = "性别代码翻译")
 	private String xbdmStr;
 
-	//姓名
+	@ApiModelProperty(value = "姓名")
 	private String xm;
 
-	//线索编号
+	@ApiModelProperty(value = "线索编号")
 	private String xsbh;
 
-	//信息主键编号
+	@ApiModelProperty(value = "信息主键编号")
 	private String xxzjbh;
 
-	//现住址名称
+	@ApiModelProperty(value = "现住址名称")
 	private String xzzDzmc;
 
-	//现住址区划
+	@ApiModelProperty(value = "现住址区划代码")
 	private String xzzXzqhdm;
+
+	@ApiModelProperty(value = "现住址区划代码翻译")
 	private String xzzXzqhdmStr;
 
-	//政治面貌
+	@ApiModelProperty(value = "政治面貌代码")
 	private String zzmmdm;
+
+	@ApiModelProperty(value = "政治面貌代码翻译")
 	private String zzmmdmStr;
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/TbZjlxxzx.java

@@ -10,62 +10,48 @@ import lombok.Data;
  */
 
 @Data
-@ApiModel(value = "TbZjlxxzx", description = "最新资金表")
-public class TbZjlxxzx  extends BaseModel{
+@ApiModel(value = "TbZjlxxzx最新资金表", description = "最新资金表")
+public class TbZjlxxzx extends BaseModel {
 
-
-	//本方卡号
 	@ApiModelProperty(value = "本方卡号")
 	private String bfkh;
 
-	//账号名称
 	@ApiModelProperty(value = "账号名称")
 	private String bfzhmc;
 
-	//对手卡号
 	@ApiModelProperty(value = "对手卡号")
 	private String dfkh;
 
-	//对手名称
 	@ApiModelProperty(value = "对手名称")
 	private String dfmc;
 
-	//交易时间
 	@ApiModelProperty(value = "交易时间")
 	private String jysj;
 
-	//转账金额
 	@ApiModelProperty(value = "转账金额")
 	private String zzje;
 
-	//余额
 	@ApiModelProperty(value = "余额")
 	private String zhye;
 
-	//进出标志
 	@ApiModelProperty(value = "进出标志")
 	private String jcbz;
 
-	//交易方式
 	@ApiModelProperty(value = "交易方式")
 	private String jyfs;
 
-	//交易流水号
 	@ApiModelProperty(value = "交易流水号")
 	private String jylsh;
 
 	@ApiModelProperty(value = "交易摘要")
 	private String jyzy;
 
-	//交易银行
 	@ApiModelProperty(value = "交易银行")
 	private String jyyh;
 
-	//信息主键编号
 	@ApiModelProperty(value = "信息主键编号")
 	private String xxzjbh;
 
-	//所属任务编号
 	@ApiModelProperty(value = "所属任务编号")
 	private String ssrwbh;
 

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/TbZxrwb.java

@@ -10,39 +10,36 @@ import lombok.Data;
  */
 
 @Data
-@ApiModel(value = "TbZxrwb", description = "任务表")
+@ApiModel(value = "TbZxrwb任务表", description = "任务表")
 public class TbZxrwb extends BaseModel{
 
-	//任务编号
 	@ApiModelProperty(value = "任务编号")
 	private String xxzjbh;
 
-	//任务名称
 	@ApiModelProperty(value = "任务名称")
 	private String zwmc;
 
-	//任务描述
 	@ApiModelProperty(value = "任务描述")
 	private String zwms;
+
 	@ApiModelProperty(value = "文件总数")
 	private int wjzs;
 
-	/**
-	 * 本方卡号数量
-	 */
+	@ApiModelProperty(value = "本方卡号数量")
 	private int bfCardsCount;
-	/**
-	 * 对方卡号数量
-	 */
+
+	@ApiModelProperty(value = "对方卡号数量")
 	private int dfCardsCount;
 
+	@ApiModelProperty(value = "任务开始时间")
 	private String rwkssj;
-	private String rwjssj;
-	protected int begin;
 
-	protected int end;
+	@ApiModelProperty(value = "任务结束时间")
+	private String rwjssj;
 
-	protected int page;//当前第几页
+	@ApiModelProperty(value = "当前页")
+	private int page;
 
-	protected int limit;//每页多少行
+	@ApiModelProperty(value = "每页总数")
+	private int limit;
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/TradingTaskPojo.java

 package com.founder.commonutils.model.newPublicEntity.ztypEntity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,46 +12,36 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@ApiModel(value="TradingTaskPojo", description="")
 public class TradingTaskPojo {
-	/**
-	 * 任务编号
-	 */
+
+	@ApiModelProperty(value = "任务编号")
 	private String taskId;
-	/**
-	 * 任务名称
-	 */
+
+	@ApiModelProperty(value = "任务名称")
 	private String taskName;
-	/**
-	 * 任务创建时间
-	 */
+
+	@ApiModelProperty(value = "任务创建时间")
 	private String taskCreatedTime;
-	/**
-	 * 本方卡号数量
-	 */
+
+	@ApiModelProperty(value = "本方卡号数量")
 	private String bfCardsCount;
-	/**
-	 * 对方卡号数量
-	 */
+
+	@ApiModelProperty(value = "对方卡号数量")
 	private String dfCardsCount;
-	/**
-	 * 交易银行数量
-	 */
+
+	@ApiModelProperty(value = "交易银行数量")
 	private String bankCount;
-	/**
-	 * 数据总量
-	 */
+
+	@ApiModelProperty(value = "数据总量")
 	private String allDataCount;
-	/**
-	 * 交易时间范围
-	 */
+
+	@ApiModelProperty(value = "交易时间范围")
 	private String transactionRange;
 
-	/**
-	 * 当前页
-	 */
+	@ApiModelProperty(value = "当前页")
 	private int page;
-	/**
-	 * 分页每页数量
-	 */
+
+	@ApiModelProperty(value = "分页每页数量")
 	private int limit;
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/TxxxParam.java

 package com.founder.commonutils.model.newPublicEntity.ztypEntity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 
+@ApiModel(value="TxxxParam", description="")
 public class TxxxParam implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	private String phoneNum;  //手机号码
-	private String kssj;      //开始时间
-	private String jssj;      //结束时间
-	private int page;         //页码
-	private int limit;        //数据数量/页
+	@ApiModelProperty(value = "手机号码")
+	private String phoneNum;
+
+	@ApiModelProperty(value = "开始时间")
+	private String kssj;
+
+	@ApiModelProperty(value = "结束时间")
+	private String jssj;
+
+	@ApiModelProperty(value = "页码")
+	private int page;
+
+	@ApiModelProperty(value = "数据数量")
+	private int limit;
+
+	@ApiModelProperty(value = "开始数")
 	private int startIndex;
+
+	@ApiModelProperty(value = "结束数")
 	private int endIndex;
 
 	public String getPhoneNum() {

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/ZpajxxEntity.java

 package com.founder.commonutils.model.newPublicEntity.ztypEntity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /*
@@ -9,28 +11,40 @@ import lombok.Data;
  * @Version 1.0
  */
 @Data
+@ApiModel(value="ZpajxxModel", description="")
 public class ZpajxxEntity {
 
+	@ApiModelProperty(value = "案事件编号")
 	private String asjbh;
 
+	@ApiModelProperty(value = "案件名称")
 	private String ajmc;
 
+	@ApiModelProperty(value = "作案特征_简要情况")
 	private String zatzJyqk;
 
+	@ApiModelProperty(value = "案件细类别")
 	private String ajxlb;
 
+	@ApiModelProperty(value = "案事件编号")
 	private String ajzlb;
 
+	@ApiModelProperty(value = "案件性质类别")
 	private String ajxzlb;
 
+	@ApiModelProperty(value = "小案类别补充描述名称")
 	private String xalbdmbcms;
 
+	@ApiModelProperty(value = "移动")
 	private String mobile;
 
+	@ApiModelProperty(value = "银行卡号")
 	private String yhkh;
 
+	@ApiModelProperty(value = "微信")
 	private String wx;
 
+	@ApiModelProperty(value = "身份证")
 	private String personid;
 
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ztypEntity/ZpajxxModel.java

 package com.founder.commonutils.model.newPublicEntity.ztypEntity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /*
@@ -9,19 +11,27 @@ import lombok.Data;
  * @Version 1.0
  */
 @Data
+@ApiModel(value="ZpajxxModel", description="")
 public class ZpajxxModel {
 
+	@ApiModelProperty(value = "案事件编号")
 	private String asjbh;
 
+	@ApiModelProperty(value = "案件名称")
 	private String ajmc;
 
+	@ApiModelProperty(value = "案件性质类别")
 	private String ajzlb;
 
+	@ApiModelProperty(value = "案件性质类案类别")
 	private String ajxzlb;
 
+	@ApiModelProperty(value = "小案类别补充描述名称")
 	private String xalbdmbcms;
 
+	@ApiModelProperty(value = "当前页")
 	private Integer page;
 
+	@ApiModelProperty(value = "每页数")
 	private Integer limit;
 }

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

+package com.founder.commonutils.util;
+
+/**
+ * 用于校验一个字符串是否是合法的JSON格式
+ *
+ */
+import java.text.CharacterIterator;
+import java.text.StringCharacterIterator;
+
+public class JsonValidator {
+    private CharacterIterator it;
+    private char              c;
+    private int               col;
+    public JsonValidator(){
+    }
+    /**
+     * 验证一个字符串是否是合法的JSON串
+     *
+     * @param input 要验证的字符串
+     * @return true-合法 ，false-非法
+     */
+    public boolean validate(String input) {
+        input = input.trim();
+        boolean ret = valid(input);
+        return ret;
+    }
+    private boolean valid(String input) {
+        if ("".equals(input)) return true;
+        boolean ret = true;
+        it = new StringCharacterIterator(input);
+        c = it.first();
+        col = 1;
+        if (!value()) {
+            ret = error("value", 1);
+        } else {
+            skipWhiteSpace();
+            if (c != CharacterIterator.DONE) {
+                ret = error("end", col);
+            }
+        }
+        return ret;
+    }
+    private boolean value() {
+        return literal("true") || literal("false") || literal("null") || string() || number() || object() || array();
+    }
+    private boolean literal(String text) {
+        CharacterIterator ci = new StringCharacterIterator(text);
+        char t = ci.first();
+        if (c != t) return false;
+        int start = col;
+        boolean ret = true;
+        for (t = ci.next(); t != CharacterIterator.DONE; t = ci.next()) {
+            if (t != nextCharacter()) {
+                ret = false;
+                break;
+            }
+        }
+        nextCharacter();
+        if (!ret) error("literal " + text, start);
+        return ret;
+    }
+    private boolean array() {
+        return aggregate('[', ']', false);
+    }
+    private boolean object() {
+        return aggregate('{', '}', true);
+    }
+    private boolean aggregate(char entryCharacter, char exitCharacter, boolean prefix) {
+        if (c != entryCharacter) return false;
+        nextCharacter();
+        skipWhiteSpace();
+        if (c == exitCharacter) {
+            nextCharacter();
+            return true;
+        }
+        for (;;) {
+            if (prefix) {
+                int start = col;
+                if (!string()) return error("string", start);
+                skipWhiteSpace();
+                if (c != ':') return error("colon", col);
+                nextCharacter();
+                skipWhiteSpace();
+            }
+            if (value()) {
+                skipWhiteSpace();
+                if (c == ',') {
+                    nextCharacter();
+                } else if (c == exitCharacter) {
+                    break;
+                } else {
+                    return error("comma or " + exitCharacter, col);
+                }
+            } else {
+                return error("value", col);
+            }
+            skipWhiteSpace();
+        }
+        nextCharacter();
+        return true;
+    }
+    private boolean number() {
+        if (!Character.isDigit(c) && c != '-') return false;
+        int start = col;
+        if (c == '-') nextCharacter();
+        if (c == '0') {
+            nextCharacter();
+        } else if (Character.isDigit(c)) {
+            while (Character.isDigit(c))
+                nextCharacter();
+        } else {
+            return error("number", start);
+        }
+        if (c == '.') {
+            nextCharacter();
+            if (Character.isDigit(c)) {
+                while (Character.isDigit(c))
+                    nextCharacter();
+            } else {
+                return error("number", start);
+            }
+        }
+        if (c == 'e' || c == 'E') {
+            nextCharacter();
+            if (c == '+' || c == '-') {
+                nextCharacter();
+            }
+            if (Character.isDigit(c)) {
+                while (Character.isDigit(c))
+                    nextCharacter();
+            } else {
+                return error("number", start);
+            }
+        }
+        return true;
+    }
+    private boolean string() {
+        if (c != '"') return false;
+        int start = col;
+        boolean escaped = false;
+        for (nextCharacter(); c != CharacterIterator.DONE; nextCharacter()) {
+            if (!escaped && c == '\\') {
+                escaped = true;
+            } else if (escaped) {
+                if (!escape()) {
+                    return false;
+                }
+                escaped = false;
+            } else if (c == '"') {
+                nextCharacter();
+                return true;
+            }
+        }
+        return error("quoted string", start);
+    }
+    private boolean escape() {
+        int start = col - 1;
+        if (" \\\"/bfnrtu".indexOf(c) < 0) {
+            return error("escape sequence  \\\",\\\\,\\/,\\b,\\f,\\n,\\r,\\t  or  \\uxxxx ", start);
+        }
+        if (c == 'u') {
+            if (!ishex(nextCharacter()) || !ishex(nextCharacter()) || !ishex(nextCharacter())
+                    || !ishex(nextCharacter())) {
+                return error("unicode escape sequence  \\uxxxx ", start);
+            }
+        }
+        return true;
+    }
+    private boolean ishex(char d) {
+        return "0123456789abcdefABCDEF".indexOf(c) >= 0;
+    }
+    private char nextCharacter() {
+        c = it.next();
+        ++col;
+        return c;
+    }
+    private void skipWhiteSpace() {
+        while (Character.isWhitespace(c)) {
+            nextCharacter();
+        }
+    }
+    private boolean error(String type, int col) {
+        System.out.printf("type: %s, col: %s%s", type, col, System.getProperty("line.separator"));
+        return false;
+    }
+    public static void main(String[] args){
+        String s ="{\n" +
+                "\t\"param\":[\n" +
+                "\t\t{\"name\":\"身份证号\",\"id\":\"sfzh\",\"type\": \"text\"},{\"name\":\"类型\",\"id\":\"type\",\"type\":\"optional\",\"value\":[{\"lable\":\"配偶\",\"value\":\"01\"},{\"lable\":\"子女\",\"value\":\"02\"}]},{\"name\":\"开始时间\",\"id\":\"timeStart\",\"type\":\"time\",\"format\":\"yyyy-MM-dd\"},{\"name\":\"结束时间\",\"id\":\"timeEnd\",\"type\":\"time\",\"format\":\"yyyy-MM-dd\"}\n" +
+                "\t]\n" +
+                "\t\n" +
+                "}";
+        System.out.println(s+":"+new JsonValidator().validate(s));
+    }
+}

common/service_base/src/main/java/com/founder/servicebase/service/KshCacheService.java

 package com.founder.servicebase.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.founder.commonutils.model.newPublicEntity.MapRestResult;
 import com.founder.commonutils.model.newPublicEntity.kshEntity.KshServiceCache;
 
 /**
@@ -11,5 +12,8 @@ import com.founder.commonutils.model.newPublicEntity.kshEntity.KshServiceCache;
  */
 public interface KshCacheService extends IService<KshServiceCache> {
     int deleteKshCacheById(String xxzjbh);
+
+    //条件查询可视化服务信息
+    MapRestResult getfFindKshCache(KshServiceCache kshServiceCache);
 }
 

common/service_base/src/main/java/com/founder/servicebase/service/serviceimpl/KshCacheServiceImpl.java

 package com.founder.servicebase.service.serviceimpl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.founder.commonutils.model.newPublicEntity.MapRestResult;
 import com.founder.commonutils.model.newPublicEntity.kshEntity.KshServiceCache;
+import com.founder.commonutils.model.newPublicEntity.kshResult.KshTreeResultPojo;
 import com.founder.servicebase.mapper.mysqlMapper.KshCacheMapper;
 import com.founder.servicebase.service.KshCacheService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
 /**
  * 服务列表(SkService)表服务实现类
  *
@@ -23,5 +30,155 @@ public class KshCacheServiceImpl extends ServiceImpl<KshCacheMapper, KshServiceC
     public int deleteKshCacheById(String xxzjbh) {
         return kshCacheMapper.deleteById(xxzjbh);
     }
+
+    //条件查询可视化服务信息
+    @Override
+    public MapRestResult getfFindKshCache(KshServiceCache kshServiceCache) {
+
+        KshTreeResultPojo ResultPojo = new KshTreeResultPojo();//定义要返回的可视化数据
+        List<KshTreeResultPojo.Nodes> ResultNodes = new ArrayList<KshTreeResultPojo.Nodes>();
+        List<KshTreeResultPojo.Links> ResultLinks = new ArrayList<KshTreeResultPojo.Links>();
+
+        //前端要查询的字段
+        String param = kshServiceCache.getParam();
+        //前端要查询的类型
+        String type = kshServiceCache.getParamType();
+        if (StringUtils.isEmpty(param) || StringUtils.isEmpty(type)){
+            return new MapRestResult(200, "请输入筛选条件", null);
+        }
+        String byzd1 = kshServiceCache.getByzd1(); //大于小于等于
+        //获取可视化数据
+        KshTreeResultPojo kshdata = kshServiceCache.getKshdata();
+        List<KshTreeResultPojo.Nodes> nodes = kshdata.getNodes(); //nodes
+        List<KshTreeResultPojo.Links> links = kshdata.getLinks(); //links
+
+        //获取所有的link中source并去重 就是根节点的id
+        Set<String> collect = kshdata.getLinks().stream()
+                .map(KshTreeResultPojo.Links::getSource)
+                .collect(Collectors.toSet());
+        if (collect.size() == 0) {
+            return new MapRestResult(200, "没找到对应的数据", null);
+        }
+        //在node中对应的id 就是根节点
+        //存放node的id 为了查询links
+        HashSet<String> ids = new HashSet<>();
+
+        // 过滤节点数组，找到每个根节点
+        nodes.forEach(node -> {
+            for (String s : collect) {
+                if (node.getId().equals(s)) {
+                    //添加根节点
+                    ResultNodes.add(node);
+                    //存放根节点id
+                    ids.add(node.getId());
+                }
+            }
+        });
+//        =========ResultNodes已经添加上根节点
+        if (type.equals("nodes")) { //查找对象
+            AtomicInteger i = new AtomicInteger(1);
+            nodes.forEach(node -> {
+                //添加筛选的节点  根nodes中的lable来模糊查
+                if (node.getLabel().contains(param)) {
+                    i.getAndIncrement();
+                    ResultNodes.add(node);
+                    ids.add(node.getId());
+                }
+            });
+            if (i.get() == 1) {
+                return new MapRestResult(200, "没找到对应的数据", null);
+            }
+            //最后nodes根据id去重 避免根节点包含param
+            List<KshTreeResultPojo.Nodes> collect1 = ResultNodes
+                    .stream().collect(
+                            Collectors.collectingAndThen(
+                                    Collectors.toCollection(
+                                            () -> new TreeSet<>(
+                                                    Comparator.comparing(tc -> tc.getId())
+                                            )), ArrayList::new));
+
+            //  --------nodes结束---------
+            //在links的target中找对应的nodesid
+            links.forEach(link -> {
+                for (String id : ids) {
+                    if (link.getTarget().equals(id)) {
+                        //添加根节点
+                        ResultLinks.add(link);
+                    }
+                }
+            });
+            //---------links结束----------
+
+            ResultPojo.setNodes(collect1);
+            ResultPojo.setLinks(ResultLinks);
+
+        } else if (type.equals("links")) { //查找关系
+            //links中lable是关系数据
+            AtomicInteger i = new AtomicInteger(1);
+            links.forEach(link -> {
+                //添加符合关系的数据
+                if (link.getLabel().contains(param)) {
+                    i.getAndIncrement();
+                    ResultLinks.add(link);
+                }
+            });
+            if (i.get() == 1) {
+                return new MapRestResult(200, "没找到对应的数据", null);
+            }
+            //遍历ResultLinks 获取和target所有 nodes中对应id获取对应的数据  ---ResultNodes 已经有根节点
+            nodes.forEach(n -> {
+                ResultLinks.forEach(l -> {
+                    if (n.getId().equals(l.getTarget())) {
+                        ResultNodes.add(n);
+                    }
+                });
+            });
+            ResultPojo.setNodes(ResultNodes);
+            ResultPojo.setLinks(ResultLinks);
+
+
+        } else if (type.equals("searchValue")) { //筛选关系个数节点
+            //根据source对links分组 来判断有关系节点
+            Map<String, List<KshTreeResultPojo.Links>> collect1 = links.stream()
+                    .collect(Collectors.groupingBy(KshTreeResultPojo.Links::getSource));
+            //设置link
+            for (Map.Entry<String, List<KshTreeResultPojo.Links>> s : collect1.entrySet()) {
+                int size = s.getValue().size();
+                if (byzd1.equals("大于") && size > Integer.valueOf(param)) {
+                    for (KshTreeResultPojo.Links links1 : s.getValue()) {
+                        ResultLinks.add(links1);
+                    }
+
+                } else if (byzd1.equals("小于") && size < Integer.valueOf(param)) {
+                    for (KshTreeResultPojo.Links links1 : s.getValue()) {
+                        ResultLinks.add(links1);
+                    }
+                } else if (byzd1.equals("等于") && (size == Integer.valueOf(param))) {
+                    for (KshTreeResultPojo.Links links1 : s.getValue()) {
+                        ResultLinks.add(links1);
+                    }
+                }
+            }
+            if (ResultLinks.size() == 0) {
+                return new MapRestResult(200, "没找到对应的数据", null);
+            }
+            //遍历ResultLinks获取target   target= node。id
+            Set<String> targets = ResultLinks.stream()
+                    .map(KshTreeResultPojo.Links::getTarget)
+                    .collect(Collectors.toSet());
+            //遍历nodes去获取对应的node
+            nodes.forEach(node->{
+                targets.forEach(target->{
+                    if (node.getId().equals(target)){
+                        ResultNodes.add(node);
+                    }
+                });
+            });
+            ResultPojo.setNodes(ResultNodes);
+            ResultPojo.setLinks(ResultLinks);
+        }
+
+        return new MapRestResult(ResultPojo);
+    }
 }
 

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/TbStZtypFwbshMapper.java

@@ -27,8 +27,8 @@ public interface TbStZtypFwbshMapper extends BaseMapper<TbStZtypFwbsh> {
 	 * @author yangyang
 	 * 2022/4/24 10:07
 	 */
-	IPage<TbStZtypFwbsh> selectPageByFwbsh(Page<TbStZtypFwbsh> page, @Param("fwbsh") TbStZtypFwbsh fwbsh);
-
+	List<TbStZtypFwbsh> selectPageByFwbsh(@Param("fwbsh") TbStZtypFwbsh fwbsh);
+	int selectPageByFwbshCount(@Param("fwbsh") TbStZtypFwbsh fwbsh);
 	/**
 	 * selectSfzPageByFwbsh 根据号码分页查询(身份证号码)
 	 * @return com.baomidou.mybatisplus.core.metadata.IPage<org.springblade.founder.ztyp.entity.TbStZtypFwbsh>

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/ZtypMapper.java

@@ -27,6 +27,12 @@ public interface ZtypMapper{
     //案件团伙分析count
     Integer queryAjypfxCount(AjQueryParam requestParam);
 
+    //案件团伙分析登记主数据
+    List<AjypFxPojo> queryAjypfxDataDj(AjQueryParam requestParam);
+
+    //案件团伙分析登记count
+    Integer queryAjypfxCountDj(AjQueryParam requestParam);
+
     //获取团伙的通话记录
     List<Map<String, String>> getThConnectPhoneList(String thbh);
 
@@ -42,9 +48,15 @@ public interface ZtypMapper{
     //查询团伙关联案件信息数量
     int getThgaByThbhCount(TbYwShseTh tbYwShseTh);
 
+    //查询团伙关联案件信息
+    List<TbStAsj> getThgaByKsh(TbYwShseTh tbYwShseTh);
+
     //查询团伙关联嫌疑人信息
     List<TbXwZbfzxyr> getThxyrByThbh(TbYwShseTh tbYwShseTh);
 
+    //查询团伙关联嫌疑人信息
+    List<TbXwZbfzxyr> getThxyrByKsh(TbYwShseTh tbYwShseTh);
+
     //查询团伙关联嫌疑人信息数量
     int getThxyrByThbhCount(TbYwShseTh tbYwShseTh);
 
@@ -67,6 +79,10 @@ public interface ZtypMapper{
 
     List<AjThKshfxPojo> getGroupAsjList(@Param("fzXyrList") List<String> fzXyrList);
 
+    List<AjThKshfxPojo> getGroupXyrListByThbhDj(String thbh);
+
+    List<AjThKshfxPojo> getGroupAsjListDj(@Param("fzXyrList") List<String> fzXyrList);
+
     List<AjThKshfxPojo> getKshConnectPhoneList(String thbh);
 
     List<AjThKshfxPojo> getkshConnectIpList(String thbh);
@@ -75,4 +91,26 @@ public interface ZtypMapper{
 
     int getXsbkOrCbBshByPhoneNum(@Value("phoneNum") String phoneNum);
 
+    /**
+     * insertThGlXYR 在团伙关联嫌疑人中间表中插入数据
+     *
+     * @param xyr: 嫌疑人信息
+     */
+    void insertThGlXYRDj(AjXyrResult xyr);
+
+    /**
+     * insertThGlASJ 在团伙关联案件中间表中插入数据
+     *
+     * @param aj: 案件信息
+     */
+    void insertThGlASJDj(AjQueryResult aj);
+
+    /**
+     * insertTh 插入团伙信息
+     *
+     * @param accomplicee: 团伙信息
+     */
+    void insertThDj(Accomplicee accomplicee);
+
+    Integer findZdmzyrByZjhm(String zjhm);
 }

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

@@ -2,13 +2,75 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.founder.publicapi.mapper.mysqlMapper.TbStZtypFwbshMapper">
     <select id="selectPageByFwbsh" resultType="com.founder.commonutils.model.newPublicEntity.ztypEntity.TbStZtypFwbsh">
-        select
-        (SELECT count(1) FROM tb_xsz_cbyp_qgaj WHERE CBXGFWBZH = fwbsh_hm) as qgajCount,
-        <include refid="fwbsh-queryColumn"/>
-        from tb_st_ztyp_fwbsh
+        SELECT  xxzjbh,
+        fwbsh_lb as fwbshLb,
+        (SELECT count(*) FROM tb_xsz_cbyp_qgaj WHERE CBXGFWBZH = fwbsh_hm) as qgajCount,
+        (select name from sys_dictitem where GROUPID = 'CODE_CBYP_BSHLX' and code = fwbsh_lb) as fwbshLbStr,
+        fwbsh_hm as fwbshHm,
+        fwbsh_ms as fwbshMs,
+        djsj as djsj,
+        xxdjdw_gajgjgdm as xxdjdwGajgjgdm,
+        xxdjdw_gajgmc as xxdjdwGajgmc,
+        xxdjry_xm as xxdjryxm,
+        xxdjry_gmsfhm as xxdjryGmsfhm,
+        xxdjry_lxdh as xxdjryLxdh
+        FROM tb_st_ztyp_fwbsh
         where XXSC_PDBZ = '0'
         <include refid="fwbsh-queryParam"/>
+
+        UNION ALL
+
+        SELECT xxzjbh as xxzjbh ,
+        ASJXGFWBZH_FWBZH_FWBZHLBDM as fwbshLb,
+        (SELECT count(*) FROM tb_xsz_cbyp_qgaj WHERE CBXGFWBZH = asjxgfwbzh_fwbzh) as qgajCount,
+        (select name from sys_dictitem where groupid = 'CODE_FWBSH' and code = ASJXGFWBZH_FWBZH_FWBZHLBDM) as fwbshLbStr,
+        asjxgfwbzh_fwbzh as fwbshHm,
+        '系统自动提取' as fwbshMs,
+        djsj as djsj ,
+        '系统' as xxdjdwGajgjgdm,
+        '系统' as xxdjdwGajgmc,
+        '系统' as xxdjryxm,
+        '系统' as xxdjryGmsfhm,
+        '系统' as xxdjryLxdh
+        FROM tb_xw_asjxgfwbzh
+        where xxsc_pdbz=0
+        and ASJXGFWBZH_FWBZH_FWBZHLBDM in
+        <foreach collection="fwbsh.bshlb" item="bsh" open="(" separator="," close=")">
+            #{bsh,jdbcType=VARCHAR}
+        </foreach>
+        <if test="fwbsh.fwbshHm != null and fwbsh.fwbshHm != ''">
+            and instr(asjxgfwbzh_fwbzh,  #{fwbsh.fwbshHm,jdbcType=VARCHAR}) > 0
+        </if>
+        <if test="fwbsh.xxdjryXm != null and fwbsh.xxdjryXm != ''">
+            and '系统' like concat('%',#{fwbsh.xxdjryXm,jdbcType=VARCHAR},'%')
+        </if>
         order by djsj desc
+        limit #{fwbsh.page},#{fwbsh.limit}
+    </select>
+
+    <select id="selectPageByFwbshCount" resultType="java.lang.Integer">
+        select sum(a.x) from (
+        SELECT  count(*) as x
+        FROM tb_st_ztyp_fwbsh
+        where XXSC_PDBZ = '0'
+        <include refid="fwbsh-queryParam"/>
+
+        UNION ALL
+
+        SELECT count(*) as x
+        FROM tb_xw_asjxgfwbzh
+        where xxsc_pdbz=0
+        and ASJXGFWBZH_FWBZH_FWBZHLBDM in
+        <foreach collection="fwbsh.bshlb" item="bsh" open="(" separator="," close=")">
+            #{bsh,jdbcType=VARCHAR}
+        </foreach>
+        <if test="fwbsh.fwbshHm != null and fwbsh.fwbshHm != ''">
+            and instr(asjxgfwbzh_fwbzh,  #{fwbsh.fwbshHm,jdbcType=VARCHAR}) > 0
+        </if>
+        <if test="fwbsh.xxdjryXm != null and fwbsh.xxdjryXm != ''">
+            and '系统' like concat('%',#{fwbsh.xxdjryXm,jdbcType=VARCHAR},'%')
+        </if>
+        ) as a
     </select>
     <select id="selectSfzPageByFwbsh" resultType="com.founder.commonutils.model.newPublicEntity.ztypEntity.TbStZtypFwbsh">
         select

service/publicapi/src/main/java/com/founder/publicapi/service/ZtypService.java

@@ -3,10 +3,6 @@ package com.founder.publicapi.service;
 
 import com.founder.commonutils.model.newPublicEntity.*;
 import com.founder.commonutils.model.newPublicEntity.ztypEntity.*;
-import com.founder.commonutils.model.newPublicEntity.ztypEntity.AjQueryParam;
-import com.founder.commonutils.model.newPublicEntity.ztypEntity.TbStZtypFwbsh;
-import com.founder.commonutils.model.newPublicEntity.ztypEntity.ZpajxxEntity;
-import com.founder.commonutils.model.newPublicEntity.ztypEntity.ZpajxxModel;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -44,6 +40,8 @@ public interface ZtypService{
     void updateFwbshYp(TbStZtypFwbsh fwbsh);
     List<AjypFxPojo> queryAjypfxData(AjQueryParam requestParam);
     Integer queryAjypfxCount(AjQueryParam requestParam);
+    List<AjypFxPojo> queryAjypfxDataDj(AjQueryParam requestParam);
+    Integer queryAjypfxCountDj(AjQueryParam requestParam);
     /**
      * kshdata 标识号可视化
      * @param fwbsh: 标识号
@@ -58,15 +56,24 @@ public interface ZtypService{
     //查询团伙关联案件信息数量
     int getThgaByThbhCount(TbYwShseTh tbYwShseTh);
 
+    //查询团伙关联案件信息
+    List<TbStAsj> getThgaByKsh(TbYwShseTh tbYwShseTh);
+
     //查询团伙关联嫌疑人信息
     List<TbXwZbfzxyr> getThxyrByThbh(TbYwShseTh tbYwShseTh);
 
+    //查询团伙关联嫌疑人信息
+    List<TbXwZbfzxyr> getThxyrByKsh(TbYwShseTh tbYwShseTh);
+
     //查询团伙关联嫌疑人信息数量
     int getThxyrByThbhCount(TbYwShseTh tbYwShseTh);
 
     //根据推荐的团伙信息添加犯罪团伙
     String addFzthaj(TbYwCchshzztjb cchshzztjb, HttpServletRequest request);
 
+    //根据可视化团伙信息添加犯罪团伙
+    String addFzthajKsh(TbYwCchshzztjb cchshzztjb, HttpServletRequest request);
+
     Map<String, Object> getSjhJzxx(String phoneNum) throws Exception;
 
     Map<String, Object> getSjInfo(TxxxParam txxxParam) throws Exception;
@@ -75,5 +82,7 @@ public interface ZtypService{
 
     MapRestResult getThfxAccompliceBythId(String thbh, String fxwd, String commonRelationshipNum);
 
+    MapRestResult getThfxAccompliceBythIdDj(String thbh, String fxwd, String commonRelationshipNum);
+
     Integer judgePhone(String phoneNum);
 }