skyp_bz添加研判管理（关键词）

common/common_utils/src/main/java/com/founder/commonutils/model/vo/param/SkljServiceParam.java

@@ -25,6 +25,9 @@ public class SkljServiceParam {
     @ApiModelProperty(value = "链接类型名称")
     private String serviceTypeName;
 
+    @ApiModelProperty(value = "所属省份")
+    private String content;
+
     @ApiModelProperty(value = "行数")
     public Integer page;
 

common/common_utils/src/main/java/com/founder/commonutils/model/ypglEntity/AsjQygz.java

+package com.founder.commonutils.model.ypglEntity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AsjQygz {
+    //查询案事件信息使用
+    private String kssj;
+    private String jssj;
+    private String ajlbdm;
+    private String ajlbmc;
+    private String asjbh;
+    private String asjmc;
+    private String zjhm;
+    private String j;
+    private String w;
+    private String trueName;
+    //保存固证任务使用
+    private String id;
+    private String userName;
+    private String taskId;
+    private String taskStatus;//任务状态 PLANNED,计划中 FINISHED 完成 ERROR 错误
+    private String progress;// 任务进度 1表示百分百 完成
+    private String lrlb;
+    private String createTime;
+    //任务列表展示使用
+    private String jyaq;
+
+    //分页使用
+    private int currentPageNo;
+    private int pageSize;
+    private int startNum;
+    private int  endNum;
+    private String taskStatusQ;
+    private String address;
+    private String xalbmc;
+    private String xzqhmc;
+    private List<String> asjbhList;
+    private String yxAsjbh;
+}

common/common_utils/src/main/java/com/founder/commonutils/model/ypglEntity/Asjbz.java

+package com.founder.commonutils.model.ypglEntity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class Asjbz {
+    private String xxzjbh;
+    private String ajfl;  //案件分类
+    private String ajflCode; //案件分类Code
+    private String ajzlb; //主案类别
+    private String ajzlbCode; //主案类别Code
+    private String ajxzlb; //类案类别
+    private String ajxzlbCode;  //类案类别Code
+    private Date djsj;
+    private String caj;   //次类案类别
+    private String code;  //次类案类别Code
+    private String key;
+    private String keywords;  //关键词组，用逗号分隔
+    private String keyWordName; //关键词组名称
+    private String operators;  //运算符，用逗号隔开
+    private String xxdjdwgajgmc;
+    private String xxdjrygmsfhm; //信息登记人身份证号
+    private String xxjdwgajgjgdm; //信息登记单位名称
+    private String xxczryxm; //信息操作人姓名
+    private String xxczrygmsfhm;  //信息操作人身份证号
+    private String xxdjrylxdh; //信息登记人联系电话
+    private String xxczdwgajgjgdm; //信息操作单位代码
+    private String xxczdwgajgmc; //信息操作单位名称
+    private String zj;
+    private String xalb;
+    private Date gxsj; //更新时间
+    private String xxscpdbz;  //删除标识
+    private int endNum;
+    private int startNum;
+}

common/common_utils/src/main/java/com/founder/commonutils/model/ypglEntity/DictItem.java

+package com.founder.commonutils.model.ypglEntity;
+
+import java.util.Date;
+
+
+/**
+ * <p>Title: DictItem.java</p>
+ * <p>Description:代码项 </p>
+ * <p>Copyright: HIGHLAND'S Copyright (c) 2013</p>
+ * <p>Company: HIGHLAND</p>
+ * @author highland_team_Luojx
+ * @date 2013-9-27
+ * @version 1.0
+ */
+@SuppressWarnings("serial")
+public class DictItem {
+
+	//代码值
+	private String code;
+	private String newcode;
+	//代码中文名称
+	private String name;
+	private String newname;
+	private String namecode;
+	//代码表名称
+	private String groupid;
+	//代码表名称
+	private String groupname;
+	private String pid;
+	private String spell;
+	private String wbzx;
+	private String simple;
+	//子孙编号对应的父编号，位处理案件列别和案件性质的关系而增加
+	private Object pId1;
+	//子孙编号对应的父编号
+	private Object pId2;
+	//子孙编号对应的父编号
+	private Object pId3;
+	//子孙编号对应的父编号
+	private Object pId4;
+	//子孙编号对应的父编号
+	private Object pId5;
+	//子孙编号对应的父编号
+	private Object pId6;
+	//应用场景
+	private String yycj1;
+	private String yycj2;
+	private String yycj3;
+	private String yycj4;
+	private String yycj5;
+	private String yycj6;
+	private String yycj7;
+	private String yycj8;
+	//开始代码
+	private String startcode;
+	//结束代码
+	private String endcode;
+	//是否是父节点
+	private String isParent;
+	//描述
+	private String description;
+
+	private String gxr;
+	private Date gxsj;
+	private String ajs;
+
+	//新疆字典维护树节点路径
+	private String selectPath;
+
+	public String getNewcode() {
+		return newcode;
+	}
+	public void setNewcode(String newcode) {
+		this.newcode = newcode;
+	}
+	public String getNewname() {
+		return newname;
+	}
+	public void setNewname(String newname) {
+		this.newname = newname;
+	}
+	private String lrr;
+	private Date lrsj;
+	private String levelid;
+	private String scbz;
+	private String lrdwdm;
+	private String lrdwmc;
+	private String id;
+
+	public String getCode() {
+		return code;
+	}
+	public void setCode(String code) {
+		this.code = code;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getGroupid() {
+		return groupid;
+	}
+	public void setGroupid(String groupid) {
+		this.groupid = groupid;
+	}
+	public String getPid() {
+		return pid;
+	}
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+	public String getSpell() {
+		return spell;
+	}
+	public void setSpell(String spell) {
+		this.spell = spell;
+	}
+	public String getWbzx() {
+		return wbzx;
+	}
+	public void setWbzx(String wbzx) {
+		this.wbzx = wbzx;
+	}
+	public String getSimple() {
+		return simple;
+	}
+	public void setSimple(String simple) {
+		this.simple = simple;
+	}
+	public String getGroupname() {
+		return groupname;
+	}
+	public void setGroupname(String groupname) {
+		this.groupname = groupname;
+	}
+	public Object getpId1() {
+		return pId1;
+	}
+	public void setpId1(Object pId1) {
+		this.pId1 = pId1;
+	}
+	public Object getpId2() {
+		return pId2;
+	}
+	public void setpId2(Object pId2) {
+		this.pId2 = pId2;
+	}
+	public Object getpId3() {
+		return pId3;
+	}
+	public void setpId3(Object pId3) {
+		this.pId3 = pId3;
+	}
+	public Object getpId4() {
+		return pId4;
+	}
+	public void setpId4(Object pId4) {
+		this.pId4 = pId4;
+	}
+	public String getYycj1() {
+		return yycj1;
+	}
+	public void setYycj1(String yycj1) {
+		this.yycj1 = yycj1;
+	}
+	public String getYycj2() {
+		return yycj2;
+	}
+	public void setYycj2(String yycj2) {
+		this.yycj2 = yycj2;
+	}
+	public String getYycj3() {
+		return yycj3;
+	}
+	public void setYycj3(String yycj3) {
+		this.yycj3 = yycj3;
+	}
+	public String getYycj4() {
+		return yycj4;
+	}
+	public void setYycj4(String yycj4) {
+		this.yycj4 = yycj4;
+	}
+	public String getIsParent() {
+		return isParent;
+	}
+	public void setIsParent(String isParent) {
+		this.isParent = isParent;
+	}
+	public String getNamecode() {
+		return namecode;
+	}
+	public void setNamecode(String namecode) {
+		this.namecode = namecode;
+	}
+	public String getStartcode() {
+		return startcode;
+	}
+	public void setStartcode(String startcode) {
+		this.startcode = startcode;
+	}
+	public String getEndcode() {
+		return endcode;
+	}
+	public void setEndcode(String endcode) {
+		this.endcode = endcode;
+	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	public Object getpId5() {
+		return pId5;
+	}
+	public void setpId5(Object pId5) {
+		this.pId5 = pId5;
+	}
+	public Object getpId6() {
+		return pId6;
+	}
+	public void setpId6(Object pId6) {
+		this.pId6 = pId6;
+	}
+	public String getYycj5() {
+		return yycj5;
+	}
+	public void setYycj5(String yycj5) {
+		this.yycj5 = yycj5;
+	}
+	public String getYycj6() {
+		return yycj6;
+	}
+	public void setYycj6(String yycj6) {
+		this.yycj6 = yycj6;
+	}
+	public String getYycj7() {
+		return yycj7;
+	}
+	public void setYycj7(String yycj7) {
+		this.yycj7 = yycj7;
+	}
+	public String getYycj8() {
+		return yycj8;
+	}
+	public void setYycj8(String yycj8) {
+		this.yycj8 = yycj8;
+	}
+	public String getGxr() {
+		return gxr;
+	}
+	public void setGxr(String gxr) {
+		this.gxr = gxr;
+	}
+
+	public String getLrr() {
+		return lrr;
+	}
+	public void setLrr(String lrr) {
+		this.lrr = lrr;
+	}
+
+	public String getLevelid() {
+		return levelid;
+	}
+	public void setLevelid(String levelid) {
+		this.levelid = levelid;
+	}
+	public String getScbz() {
+		return scbz;
+	}
+	public void setScbz(String scbz) {
+		this.scbz = scbz;
+	}
+	public String getLrdwdm() {
+		return lrdwdm;
+	}
+	public void setLrdwdm(String lrdwdm) {
+		this.lrdwdm = lrdwdm;
+	}
+	public String getLrdwmc() {
+		return lrdwmc;
+	}
+	public void setLrdwmc(String lrdwmc) {
+		this.lrdwmc = lrdwmc;
+	}
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public Date getGxsj() {
+		return gxsj;
+	}
+	public void setGxsj(Date gxsj) {
+		this.gxsj = gxsj;
+	}
+	public Date getLrsj() {
+		return lrsj;
+	}
+	public void setLrsj(Date lrsj) {
+		this.lrsj = lrsj;
+	}
+	public String getSelectPath() {
+		return selectPath;
+	}
+	public void setSelectPath(String selectPath) {
+		this.selectPath = selectPath;
+	}
+	public String getAjs() {
+		return ajs;
+	}
+	public void setAjs(String ajs) {
+		this.ajs = ajs;
+	}
+
+}

common/common_utils/src/main/java/com/founder/commonutils/model/ypglEntity/JzmxKkEntity.java

+package com.founder.commonutils.model.ypglEntity;
+
+import lombok.Data;
+
+/**
+    *@ClassName: JzmxEntity
+    *@Description TODO: 
+    *@Author: yangyang
+    *@Date: 2022/08/31
+    *@Version: 1.0
+**/
+@Data
+public class JzmxKkEntity {
+  private String asjbh;// 案件编号
+  private String afkssj;// 案发开始时间
+  private String afjssj;// 案发结束时间
+  private String x;// 经度
+  private String y;// 维度
+}

common/common_utils/src/main/java/com/founder/commonutils/model/ypglEntity/PageBean.java

+package com.founder.commonutils.model.ypglEntity;
+
+/**
+ *  layui数据表格返回数据处理类
+ * Created by yutons on 2017/9/1
+ */
+
+public class PageBean {
+    //当前页
+    private int page;
+    //页大小
+    private int limit;
+    //起始
+    private int begin;
+    //结束
+    private int end;
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getLimit() {
+        return limit;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
+
+    public Integer getBegin() {
+        return (this.page-1)*this.limit+1;
+    }
+
+    public void setBegin(Integer begin) {
+        this.begin = begin;
+    }
+
+    public Integer getEnd() {
+        return  this.page*this.limit;
+    }
+
+    public void setEnd(Integer end) {
+        this.end = end;
+    }
+}

common/common_utils/src/main/java/com/founder/commonutils/model/ypglEntity/Phone.java

+package com.founder.commonutils.model.ypglEntity;
+
+import lombok.Data;
+
+/**
+    *@ClassName: Phone
+    *@Description TODO: 
+    *@Author: founder_fzy
+    *@Date: 2021/9/26 11:07
+    *@Version: 1.0
+**/
+@Data
+public class Phone {
+    private String ID;
+    private String phone;
+    private String province;
+    private String city;
+    private String Pc;
+    private String lat;
+    private String lon;
+}

common/common_utils/src/main/java/com/founder/commonutils/model/ypglEntity/Poijwd.java

+package com.founder.commonutils.model.ypglEntity;
+
+import lombok.Data;
+import org.springframework.data.annotation.Id;
+
+
+@Data
+public class Poijwd {
+    @Id
+    private Double j; //经度
+    private Double w; //纬度
+}

common/common_utils/src/main/java/com/founder/commonutils/model/ypglEntity/TbStAsj.java

+package com.founder.commonutils.model.ypglEntity;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class TbStAsj implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/*非数据库字段*/
+	private String laXxzjbh;
+	private String jsasjXxzjbh;
+
+	private String xxzjbh;
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date kssj;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date jssj;
+
+	private Double kymyqz_wpsl;
+
+	private Double kyzzqz_wpsl;
+
+	private Double kyfzqz_wpsl;
+
+	private Double kyqtqz_wpsl;
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date slsj;
+
+	private String sldw_gajgjgdm;
+
+	private String XXSC_PDBZ;
+	private String sldw_gajgmc;
+
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date larq;
+
+	private String ladw_gajgjgdm;
+
+	private String ladw_gajgmc;
+
+	private Double zary_rs;
+
+	private Double sjcwjzrmby;
+
+	private String zczj_zcxwyjms;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date zczj_zxsj01;
+
+	private String zczjdw_gajgjgdm;
+
+
+	private String zczjdw_gajgmc;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date ysscqsrq;
+
+
+	private String ysscqsajscfhjddm;
+
+
+	private String sfcxaj_pdbz;
+
+
+	private String cxajyydm;
+
+
+	private String cxajdw_gajgjgdm;
+
+	private String cxajdw_gajgmc;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date cxajrq;
+
+
+	private String xsajxsgzjgdm;
+
+
+	private String zbr_xm;
+
+
+	private String zbr_gmsfhm;
+
+
+	private String zbr_lxdh;
+
+
+	private String xbr_xm;
+
+
+	private String xbr_gmsfhm;
+
+
+	private String xbr_lxdh;
+
+
+	private String xsjsfzr_xm;
+
+
+	private String xsjsfzr_gmsfhm;
+
+
+	private String xsjsfzr_lxdh;
+
+
+	private String gajgfzr_xm;
+
+
+	private String gajgfzr_gmsfhm;
+
+
+	private String gajgfzr_lxdh;
+
+
+	private String ajywztdm;
+
+
+	private String pacj_pdbz;
+
+
+	private String zaxsdm;
+
+
+
+	private String pafsdm;
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date pasj;
+
+
+	private String badw_gajgmc;
+
+
+	private String badw_gajgjgdm;
+
+
+	private String gxpcsdm;
+
+
+	private String gxfxjdm;
+
+
+	private String gxsjdm;
+
+
+	private String zj;
+
+
+	private String asjbh;
+
+
+	private String jjbh;
+
+
+	private String xckybh;
+
+
+	private String asjlydm;
+
+
+	private String xsjqlbdm;
+
+
+	private String zcjddm;
+
+	private String xsajlascjgdm;
+
+	private String ajlbdm;
+
+
+
+	private String ajxlbdm;
+
+
+	private String zatz_jyqk;
+
+
+	private String tssddm;
+
+
+	private String zatzzdfl_jyqk;
+
+
+	private String zatzbcms_jyqk;
+
+
+	private String zatz_ajzatzjhbd;
+
+
+	private String ajmc;
+
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date fxasjsj;
+
+	private String fxasjdd_xzqhdm;
+
+
+	private String fxasjdd_dzmc;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date asjfssj_asjfskssj;
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date asjfssj_asjfsjssj;
+
+
+	private String asjfssj_rsddm;
+
+
+	private String asjfssj_zasj_zasjlbdm;
+
+	private String asjfssj_zasj_dmbcms;
+
+	private String asjfsdd_xzqhdm;
+
+
+	private String asjfsdd_dzmc;
+
+
+	private Double asjfsdd_dqjd;
+
+
+	private Double asjfsdd_dqwd;
+
+
+	private String asjfsdd_dylbdm;
+
+
+	private String asjfsdd_sacs_sacslbdm;
+
+	private String asjfsdd_sacs_dmbcms;
+
+	private String asjfsdd_kjbw_kjbwlbdm;
+
+
+	private String asjfsdd_kjbw_dmbcms;
+
+	private String asjfsdd_sfjzwn_pdbz;
+
+
+	private Double asjfsdd_jzwcs;
+
+
+	private Double asjfsdd_asjfslc;
+
+
+	private String asjfsdd_sfzlzz_pdbz;
+
+
+	private String jyaq;
+
+	private String sfsq_pdbz;
+
+
+	private String sfsb_pdbz;
+
+
+	private String sfma_pdbz;
+
+
+	private String sfsh_pdbz;
+
+
+	private String sfsjdqpcl_pdbz;
+
+
+	private String sfsw_pdbz;
+
+	private String sfgm_pdbz;
+
+
+	private String swasjswqk;
+
+	private String asjdbjbdm;
+
+
+	private String llfs_llfsdm;
+
+
+	private String llfs_dmbcms;
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date llsj;
+
+	private String sy_jyqk;
+
+	private String fzxyrtsxw_fzxyrtsxwdm;
+
+
+	private String fzxyrtsxw_dmbcms;
+
+
+	private String fzxyrsxzahjqk;
+
+	private String qtsdtd_jyqk;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date asjfssjfx_asjfskssj;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date asjfssjfx_asjfsjssj;
+
+	private Double zarfx_rsxx;
+
+	private Double zarfx_rssx;
+
+	private String fzxyrtz_jyqk;
+
+
+	private String fzxyrtszc_fzxyrtszcdm;
+
+
+	private String fzxyrtszc_dmbcms;
+
+
+	private String zagj_sawpdm;
+
+
+	private String zagj_jyqk;
+
+
+	private String zadjms;
+
+	private String zamdms;
+
+
+	private String kjfwdm;
+
+
+	private String lcza_jyqk;
+
+
+	private String jhza_jyqk;
+
+
+	private String gtfzfzxyrzhxsdm;
+
+
+	private String gtfzfzxyrgc_gtfzfzxyrgcdm;
+
+	private String gtfzfzxyrgc_dmbcms;
+
+
+	private String xzwpfx_sawp_sawpdm;
+
+	private String xzwpfx_sawp_dmbcms;
+
+
+	private String sswpqx_jyqk;
+
+
+	private String fzxyrylwp_jyqk;
+
+
+	private String xckywp_jyqk;
+
+
+	private String fxxs_jyqk;
+
+
+	private Double asjswry_rs;
+
+	private Double asjssry_rs;
+
+
+	private String asjsscw_jyqk;
+
+	private Double ssjzrmby;
+
+	private Double kyzsqz_wpsl;
+
+
+	private String sfkysc_pdbs;
+
+
+	private String zczjywsjzt;
+
+
+	private String laywsjzt;
+
+	private String ajsfyj;
+
+	private String sfzztd_pdbz;
+
+
+	private String bqxgsqzt;
+
+	private String bxfbqxgzt;
+
+
+	private String tzgjc;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date laywspsj;
+
+
+	private String jjsd_jjsddm;
+
+
+	private String xpsd_dmbcms;
+
+	private String qqsd_qqsddm;
+
+
+	private String jssd_dmbcms;
+
+
+	private String ybsddm;
+
+
+	private String sbsd_sbsddm;
+
+	private String xtkjtpsd_jssd_jssddm;
+
+
+	private String zpsd_zpsddm;
+
+
+	private String wlzasd_wlzasddm;
+
+	private String xtkjtpsd_jssd_dmbcms;
+
+
+	private String lkjzkjfs_dmbcms;
+
+	private String jrjzkjfsjsd_dmbcms;
+
+
+	private String xtkjtpsd_xtkjtpsddm;
+
+	private String wlzasd_dmbcms;
+
+
+	private String sbsd_dmbcms;
+
+	private String grzcsd_grzcsddm;
+
+	private String mcsf_dmbcms;
+
+	private String xpsywp_sawpdm;
+
+	private String xpsd_xpsddm;
+
+	private String mydwmy_mcdwmydm;
+
+
+	private String mcsf_mcsfdm;
+
+
+	private String mcgxr_dmbcms;
+
+
+	private String jjsd_dmbcms;
+
+
+	private String qqsd_dmbcms;
+
+
+	private String lkjzkjfs_lkjzkjfsdm;
+
+
+	private String mcmysd_mcmysddm;
+
+	private String zazbsd_zazbsddm;
+
+
+	private String mydwmy_dmbcms;
+
+
+	private String xcwpfdcd_xcwpfdcddm;
+
+
+	private String grzcsd_dmbcms;
+
+
+	private String xcwpfdcd_dmbcms;
+
+
+	private String mcmysd_dmbcms;
+
+	private String jrjzkjfsjsd_jrjzkjfsjsddm;
+
+
+	private String xtkjtpsd_dmbcms;
+
+
+	private String xpsywp_dmbcms;
+
+
+	private String zpsd_dmbcms;
+
+	private String mcgxr_mcgxrdm;
+
+	private String zazbsd_dmbcms;
+
+
+	private String jssd_jssddm;
+
+
+	private String zuzdw_gajgjgdm;
+
+
+	private String zuzdw_gajgmc;
+
+
+	private String zzdwfzr_xm;
+
+	private String zzdwfzr_gmsfhm;
+
+
+	private String zzdwfzr_lxdh;
+
+
+	private String zuzdw_zbr_xm;
+
+
+	private String zuzdw_zbr_gmsfhm;
+
+
+	private String zuzdw_zbr_lxdh;
+
+	private String zuzdw_xbr_xm1;
+
+
+	private String zuzdw_xbr_gmsfhm1;
+
+	private String zuzdw_xbr_lxdh1;
+
+
+	private String zuzdw_xbr_xm2;
+
+
+	private String zuzdw_xbr_gmsfhm2;
+
+	private String zuzdw_xbr_lxdh2;
+
+	private String ifHasCxxxFlag;
+
+	private String ajxz;
+	private String ajxzmc;
+
+	private String yjspsftgPdbz;
+
+	private String sffjcxzp_pdbz;
+
+	private String xxdjry_xm;
+
+	private String shflag;
+
+	private String xxczry_gmsfhm;
+
+	private String xxczry_xm;
+
+	private String xxczdw_gajgjgdm;
+
+	private String xxczdw_gajgmc;
+
+	private Date gxsj;
+
+	private Date djsj;
+	private Date djsjEnd;
+
+	private String asjfskssj;
+	private String asjfsjssj;
+
+	private int startNum;
+	private int endNum;
+
+	private String asjfssj;
+
+	private String[] asjfsdd;
+
+	private int currentPageNo;
+	private int pageSize;
+
+	private List<String> asjbhList;
+	private String asjbhStr;
+
+	private Double qz;
+
+	private String tzwd; //特征维度
+
+	private String bz; //备注
+	//本省涉案展示使用
+	private String asjfssjKssj;
+	private String asjfssjJssj;
+	private String asjfsddXzqhdm;
+
+	private String asjfsddDzmc;
+	private String asjfsddDylbdm;
+	private String asjfsddCslbdm;
+	private String zazbsddm;
+	private String ladwGajgjgdm;
+	private String sldwgajgmc;
+	private String zczjdwGajgjgdm;
+	private String sfmaPdbz;
+	private String sfsqPdbz;
+	private String sfgmajpdbs;
+	private String sfsdqpclPdbz;
+	private String sfshPdbz;
+	private String zaryRs;
+	private String asjsscwJyqk;
+	private String asjswryRs;
+	private String asjssryRs;
+	private String asjfsddJd;
+	private String asjfsddWd01;
+	private String sszjz;
+	private String dbjbdm;
+	private String zarfxRssx;
+	private String zarfxRsxx;
+	private String zbrGmsfhm;
+	private String zbrXm;
+	private String xbrXm;
+	private String xsjsfzrXm;
+	private String slsj_str;
+	private String flag;
+	private String ajzlb;
+	private String ajxzlb2;
+	private String xalbdmbcms;
+	private String zjhm;
+
+	private String asjfsdd_xzqhdm_str;
+	private String counts;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date startTime;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	private Date endTime;
+
+	private String bzzt;
+	private String bqyp;
+	private String keyword;
+	private String jzmd; //基站密度
+	private int jzmdMax; //基站密度
+	private int jzmdMin; //基站密度
+	private String sdtd; //手段特点
+	private String zadd; //作案地点
+	private String zagj; //作案工具
+	private String zasj; //作案时间
+	private String ajlb;
+	private String xalb;
+	private String zasf;
+	private String zahj;
+	private String zamb;
+	private String zhfzxyr_cyzj_zjhm;
+
+	private String username;
+	private String fsrXm;
+	private String fsrLxdh;
+	private String fsrJh;
+	private String asjfsjd;
+	private String asjfswd;
+	private String isKey;
+	private String state;
+	private String glAsjbh;
+	private String cjsj;
+	private String name;
+	private String bjsj;
+	private String cbdw;
+	private String bhdm;
+    private List<String> zjList;
+
+	private double startLng;//经度
+	private double startLat;//纬度
+	private double endLng;
+	private double endLat;
+	private String descripText;
+}
\ No newline at end of file

common/common_utils/src/main/java/com/founder/commonutils/model/ypglEntity/TbXwAsjbzKeyword.java

+package com.founder.commonutils.model.ypglEntity;
+
+
+import lombok.Data;
+
+/**
+ * 关键词、同义词表
+ */
+@Data
+public class TbXwAsjbzKeyword extends PageBean  {
+    private String xxzjbh;
+    private String keyword;
+    private String multiplexing_keyword;
+    private String keywordName;
+    private String xxdjry_xm;
+    private String xxdjry_gmsfhm;
+    private String xxdjdw_gajgmc;
+    private String xxdjdw_gajgjgdm;
+    private String xxczry_xm;
+    private String xxczry_gmsfhm;
+    private String xxdjry_lxdh;
+    private String xxczdw_gajgjgdm;
+    private String xxczdw_gajgmc;
+    private String gxsj;
+    private String djsj;
+    private String xxsc_pdbz;
+    private String synonyms;
+    private String state;
+    private String removeXxzjbh;
+
+    private String syKey;
+
+}

common/common_utils/src/main/java/com/founder/commonutils/model/ypglEntity/TbXwZbfzxyr.java

+package com.founder.commonutils.model.ypglEntity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TbXwZbfzxyr {
+    private String zhfzxyr_xm;
+    private String zhfzxyr_cyzj_zjhm;
+    private String zhfzxyr_lxdh;
+
+    private String ajlbdm;//案件类别
+    private List<String> sfzhList;//身份证号list
+    private String asjbh;
+    private String objectValue;
+
+}

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

+package com.founder.commonutils.util;
+
+import com.alibaba.fastjson.JSONArray;
+import com.founder.commonutils.model.ypglEntity.Poijwd;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.util.List;
+
+/**
+ * @Description 获取经纬度
+ * @author weiyuanzuo
+ * @version 1.0
+ */
+public class GJUtil {
+	private static final Log log = LogFactory.getLog(GJUtil.class);
+	private static final double PI = 3.14159265;
+
+	/**
+	 * 通过中心点获取指定范围内的四个经纬度
+	 * @param raidus 距离 单位m
+	 * @return 数组：最大经度，最小经度，最大纬度，最小纬度
+	 */
+	public static List<Poijwd> calcSpecifyLng(double lon, double lat, double raidus){
+
+		Double latitude = lat;
+		Double longitude = lon;
+
+		Double degree = (24901*1609)/360.0;
+		double raidusMile = raidus;
+
+		Double dpmLat = 1/degree;
+		Double radiusLat = dpmLat*raidusMile;
+		Double minLat = latitude - radiusLat;
+		Double maxLat = latitude + radiusLat;
+
+		Double mpdLng = degree* Math.cos(latitude * (PI/180));
+		Double dpmLng = 1 / mpdLng;
+		Double radiusLng = dpmLng*raidusMile;
+		Double minLng = longitude - radiusLng;
+		Double maxLng = longitude + radiusLng;
+		// 正方形
+		double[] resultPoint = new double[4];
+		//最大经度
+		resultPoint[0] = longitude + radiusLng;
+		//最小经度
+		resultPoint[1] = longitude - radiusLng;
+		//最大纬度
+		resultPoint[2] = latitude + radiusLat;
+		//最小纬度
+		resultPoint[3] = latitude - radiusLat;
+		String result="[{j:"+resultPoint[0]+",w:"+resultPoint[2]+"},{j:"+resultPoint[0]+",w:"+resultPoint[3]+"},{j:"+resultPoint[1]+",w:"+resultPoint[3]+"},{j:"+resultPoint[1]+",w:"+resultPoint[2]+"}]";
+		JSONArray jsonArray = JSONArray.parseArray(result);
+		List<Poijwd> poijwds = jsonArray.toJavaList(Poijwd.class);
+		return poijwds;
+	}
+
+	public static double[] doubleSpecifyLng(double lon,double lat,double raidus){
+
+		Double latitude = lat;
+		Double longitude = lon;
+
+		Double degree = (24901*1609)/360.0;
+		double raidusMile = raidus;
+
+		Double dpmLat = 1/degree;
+		Double radiusLat = dpmLat*raidusMile;
+		Double minLat = latitude - radiusLat;
+		Double maxLat = latitude + radiusLat;
+
+		Double mpdLng = degree* Math.cos(latitude * (PI/180));
+		Double dpmLng = 1 / mpdLng;
+		Double radiusLng = dpmLng*raidusMile;
+		Double minLng = longitude - radiusLng;
+		Double maxLng = longitude + radiusLng;
+		// 正方形
+		double[] resultPoint = new double[4];
+		//最大经度
+		resultPoint[0] = longitude + radiusLng;
+		//最小经度
+		resultPoint[1] = longitude - radiusLng;
+		//最大纬度
+		resultPoint[2] = latitude + radiusLat;
+		//最小纬度
+		resultPoint[3] = latitude - radiusLat;
+
+		return resultPoint;
+	}
+
+}
\ No newline at end of file

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

@@ -45,12 +45,18 @@ public class JasyptEncryptorUtils {
     }
 
     /**
-     * 测试
+     * 加密解密
      */
     public static void main(String args[]) throws Exception {
-        String test1 = "123456";
-        encode(test1);
-        decode(encode(test1));
+        String test1 = "root";
+//        encode(test1);
+//        decode(encode(test1));
+//        System.out.println("加密url=="+encode("jdbc:oracle:thin:@//47.92.48.137:15212/XZXT?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai"));
+        System.out.println("解密=="+decode("T0NmBjW9iRM92xTRkj5iTWDkIMeqdHcsi2nsP6Ro6bYDNwGVDGDCqtpZrxg9SYL3RlpDyIvbS5R2uXxn702du4YNbolcvEbEWL+QCeJN7mwldnIHfF1xr7e/2TuD1QnlMg/Hhi9xBGymzDb0T2wdoT954YtUwhIa8eJQ5E6QAGk="));
+//        System.out.println("加密用户名=="+encode("CQXZ"));
+//        System.out.println("加密用密码=="+encode("CQXZ@50"));
+        System.out.println("加密用户名=="+encode("XZXT"));
+        System.out.println("加密用密码=="+encode("XzxtPwdAly#00"));
     }
 }
 

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

+package com.founder.commonutils.util;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.List;
+
+/**
+ * Xzxt-Rest自定义响应结构
+ */
+public class XzxtRestResult {
+
+    // 定义jackson对象
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+
+    // 响应业务状态
+    private Integer status;
+
+    // 响应消息
+    private String msg;
+
+    // 响应中的数据
+    private Object data;
+
+
+    public static XzxtRestResult build(Integer status, String msg, Object data) {
+        return new XzxtRestResult(status, msg, data);
+    }
+
+    public static XzxtRestResult ok(Object data) {
+        return new XzxtRestResult(data);
+    }
+
+    public static XzxtRestResult ok(int i, String count, List<Object> list) {
+        return new XzxtRestResult(null);
+    }
+
+    public XzxtRestResult() {
+
+    }
+
+    public static XzxtRestResult build(Integer status, String msg, String reidskey, Object data) {
+        return new XzxtRestResult(status, msg, reidskey,data);
+    }
+
+    public XzxtRestResult(Integer status, String msg, Object data) {
+        this.status = status;
+        this.msg = msg;
+        this.data = data;
+    }
+
+    public XzxtRestResult(Integer status, String msg, String reidskey, Object data) {
+        this.status = status;
+        this.msg = msg;
+        this.data = data;
+    }
+
+    public XzxtRestResult(Object data) {
+        this.status = 200;
+        this.msg = "OK";
+        this.data = data;
+    }
+
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+
+
+    /**
+     * 将json结果集转化为Xzxt-Rest对象
+     * 
+     * @param jsonData json数据
+     * @param clazz Xzxt-Rest中的object类型
+     * @return
+     */
+    public static XzxtRestResult formatToPojo(String jsonData, Class<?> clazz) {
+        try {
+            if (clazz == null) {
+                return MAPPER.readValue(jsonData, XzxtRestResult.class);
+            }
+            JsonNode jsonNode = MAPPER.readTree(jsonData);
+            JsonNode data = jsonNode.get("data");
+            Object obj = null;
+            if (clazz != null) {
+                if (data.isObject()) {
+                    obj = MAPPER.readValue(data.traverse(), clazz);
+                } else if (data.isTextual()) {
+                    obj = MAPPER.readValue(data.asText(), clazz);
+                }
+            }
+            return build(jsonNode.get("status").intValue(), jsonNode.get("msg").asText(), obj);
+        } catch (Exception e) {
+            System.out.println(e.getStackTrace());
+            return new XzxtRestResult();
+        }
+    }
+
+    /**
+     * object对象的转化
+     * 
+     * @param json
+     * @return
+     */
+    public static XzxtRestResult format(String json) {
+        try {
+            return MAPPER.readValue(json, XzxtRestResult.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * Object是集合转化
+     * 
+     * @param jsonData json数据
+     * @param clazz 集合中的类型
+     * @return
+     */
+    public static XzxtRestResult formatToList(String jsonData, Class<?> clazz) {
+        try {
+            JsonNode jsonNode = MAPPER.readTree(jsonData);
+            JsonNode data = jsonNode.get("data");
+            Object obj = null;
+            if (data.isArray() && data.size() > 0) {
+                obj = MAPPER.readValue(data.traverse(),
+                        MAPPER.getTypeFactory().constructCollectionType(List.class, clazz));
+            }
+            return build(jsonNode.get("status").intValue(), jsonNode.get("msg").asText(), obj);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+}

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

@@ -231,6 +231,7 @@ public class CodeYymcController {
             e.printStackTrace();
             return  new MapRestResult("转换异常");
         }
+//        return new MapRestResult();
 
     }
 }

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

@@ -111,6 +111,9 @@ public class SkljServiceController extends ApiController {
         if (skljServiceParam.getServiceType()!=null&& !skljServiceParam.getServiceType().equals("")){
             queryWrapper.eq("serviceType",skljServiceParam.getServiceType());
         }
+        if (skljServiceParam.getContent()!=null&& !skljServiceParam.getContent().equals("")){
+            queryWrapper.eq("content",skljServiceParam.getContent());
+        }
 
         queryWrapper.eq("isDeleted", "0");
         queryWrapper.orderByDesc("cjsj");

service/publicapi/pom.xml

@@ -44,6 +44,18 @@
 
     </build>
     <dependencies>
+        <!-- oracle -->
+        <dependency>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc8</artifactId>
+            <version>19.7.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.oracle.database.nls</groupId>
+            <artifactId>orai18n</artifactId>
+            <version>19.7.0.0</version>
+        </dependency>
+        <!--powerjob-->
         <dependency>
             <groupId>tech.powerjob</groupId>
             <artifactId>powerjob-worker-spring-boot-starter</artifactId>

service/publicapi/src/main/java/com/founder/publicapi/controller/ypglController/AsjbzController.java

+package com.founder.publicapi.controller.ypglController;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.founder.commonutils.model.newPublicEntity.ApprovalEntity.EasyUIPage;
+import com.founder.commonutils.model.newPublicEntity.SkypDesktopEntity.SkSchedule;
+import com.founder.commonutils.model.ypglEntity.*;
+import com.founder.commonutils.util.GJUtil;
+import com.founder.commonutils.util.StringUtil;
+import com.founder.commonutils.util.XzxtRestResult;
+import com.founder.publicapi.service.*;
+import com.founder.servicebase.meassage.WebSocketServer;
+import lombok.SneakyThrows;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import tech.powerjob.worker.core.processor.ProcessResult;
+import tech.powerjob.worker.core.processor.TaskContext;
+import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.concurrent.*;
+
+@Controller
+@CrossOrigin //跨域访问
+public class AsjbzController  implements BasicProcessor {
+
+    @Autowired
+    private AsjbzService asjbzService;
+
+    @Autowired
+    private IDicItemService dicItemService;
+
+    @Autowired
+    private TbXwAsjbzKeywordService tbXwAsjbzKeywordService;
+
+    @Autowired
+    YpglAsjService YpglAsjService;
+    @Autowired
+    private PhoneService phoneService;
+
+    //  新增案件管理
+    @RequestMapping(value="/addAsjbz",method = {RequestMethod.GET, RequestMethod.POST})
+    @ResponseBody
+    public Map<String,Object> addAsjbz(@RequestBody Asjbz asjbz){
+        asjbz.setXxzjbh(UUID.randomUUID().toString().replace("-", ""));
+        Map<String, Object> resultMap = new HashMap<>();
+        System.out.println(asjbz.getZj());
+        int i = asjbzService.addAsjbz(asjbz);
+        if (i>0){
+            resultMap.put("code",200);
+            resultMap.put("msg","添加成功");
+        }else {
+            resultMap.put("code",500);
+            resultMap.put("msg","添加失败");
+        }
+
+        return resultMap;
+    }
+    //  查询案件管理
+    @RequestMapping(value="/selectAsjbz",method = {RequestMethod.GET, RequestMethod.POST})
+    @ResponseBody
+    public XzxtRestResult selectAsjbz(@RequestBody Asjbz asjbz1){
+
+        //分页
+        EasyUIPage easyUIPage = new EasyUIPage();
+        easyUIPage.setPage(asjbz1.getStartNum());
+        easyUIPage.setPagePara(asjbz1.getEndNum());
+        int begin = easyUIPage.getBegin();
+        int end = easyUIPage.getEnd();
+        asjbz1.setStartNum(begin);
+        asjbz1.setEndNum(end);
+
+        //判断主类案，类案是否有值
+//        if (StringUtil.isEmpty(asjbz1.getCode())){
+//            if(!StringUtil.isEmpty(asjbz1.getAjxzlb())){
+//            if(!StringUtil.isEmpty(asjbz1.getAjxzlb())){
+//                asjbz1.setAjzlb("");
+//            }
+//        }else {
+//            asjbz1.setAjzlb("");
+//            asjbz1.setAjxzlb("");
+//        }
+        // 案件类别代码模糊查询
+        if (null != asjbz1.getAjzlb() && !"".equals(asjbz1.getAjzlb())) {
+            // 根据规则截取前三位
+            String ajlbdm = "";
+            if (asjbz1.getAjzlb().endsWith("000")) {
+                ajlbdm = asjbz1.getAjzlb().substring(0, 3);
+            } else {
+                ajlbdm = asjbz1.getAjzlb();
+            }
+            asjbz1.setAjzlb(ajlbdm);
+        }
+        // 小案类别
+        if (asjbz1.getAjxzlb() != null && !asjbz1.getAjxzlb().isEmpty()) {
+            // 根据规则截取前三位
+            String zatz = "";
+            if (asjbz1.getAjxzlb().endsWith("000000")) {
+                zatz = asjbz1.getAjxzlb().substring(0, 6);
+            } else if(asjbz1.getAjxzlb().endsWith("00")){
+                zatz = asjbz1.getAjxzlb().substring(0, 10);
+            }else{
+                zatz = asjbz1.getAjxzlb();
+            }
+            asjbz1.setAjxzlb(zatz);
+        }
+
+        List<Asjbz> asjbzs = asjbzService.selectAsjbz(asjbz1);
+        if(asjbzs!=null&&asjbzs.size()>0){
+            for (Asjbz asjbz:asjbzs){
+                if(asjbz.getKeywords() != null){
+                    String s = getkeywordName(asjbz.getKeywords());
+                    asjbz.setKeyWordName(s);
+                }
+                if(asjbz.getKeyWordName()!=null && asjbz.getOperators() != null){
+                    String key = getKey(asjbz.getKeyWordName(), asjbz.getOperators());
+                    asjbz.setKey(key);
+                }
+            }
+        }
+        return XzxtRestResult.build(200, "获取列表信息成功", "", asjbzs);
+    }
+
+    //    关键词获取名称
+    public String getkeywordName(String key){
+        String str = "";
+        String[] split = key.split(",");
+        for (int i=0;i<split.length;i++){
+            TbXwAsjbzKeyword keyword = new TbXwAsjbzKeyword();
+            keyword.setXxzjbh(split[i]);
+            List<TbXwAsjbzKeyword> tbXwAsjbzKeywords = tbXwAsjbzKeywordService.selectKEYWORD(keyword);
+            if(tbXwAsjbzKeywords !=null && tbXwAsjbzKeywords.size()>0){
+                str = str + tbXwAsjbzKeywords.get(0).getKeyword() + ",";
+            }
+        }
+        return str;
+    }
+
+
+    //   拼接词和运算符
+    public String getKey(String newKey,String old){
+        String[] str1 = newKey.split(",");
+        String[] str2 = old.split(",");
+        String str = "";
+        for (int i=0;i<str1.length;i++){
+            if(i<str2.length){
+                str=str +str1[i]+str2[i];
+            }else {
+                str=str +str1[i];
+            }
+
+        }
+        System.out.println(str);
+        return str;
+    }
+
+    //    修改案件
+    @RequestMapping(value="/updateAsjbz",method = {RequestMethod.GET, RequestMethod.POST})
+    @ResponseBody
+    public Map<String,Object> updateAsjbz(@RequestBody Asjbz asjbz){
+        Map<String, Object> resultMap = new HashMap<>();
+        int i = asjbzService.updateAsjbz(asjbz);
+        if (i>0){
+            resultMap.put("code",200);
+            resultMap.put("msg","修改成功");
+        }else {
+            resultMap.put("code",500);
+            resultMap.put("msg","修改失败");
+        }
+
+        return resultMap;
+    }
+    //  删除案件
+    @RequestMapping(value="/deleteAsjbz",method = {RequestMethod.GET, RequestMethod.POST})
+    @ResponseBody
+    public Map<String,Object> deleteAsjbz(@RequestBody Asjbz asjbz){
+        asjbz.setXxscpdbz("1");
+        Map<String, Object> resultMap = new HashMap<>();
+        int i = asjbzService.updateAsjbz(asjbz);
+        if (i>0){
+            resultMap.put("code",200);
+            resultMap.put("msg","删除成功");
+        }else {
+            resultMap.put("code",500);
+            resultMap.put("msg","删除失败");
+        }
+
+        return resultMap;
+    }
+    //  结果认定查询
+    @RequestMapping(value="/selectAsjBybz",method = {RequestMethod.GET, RequestMethod.POST})
+    @ResponseBody
+    public XzxtRestResult selectAsjBybz(@RequestBody TbStAsj tbStAsj){
+
+        //分页
+        EasyUIPage easyUIPage = new EasyUIPage();
+        easyUIPage.setPage(tbStAsj.getStartNum());
+        easyUIPage.setPagePara(tbStAsj.getEndNum());
+        int begin = easyUIPage.getBegin();
+        int end = easyUIPage.getEnd();
+        tbStAsj.setStartNum(begin);
+        tbStAsj.setEndNum(end);
+        Map map = new HashMap();
+
+        System.out.println("开始查询时间："+new Date());
+        try {
+            String startTime = tbStAsj.getAsjfskssj();
+            String endTime = tbStAsj.getAsjfsjssj();
+            if (startTime=="" || startTime ==null){
+                startTime = "2021-01-01 00:00:00";
+            }
+            if (endTime =="" || endTime ==null){
+                LocalDateTime now = LocalDateTime.now();
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                endTime = now.format(formatter);
+            }
+
+            System.out.println("开始时间=="+startTime);
+            System.out.println("结束时间=="+endTime);
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            tbStAsj.setDjsj(dateFormat.parse(startTime));
+            tbStAsj.setDjsjEnd(dateFormat.parse(endTime));
+            System.out.println(tbStAsj.getDjsj());
+            System.out.println(tbStAsj.getDjsjEnd());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        // 案件类别代码模糊查询
+        if (null != tbStAsj.getAjlbdm() && !"".equals(tbStAsj.getAjlbdm())) {
+            // 根据规则截取前三位
+            String ajlbdm = "";
+            if (tbStAsj.getAjlbdm().endsWith("000")) {
+                ajlbdm = tbStAsj.getAjlbdm().substring(0, 3);
+            } else {
+                ajlbdm = tbStAsj.getAjlbdm();
+            }
+            tbStAsj.setAjlbdm(ajlbdm);
+        }
+        // 小案类别
+        if (tbStAsj.getZatz_jyqk() != null && !tbStAsj.getZatz_jyqk().isEmpty()) {
+            // 根据规则截取前三位
+            String zatz = "";
+            if (tbStAsj.getZatz_jyqk().endsWith("000000")) {
+                zatz = tbStAsj.getZatz_jyqk().substring(0, 6);
+            } else if(tbStAsj.getZatz_jyqk().endsWith("00")){
+                zatz = tbStAsj.getZatz_jyqk().substring(0, 10);
+            }else{
+                zatz = tbStAsj.getZatz_jyqk();
+            }
+
+            tbStAsj.setZatz_jyqk(zatz);
+        }
+
+        System.out.println("获取完时间："+new Date());
+        List<TbStAsj> list1 = new ArrayList<>();
+        Integer integer = 0;
+
+//            查询多个标签
+        if(!StringUtil.isEmpty(tbStAsj.getBqyp())) {
+            String[] split = tbStAsj.getBqyp().split(",");
+            List<String> list = new ArrayList<>();
+            for (String str : split) {
+                list.add(str);
+            }
+            tbStAsj.setZjList(list);
+        }
+
+        list1 = YpglAsjService.selectAsjBybz(tbStAsj);
+        integer = YpglAsjService.selectAsjBybzCount(tbStAsj);
+
+        System.out.println("查询完案件时间："+new Date());
+        if (list1!=null&&list1.size()>0){
+            for (TbStAsj stAsj:list1){
+                String ajlbdm = stAsj.getAjlbdm();
+                String zatz_jyqk = stAsj.getZatz_jyqk();
+
+                if (!StringUtil.isEmpty(ajlbdm)){
+                    DictItem dictItem1 = new DictItem();
+                    dictItem1.setCode(ajlbdm);
+                    dictItem1.setGroupid("CODE_AJLB");
+                    String code = dicItemService.getCode(dictItem1);
+                    stAsj.setAjlbdm(code);
+                }
+                if (!StringUtil.isEmpty(zatz_jyqk)){
+                    DictItem dictItem2 = new DictItem();
+                    dictItem2.setCode(zatz_jyqk);
+                    dictItem2.setGroupid("CODE_AJXZ");
+                    String code1 = dicItemService.getCode(dictItem2);
+                    stAsj.setZatz_jyqk(code1);
+                }
+
+                if (!StringUtil.isEmpty(stAsj.getAjxz())){
+                    TreeSet<String> treeSet = new TreeSet<>();
+                    String[] split = stAsj.getAjxz().split(",");
+                    for (String str:split){
+                        DictItem dictItem2 = new DictItem();
+                        dictItem2.setCode(str);
+                        dictItem2.setGroupid("CODE_GABAJXZLB");
+                        String code1 = dicItemService.getCode(dictItem2);
+                        treeSet.add(code1);
+                    }
+                    String replace =treeSet.toString().replace(" ", "");
+                    stAsj.setAjxzmc(replace.substring(1,replace.length()-1));
+                }
+            }
+        }
+
+        map.put("data",list1);
+        map.put("count",integer);
+
+
+
+        return XzxtRestResult.build(200, "获取标签案件列表信息成功", "", map);
+    }
+
+    private List<TbStAsj> conList(List<String> bq,List<TbStAsj> list){
+        List<TbStAsj> asjList = new ArrayList<>();
+
+        for(TbStAsj tbStAsj:list){
+
+//      关键词
+            if(isKeyword(bq,tbStAsj)){
+                asjList.add(tbStAsj);
+            }
+        }
+        return asjList;
+    }
+
+
+    private boolean isKeyword (List<String> bq,TbStAsj tbStAsj){
+        List<String> list = new ArrayList<>();
+        for (String str:bq){
+            if (tbStAsj.getKeyword().contains(str)){
+                list.add(str);
+            }
+        }
+
+        return bq.size() == list.size();
+    }
+
+    //    去重
+    private List<TbStAsj> xyrList (List<TbStAsj> list){
+
+        List<TbStAsj> xyrs = new ArrayList<>(list);
+        TreeSet<TbStAsj> treeSet = new TreeSet<>(
+                Comparator.comparing(TbStAsj::getAsjbh)
+        );
+        treeSet.addAll(xyrs);
+        xyrs.clear();
+        xyrs.addAll(treeSet);
+        return xyrs;
+    }
+
+    //    训练
+    @RequestMapping(value="/updateAsjTime",method = {RequestMethod.GET, RequestMethod.POST})
+    @ResponseBody
+    public XzxtRestResult updateAsjTime(@RequestBody TbStAsj tbStAsj){
+
+        Map map = new HashMap();
+/*
+        if (tbStAsj.getKssj()!=null&&tbStAsj.getJssj()!=null){
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+            Properties p = new Properties();
+            p.setProperty("startTime", formatter.format(tbStAsj.getKssj()));
+            p.setProperty("endTime", formatter.format(tbStAsj.getJssj()));
+            System.out.println(formatter.format(tbStAsj.getKssj()));
+            System.out.println(formatter.format(tbStAsj.getJssj()));
+        }*/
+
+        TbStAsj stAsj = new TbStAsj();
+        stAsj.setAjlbdm(tbStAsj.getAjlbdm());
+        stAsj.setKssj(tbStAsj.getKssj());
+        stAsj.setKssj(tbStAsj.getJssj());
+        JSONObject jsonObject = toAsjBq(stAsj);
+        if (jsonObject!=null){
+            map.put("code",200);
+            map.put("msg","修改成功");
+        }else {
+            map.put("code",500);
+            map.put("msg","修改失败");
+        }
+
+        return XzxtRestResult.build(200, "获取标签案件列表信息成功", "", map);
+    }
+
+    //  获取时间
+    @RequestMapping(value="/selectAsjTime",method = {RequestMethod.GET, RequestMethod.POST})
+    @ResponseBody
+    public XzxtRestResult selectAsjTime(){
+
+        Map map = new HashMap();
+        Properties p = new Properties();
+        String endTime = p.getProperty("endTime");
+        String startTime = p.getProperty("startTime");
+        map.put("endTime",endTime);
+        map.put("startTime",startTime);
+        return XzxtRestResult.build(200, "获取标签案件列表信息成功", "", map);
+    }
+
+    //  标签研判线程
+//    @Scheduled(cron = "0 */1 * * * ?")
+    @RequestMapping(value = "/toAsjBq",method = {RequestMethod.GET,RequestMethod.POST})
+    @ResponseBody
+    public JSONObject toAsjBq(@RequestBody TbStAsj tbStAsj){
+        JSONObject resultJSON = new JSONObject();
+        ExecutorService executorService = Executors.newFixedThreadPool(1000);
+
+        try{
+            int i1 = YpglAsjService.updateStAsjbz(); //删除表中所有数据
+            System.out.println(i1);
+
+/*
+            Properties p = new Properties();
+            String endTime = p.getProperty("endTime");
+            String startTime = p.getProperty("startTime");
+            System.out.println("开始时间=="+startTime);
+            System.out.println("结束时间=="+endTime);
+
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+            tbStAsj.setDjsj(dateFormat.parse(startTime));
+            tbStAsj.setDjsjEnd(dateFormat.parse(endTime));*/
+
+            TbXwAsjbzKeyword tbXwAsjbzKeyword = new TbXwAsjbzKeyword();
+            // 案件类别代码模糊查询
+            if (null != tbStAsj.getAjlbdm() && !"".equals(tbStAsj.getAjlbdm())) {
+                // 根据规则截取前三位
+                String ajlbdm = "";
+                if (tbStAsj.getAjlbdm().endsWith("000")) {
+                    ajlbdm = tbStAsj.getAjlbdm().substring(0, 3);
+                } else {
+                    ajlbdm = tbStAsj.getAjlbdm();
+                }
+                tbStAsj.setAjlbdm(ajlbdm);
+            }
+
+            List<TbStAsj> asjListAll = YpglAsjService.findAsjxxList(tbStAsj);
+            List<TbXwAsjbzKeyword> tbXwAsjbzKeywords = tbXwAsjbzKeywordService.selectTbXwAsjbzKeywordByCondition(tbXwAsjbzKeyword);
+
+
+            System.out.println("案件数量=="+asjListAll.size());
+            int ajcount = asjListAll.size();
+            System.out.println("同义词数量==="+tbXwAsjbzKeywords.size());
+
+            List<Asjbz> asjbzs = tbXwAsjbzKeywordService.selectKeyList();
+            System.out.println("案件数量========"+asjbzs.size());
+            for (int i=0;i<asjListAll.size();i++){
+                RunMatchJYAQ runMatchJYAQ = new RunMatchJYAQ(asjListAll.get(i),tbXwAsjbzKeywords,asjbzs);
+                executorService.execute(runMatchJYAQ);
+            }
+            executorService.shutdown();
+            while (0 < ajcount){
+                int count = YpglAsjService.selectBzCount();
+                if(count >= ajcount){
+                    break;
+                }
+                System.out.println("案件数量"+count);
+            }
+            resultJSON.put("status","success");
+            resultJSON.put("message", "成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            executorService.shutdown();
+            resultJSON.put("status","fail");
+            resultJSON.put("message", e.getMessage());
+        }
+        return resultJSON;
+    }
+
+
+    class RunMatchJYAQ extends Thread{
+        private final TbStAsj asj;
+        private final List<TbXwAsjbzKeyword> keyword;
+        private final List<Asjbz> asjbzs;
+        public  RunMatchJYAQ(TbStAsj asj, List<TbXwAsjbzKeyword> keyword,List<Asjbz> asjbzs){
+            this.asj=asj;
+            this.keyword = keyword;
+            this.asjbzs =asjbzs;
+        }
+
+        public Map<String,List<String>> doRunThread(TbStAsj asj, TbXwAsjbzKeyword keyword,List<Asjbz> asjbzs) {
+            List<String> stringList = new ArrayList<>();
+            List<String> stringArrayList = new ArrayList<>();
+            List<String> ksList = new ArrayList<>();
+            TreeSet<String> ajList = new TreeSet<>();
+            Map<String,List<String>> map = new HashMap<>();
+            //        获取同义词和关键词
+            String keyword1 = keyword.getKeyword();
+            String synonyms = keyword.getSynonyms();
+            String[] split1 = null;
+//            String[] split = null;
+//            if (!StringUtil.isEmpty(keyword1)){
+//                split = keyword1.split(",");
+//            }
+            if (!StringUtil.isEmpty(synonyms)){
+                split1 = synonyms.split(",");
+            }
+            List<String> list = new ArrayList<>();
+//            if (split !=null && split.length>0){
+//                for (String str:split){
+            //list.add(str);
+            String sy_jyqk = asj.getJyaq();
+            if (!StringUtil.isEmpty(sy_jyqk)){
+                if (sy_jyqk.contains(keyword1)){
+                    stringArrayList.add(keyword1);
+                    stringList.add(keyword1);
+                    ksList.add(keyword1);
+                }
+            }
+//                }
+//            }
+            if (split1 !=null && split1.length>0){
+                for (String str:split1){
+                    if (!StringUtil.isEmpty(sy_jyqk)){
+                        if (sy_jyqk.contains(str)){
+                            stringArrayList.add(keyword1);
+                            stringList.add(str);
+                            ksList.add(str);
+                            ksList.add(keyword1);
+                        }
+                    }
+                }
+            }
+
+            if(!StringUtil.isEmpty(keyword.getMultiplexing_keyword())){
+                String[] split = keyword.getMultiplexing_keyword().split(",");
+                TreeSet<String> treeSet = new TreeSet<>();
+                for (String str: split){
+                    TbXwAsjbzKeyword tbXwAsjbzKeyword = new TbXwAsjbzKeyword();
+                    tbXwAsjbzKeyword.setXxzjbh(str);
+                    List<TbXwAsjbzKeyword> tbXwAsjbzKeywords = tbXwAsjbzKeywordService.selectTbXwAsjbzList(tbXwAsjbzKeyword);
+                    if(tbXwAsjbzKeywords!=null&&tbXwAsjbzKeywords.size()>0){
+                        if(!StringUtil.isEmpty(tbXwAsjbzKeywords.get(0).getKeyword())){
+                            String[] split2 = tbXwAsjbzKeywords.get(0).getKeyword().split(",");
+                            List<String> list1 = Arrays.asList(split2);
+                            treeSet.addAll(list1);
+                        }
+                        if(!StringUtil.isEmpty(tbXwAsjbzKeywords.get(0).getSynonyms())){
+                            String[] split2 = tbXwAsjbzKeywords.get(0).getSynonyms().split(",");
+                            List<String> list1 = Arrays.asList(split2);
+                            treeSet.addAll(list1);
+                        }
+                    }
+                }
+                for (String str:treeSet){
+                    if (!StringUtil.isEmpty(sy_jyqk)){
+                        if (sy_jyqk.contains(str)){
+                            stringArrayList.add(keyword1);
+                            ksList.add(str);
+                            ksList.add(keyword1);
+                        }
+                    }
+                }
+            }
+            HashSet hashSet = new HashSet(stringArrayList);
+            stringArrayList.clear();
+            stringArrayList.addAll(hashSet);
+
+            List<String> stringaj = new ArrayList<>();
+            stringaj.addAll(ajList);
+            map.put("key",stringArrayList);
+            map.put("allkey",stringList);
+            TreeSet<String> set = new TreeSet<>();
+            set.addAll(ksList);
+            ksList.clear();
+            ksList.addAll(set);
+            map.put("kskey",ksList);
+//            map.put("aj",stringaj);
+////        简要案情是否包含关键词或是同义词
+//            for (String str:list){
+//                String sy_jyqk = asj.getJyaq();
+//                if (!StringUtil.isEmpty(sy_jyqk)){
+//                    if (sy_jyqk.contains(str)){
+//                        stringArrayList
+//                        stringList.add(str);
+//                    }
+//                }
+//            }
+
+//          是否匹配上
+            return map;
+        }
+
+        public void doRunBqThread(TbStAsj asj,List<TbXwAsjbzKeyword> keyword,List<Asjbz> asjbzs) {
+            List<String> stringList = new ArrayList<>();
+            List<String> list = new ArrayList<>();
+            List<String> kslist = new ArrayList<>();
+            TreeSet<String> ajlist = new TreeSet<>();
+            for (TbXwAsjbzKeyword keyword1:keyword){
+                Map<String, List<String>> map = doRunThread(asj, keyword1,asjbzs);
+                stringList.addAll(map.get("allkey"));
+                list.addAll(map.get("key"));
+                kslist.addAll(map.get("kskey"));
+//                ajlist.addAll(map.get("aj"));
+            }
+//            System.out.println("案件编号"+asj.getAsjbh()+"标签"+stringList.toString());
+            if(stringList != null && stringList.size()>0){
+                //          案件匹配
+                if (list!=null&&list.size()>0){
+                    System.out.println("==="+list);
+                    if (asjbzs!=null&&asjbzs.size()>0){
+                        for (Asjbz asjbz:asjbzs){
+                            int count =0;
+                            if(!StringUtil.isEmpty(asjbz.getZj())&&!StringUtil.isEmpty(asjbz.getOperators())){
+                                String zj = asjbz.getZj();
+                                String operators = asjbz.getOperators();
+                                String[] split = zj.split(",");
+                                String[] split2 = operators.split(",");
+                                if(split.length==(split2.length+1)){
+                                    for (int i=0;i<split.length;i++){
+                                        if(i==0){
+                                            if(split[i].equals("0")){
+                                                count++;
+                                            }else {
+                                                if (list.contains(split[i])){
+                                                    System.out.println("=============");
+                                                    count++;
+                                                }
+                                            }
+                                        }else {
+                                            if(split2[i-1].equals("+")){
+                                                if(split[i].equals("0")){
+                                                    count++;
+                                                }else {
+                                                    if (list.contains(split[i])){
+                                                        count++;
+                                                    }
+                                                }
+                                            }else {
+                                                if(split[i].equals("0")){
+                                                    count++;
+                                                }else {
+                                                    if (!list.contains(split[i])){
+                                                        count++;
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                    if(count==split.length){
+                                        ajlist.add(asjbz.getCode());
+                                        System.out.println("ok====");
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                asj.setBqyp(stringList.toString().replace(" ",""));
+                asj.setKeyword(list.toString().replace(" ",""));
+                asj.setZj(kslist.toString().replace(" ",""));
+                if (list.size()>0){
+                    asj.setIsKey("1");
+                }
+                if(ajlist!=null&&ajlist.size()>0){
+                    String replace =ajlist.toString().replace(" ", "");
+                    asj.setAjxz(replace.substring(1,replace.length()-1));
+                }
+//                YpglAsjService.deletebz();
+            }
+            YpglAsjService.insertAsjbz(asj);
+        }
+        @Override
+        public void run() {
+            doRunBqThread(asj,keyword,asjbzs);
+        }
+    }
+
+    public ProcessResult process(TaskContext context) throws Exception {
+        System.out.println("-----------------------日程定时任务启动");
+        System.out.println();
+        JSONObject resultJSON = new JSONObject();
+        ExecutorService executorService = Executors.newFixedThreadPool(10);
+        try{
+            int i1 = YpglAsjService.updateAsjbzAll();
+            //定时任务这里是跑phones中有的数据
+            List<Phone> phones = phoneService.selectJzxx();
+            System.out.println("基站"+phones.size());
+//          获取全部同义词和关键词
+            TbXwAsjbzKeyword tbXwAsjbzKeyword = new TbXwAsjbzKeyword();
+            List<TbXwAsjbzKeyword> tbXwAsjbzKeywords = tbXwAsjbzKeywordService.selectTbXwAsjbzKeywordByCondition(tbXwAsjbzKeyword);
+            System.out.println("同义词数量==="+tbXwAsjbzKeywords.size());
+
+            List<Asjbz> asjbzs = tbXwAsjbzKeywordService.selectKeyList();
+            System.out.println("案件数量========"+asjbzs.size());
+//          分批查询全部案件
+            TbStAsj tbStAsj = new TbStAsj();
+            int limit =1000;
+            int startnum = 0;
+            int endnum = 0;
+            int size = YpglAsjService.findAsjxxCount()+2000;
+            System.out.println("总量===="+size);
+            for (int i=0;i<=size/limit+1;i++){
+                startnum = i * limit+1;
+                endnum = ((i + 1) * limit);
+                if (startnum > size) {
+                    break;
+                }
+                if (endnum >size) {
+                    endnum = size;
+                }
+                if (startnum == endnum) {
+                    break;
+                }
+                System.out.println("开始"+startnum);
+                System.out.println("结束"+endnum);
+                tbStAsj.setEndNum(endnum);
+                tbStAsj.setStartNum(startnum);
+                List<TbStAsj> asjxxListFy = YpglAsjService.findAsjxxListFy(tbStAsj);
+                RunAsjList runAsjList = new RunAsjList(asjxxListFy, tbXwAsjbzKeywords,phones,asjbzs);
+                executorService.execute(runAsjList);
+            }
+
+            executorService.shutdown();
+            resultJSON.put("status","success");
+            resultJSON.put("message", "成功");
+            return new ProcessResult(true, "认定定时任务完成");
+
+        }catch (Exception e){
+            e.printStackTrace();
+            executorService.shutdown();
+            resultJSON.put("status","fail");
+            resultJSON.put("message", e.getMessage());
+            return new ProcessResult(false, "认定定时任务失败");
+
+        }
+    }
+
+    /**
+     *      ^
+     *      |
+     *      |
+     *    定时任务
+     */
+/*    //  全部案件2021至今
+    @Scheduled(cron = "0 0 2 * * ?")
+    @RequestMapping(value = "/toRunAsjBq",method = {RequestMethod.GET,RequestMethod.POST})
+    @ResponseBody
+//    @OperLogThread(message = "犯罪特征标签线程")
+    public JSONObject toRunAsjBq(){
+        System.out.println();
+        JSONObject resultJSON = new JSONObject();
+        ExecutorService executorService = Executors.newFixedThreadPool(10);
+        try{
+            int i1 = YpglAsjService.updateAsjbzAll();
+            List<Phone> phones = phoneService.selectJzxx();
+            System.out.println("基站"+phones.size());
+//          获取全部同义词和关键词
+            TbXwAsjbzKeyword tbXwAsjbzKeyword = new TbXwAsjbzKeyword();
+            List<TbXwAsjbzKeyword> tbXwAsjbzKeywords = tbXwAsjbzKeywordService.selectTbXwAsjbzKeywordByCondition(tbXwAsjbzKeyword);
+            System.out.println("同义词数量==="+tbXwAsjbzKeywords.size());
+
+            List<Asjbz> asjbzs = tbXwAsjbzKeywordService.selectKeyList();
+            System.out.println("案件数量========"+asjbzs.size());
+//          分批查询全部案件
+            TbStAsj tbStAsj = new TbStAsj();
+            int limit =1000;
+            int startnum = 0;
+            int endnum = 0;
+            int size = YpglAsjService.findAsjxxCount()+2000;
+            System.out.println("总量===="+size);
+            for (int i=0;i<=size/limit+1;i++){
+                startnum = i * limit+1;
+                endnum = ((i + 1) * limit);
+                if (startnum > size) {
+                    break;
+                }
+                if (endnum >size) {
+                    endnum = size;
+                }
+                if (startnum == endnum) {
+                    break;
+                }
+                System.out.println("开始"+startnum);
+                System.out.println("结束"+endnum);
+                tbStAsj.setEndNum(endnum);
+                tbStAsj.setStartNum(startnum);
+                List<TbStAsj> asjxxListFy = YpglAsjService.findAsjxxListFy(tbStAsj);
+                RunAsjList runAsjList = new RunAsjList(asjxxListFy, tbXwAsjbzKeywords,phones,asjbzs);
+                executorService.execute(runAsjList);
+            }
+
+            executorService.shutdown();
+            resultJSON.put("status","success");
+            resultJSON.put("message", "成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            executorService.shutdown();
+            resultJSON.put("status","fail");
+            resultJSON.put("message", e.getMessage());
+        }
+        return resultJSON;
+    }*/
+
+
+    class RunAsjList extends Thread{
+        private final List<TbStAsj> asjxxListFy;
+        private final List<TbXwAsjbzKeyword> keyword;
+        private final List<Phone> phoneList;
+        private final List<Asjbz> asjbzs;
+        public  RunAsjList(List<TbStAsj> asjxxListFy, List<TbXwAsjbzKeyword> keyword,List<Phone> phoneList,List<Asjbz> asjbzs){
+            this.asjxxListFy=asjxxListFy;
+            this.keyword = keyword;
+            this.phoneList = phoneList;
+            this.asjbzs = asjbzs;
+        }
+
+        @SneakyThrows
+        @Override
+        public void run() {
+            ExecutorService executorService = Executors.newFixedThreadPool(10);
+            Thread.sleep(1000L);
+
+            for (int i=0;i<asjxxListFy.size();i++){
+//              案发时间段标签
+                if (asjxxListFy.get(i).getAsjfssj_asjfsjssj()!=null&&asjxxListFy.get(i).getAsjfssj_asjfskssj()!=null){
+                    Date asjfssj_asjfskssj = asjxxListFy.get(i).getAsjfssj_asjfskssj();
+                    Date asjfssj_asjfsjssj = asjxxListFy.get(i).getAsjfssj_asjfsjssj();
+                    int day = (int) ((asjfssj_asjfsjssj.getTime() - asjfssj_asjfskssj.getTime()) / (1000 * 3600 * 24));
+                    if ( day>1){
+                        asjxxListFy.get(i).setZasj("上午,下午,傍晚,夜间");
+                    }else {
+                        String[] kssj = new SimpleDateFormat("HH:mm:ss").format(asjfssj_asjfskssj).split(":");
+                        String[] jssj = new SimpleDateFormat("HH:mm:ss").format(asjfssj_asjfsjssj).split(":");
+
+                        if(kssj==null&&kssj.length==0&&jssj==null&&jssj.length==0){
+                            if(day>0){
+                                asjxxListFy.get(i).setZasj("上午,下午,傍晚,夜间");
+                            }
+                        }else {
+                            if (Integer.parseInt(kssj[0])>=6&&Integer.parseInt(kssj[0])<=13){
+
+                                if (Integer.parseInt(jssj[0])>=6&&Integer.parseInt(jssj[0])<=13){
+                                    asjxxListFy.get(i).setZasj("上午");
+                                }
+                                if (Integer.parseInt(jssj[0])>=13&&Integer.parseInt(jssj[0])<=19){
+                                    asjxxListFy.get(i).setZasj("上午,下午");
+                                }
+                                if (Integer.parseInt(jssj[0])>=19&&Integer.parseInt(jssj[0])<=24){
+                                    asjxxListFy.get(i).setZasj("上午,下午,傍晚");
+                                }
+                                if (day >0){
+                                    if (Integer.parseInt(jssj[0])<=24){
+                                        asjxxListFy.get(i).setZasj("上午,下午,傍晚,夜间");
+                                    }
+                                }
+
+                            }else if(Integer.parseInt(kssj[0])>=13&&Integer.parseInt(kssj[0])<=19){
+                                if (Integer.parseInt(jssj[0])>=13&&Integer.parseInt(jssj[0])<=19){
+                                    asjxxListFy.get(i).setZasj("下午");
+                                }
+                                if (Integer.parseInt(jssj[0])>=19&&Integer.parseInt(jssj[0])<=24){
+                                    asjxxListFy.get(i).setZasj("下午,傍晚");
+                                }
+                                if (day >0){
+                                    if (Integer.parseInt(jssj[0])>=0&&Integer.parseInt(jssj[0])<6){
+                                        asjxxListFy.get(i).setZasj("下午,傍晚,夜间");
+                                    }
+                                    if (Integer.parseInt(jssj[0])>=6&&Integer.parseInt(jssj[0])<=24){
+                                        asjxxListFy.get(i).setZasj("上午,下午,傍晚,夜间");
+                                    }
+                                }
+                                if (day >1){
+                                    if (Integer.parseInt(jssj[0])<=24){
+                                        asjxxListFy.get(i).setZasj("上午,下午,傍晚,夜间");
+                                    }
+                                }
+                            }else if(Integer.parseInt(kssj[0])>=19&&Integer.parseInt(kssj[0])<=24){
+                                if (Integer.parseInt(jssj[0])>=19&&Integer.parseInt(jssj[0])<=24){
+                                    asjxxListFy.get(i).setZasj("傍晚");
+                                }
+                                if (Integer.parseInt(jssj[0])>=0&&Integer.parseInt(jssj[0])<=6){
+                                    asjxxListFy.get(i).setZasj("傍晚,夜间");
+                                }
+                                if (Integer.parseInt(jssj[0])>=6&&Integer.parseInt(jssj[0])<=13){
+                                    asjxxListFy.get(i).setZasj("上午,傍晚,夜间");
+                                }
+                                if (day >0){
+                                    if (Integer.parseInt(jssj[0])>=13&&Integer.parseInt(jssj[0])<=24){
+                                        asjxxListFy.get(i).setZasj("上午,下午,傍晚,夜间");
+                                    }
+                                }
+
+                                if (day >1){
+                                    if (Integer.parseInt(jssj[0])<=24){
+                                        asjxxListFy.get(i).setZasj("上午,下午,傍晚,夜间");
+                                    }
+                                }
+
+                            }else if(Integer.parseInt(kssj[0])>=0&&Integer.parseInt(kssj[0])<=6){
+                                if (Integer.parseInt(jssj[0])>=0&&Integer.parseInt(jssj[0])<=6){
+                                    asjxxListFy.get(i).setZasj("夜间");
+                                }
+                                if (Integer.parseInt(jssj[0])>=6&&Integer.parseInt(jssj[0])<=13){
+                                    asjxxListFy.get(i).setZasj("上午,夜间");
+                                }
+                                if (Integer.parseInt(jssj[0])>=3&&Integer.parseInt(jssj[0])<=19){
+                                    asjxxListFy.get(i).setZasj("上午,下午,夜间");
+                                }
+                                if (Integer.parseInt(jssj[0])>=19&&Integer.parseInt(jssj[0])<=24){
+                                    asjxxListFy.get(i).setZasj("上午,下午,傍晚,夜间");
+                                }
+                                if (day >0){
+                                    if (Integer.parseInt(jssj[0])<=24){
+                                        asjxxListFy.get(i).setZasj("上午,下午,傍晚,夜间");
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                }
+//               获取案件周边500米的基站数量
+                int count =0;
+                if(asjxxListFy.get(i).getAsjfsdd_dqwd()!=null&&asjxxListFy.get(i).getAsjfsdd_dqjd()!=null) {
+                    for (Phone phone : phoneList) {
+                        double[] doubles = GJUtil.doubleSpecifyLng(asjxxListFy.get(i).getAsjfsdd_dqjd(), asjxxListFy.get(i).getAsjfsdd_dqwd(), 500);
+                        if (doubles != null && doubles.length > 0) {
+                            if (Double.valueOf(phone.getLon()) >= doubles[1] && Double.valueOf(phone.getLon()) <= doubles[0] && Double.valueOf(phone.getLat()) >= doubles[3] && Double.valueOf(phone.getLat()) <= doubles[2]) {
+                                count++;
+                            }
+                        }
+                    }
+                }
+                asjxxListFy.get(i).setJzmd(count+"");
+//          匹配厂区，别墅，小区的案发地
+                List<String> afdList = new ArrayList<>();
+                String jyaq = asjxxListFy.get(i).getJyaq();
+                if(jyaq.contains("厂区")){
+                    afdList.add("厂区");
+                }else if(jyaq.contains("别墅")){
+                    afdList.add("别墅");
+                }else if(jyaq.contains("小区")){
+                    afdList.add("小区");
+                }
+                if (afdList!=null&&afdList.size()>0){
+                    String replace = afdList.toString().replace(" ", "");
+                    asjxxListFy.get(i).setZadd(replace.substring(1,replace.length()-1));
+                }
+
+//              开始分析
+                RunAsjJYAQ runMatchJYAQ = new RunAsjJYAQ(asjxxListFy.get(i),keyword,asjbzs);
+                executorService.execute(runMatchJYAQ);
+
+            }
+            executorService.shutdown();
+        }
+    }
+
+
+    class RunAsjJYAQ extends Thread{
+        private final TbStAsj asj;
+        private final List<TbXwAsjbzKeyword> keyword;
+        private final List<Asjbz> asjbzs;
+        public  RunAsjJYAQ(TbStAsj asj, List<TbXwAsjbzKeyword> keyword,List<Asjbz> asjbzs){
+            this.asj=asj;
+            this.keyword = keyword;
+            this.asjbzs = asjbzs;
+        }
+
+        public  Map<String,List<String>> doRunThread(TbStAsj asj, TbXwAsjbzKeyword keyword,List<Asjbz> asjbzs) {
+            List<String> stringList = new ArrayList<>();
+            List<String> stringArrayList = new ArrayList<>();
+            List<String> sdList = new ArrayList<>();
+            List<String> hjList = new ArrayList<>();
+            List<String> mbList = new ArrayList<>();
+            TreeSet<String> ksList = new TreeSet<>();
+            TreeSet<String> ajList = new TreeSet<>();
+
+            Map<String,List<String>> map = new HashMap<>();
+//        获取同义词和关键词
+            String keyword1 = keyword.getKeyword();
+            String synonyms = keyword.getSynonyms();
+            String[] split1 = null;
+
+            if (!StringUtil.isEmpty(synonyms)){
+                split1 = synonyms.split(",");
+            }
+//          关键词匹配
+            String sy_jyqk = asj.getJyaq();
+            if (!StringUtil.isEmpty(sy_jyqk)){
+                if (sy_jyqk.contains(keyword1)){
+                    stringArrayList.add(keyword1);
+                    stringList.add(keyword1);
+                    if (!StringUtil.isEmpty(keyword.getState())){
+                        if (keyword.getState().equals("手段")){
+                            sdList.add(keyword1);
+                        }
+                        if (keyword.getState().equals("环境")){
+                            hjList.add(keyword1);
+                        }
+                        if (keyword.getState().equals("目标")){
+                            mbList.add(keyword1);
+                        }
+                    }
+                    ksList.add(keyword1);
+                }
+            }
+//          同义词匹配
+            if (split1 !=null && split1.length>0){
+                for (String str:split1){
+                    if (!StringUtil.isEmpty(sy_jyqk)){
+                        if (sy_jyqk.contains(str)){
+                            stringArrayList.add(keyword1);
+                            stringList.add(str);
+                            ksList.add(str);
+                        }
+                    }
+                }
+            }
+
+            HashSet hashSet = new HashSet(stringArrayList);
+            stringArrayList.clear();
+            stringArrayList.addAll(hashSet);
+
+            map.put("key",stringArrayList);
+            map.put("allkey",stringList);
+            map.put("sd",sdList);
+            map.put("hj",hjList);
+            map.put("mb",mbList);
+            ArrayList<String> objects = new ArrayList<>();
+            objects.addAll(ksList);
+            map.put("kskey",objects);
+//            List<String> stringList1 = new ArrayList<>();
+//            stringList1.addAll(ajList);
+//            map.put("aj",stringList1);
+
+            return map;
+        }
+
+        public  void doRunBqThread(TbStAsj asj,List<TbXwAsjbzKeyword> keyword,List<Asjbz> asjbzs) {
+            List<String> stringList = new ArrayList<>();
+            List<String> list = new ArrayList<>();
+            List<String> sdList = new ArrayList<>();
+            List<String> hjList = new ArrayList<>();
+            List<String> mbList = new ArrayList<>();
+            List<String> ksList = new ArrayList<>();
+            TreeSet<String> ajList = new TreeSet<>();
+            for (TbXwAsjbzKeyword keyword1:keyword){
+                Map<String, List<String>> map = doRunThread(asj, keyword1,asjbzs);
+                stringList.addAll(map.get("allkey"));
+                list.addAll(map.get("key"));
+                sdList.addAll(map.get("sd"));
+                hjList.addAll(map.get("hj"));
+                mbList.addAll(map.get("mb"));
+                ksList.addAll(map.get("kskey"));
+//                ajList.addAll(map.get("aj"));
+            }
+//            System.out.println("案件编号"+asj.getAsjbh()+"标签"+stringList.toString());
+//            if(stringList != null && stringList.size()>0){
+            if (stringList!=null&&stringList.size()>0){
+                asj.setSdtd(list.toString().replace(" ",""));
+                asj.setBqyp(stringList.toString().replace(" ",""));
+                //          案件匹配
+                if (list!=null&&list.size()>0){
+                    if (asjbzs!=null&&asjbzs.size()>0){
+                        for (Asjbz asjbz:asjbzs){
+                            int count =0;
+                            if(!StringUtil.isEmpty(asjbz.getZj())&&!StringUtil.isEmpty(asjbz.getOperators())){
+                                String zj = asjbz.getZj();
+                                String operators = asjbz.getOperators();
+                                String[] split = zj.split(",");
+                                String[] split2 = operators.split(",");
+                                if(split.length==(split2.length+1)){
+                                    for (int i=0;i<split.length;i++){
+                                        if(i==0){
+                                            if(split[i].equals("0")){
+                                                count++;
+                                            }else {
+                                                if (list.contains(split[i])){
+                                                    System.out.println("=============");
+                                                    count++;
+                                                }
+                                            }
+                                        }else {
+                                            if(split2[i-1].equals("+")){
+                                                if(split[i].equals("0")){
+                                                    count++;
+                                                }else {
+                                                    if (list.contains(split[i])){
+                                                        count++;
+                                                    }
+                                                }
+                                            }else {
+                                                if(split[i].equals("0")){
+                                                    count++;
+                                                }else {
+                                                    if (!list.contains(split[i])){
+                                                        count++;
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                    if(count==split.length){
+                                        ajList.add(asjbz.getCode());
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (sdList!=null&&sdList.size()>0){
+                asj.setZasf(sdList.toString().replace(" ",""));
+            }
+            if (hjList!=null&&hjList.size()>0){
+                asj.setZahj(hjList.toString().replace(" ",""));
+            }
+            if (mbList!=null&&mbList.size()>0){
+                asj.setZamb(mbList.toString().replace(" ",""));
+            }
+            if (ksList!=null&&ksList.size()>0){
+                asj.setZj(ksList.toString().replace(" ",""));
+            }
+            if (ajList!=null&&ajList.size()>0){
+                String replace =ajList.toString().replace(" ", "");
+                asj.setAjxz(replace.substring(1,replace.length()-1));
+            }
+//                asj.setKeyword(list.toString().replace(" ",""));
+            try {
+                YpglAsjService.insertAsjbzAll(asj);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+//            }
+        }
+        @Override
+        public void run() {
+            doRunBqThread(asj,keyword,asjbzs);
+        }
+    }
+
+    //    案件特征
+    @RequestMapping(value="/selectajtztq",method = {RequestMethod.GET, RequestMethod.POST})
+    @ResponseBody
+    public XzxtRestResult selectajtztq(@RequestBody TbStAsj tbStAsj){
+
+//      分页
+        EasyUIPage easyUIPage = new EasyUIPage();
+        easyUIPage.setPage(tbStAsj.getStartNum());
+        easyUIPage.setPagePara(tbStAsj.getEndNum());
+        int begin = easyUIPage.getBegin();
+        int end = easyUIPage.getEnd();
+        tbStAsj.setStartNum(begin);
+        tbStAsj.setEndNum(end);
+        Map map = new HashMap();
+
+        // 案件类别代码模糊查询
+        if (null != tbStAsj.getAjlbdm() && !"".equals(tbStAsj.getAjlbdm())) {
+            // 根据规则截取前三位
+            String ajlbdm = "";
+            if (tbStAsj.getAjlbdm().endsWith("000")) {
+                ajlbdm = tbStAsj.getAjlbdm().substring(0, 3);
+            } else {
+                ajlbdm = tbStAsj.getAjlbdm();
+            }
+            tbStAsj.setAjlb(ajlbdm);
+        }
+
+        if (!StringUtil.isEmpty(tbStAsj.getXalb())){
+            String zatz = "";
+            if (tbStAsj.getXalb().endsWith("000000")) {
+                zatz = tbStAsj.getXalb().substring(0, 6);
+            } else if(tbStAsj.getXalb().endsWith("00")){
+                zatz = tbStAsj.getXalb().substring(0, 10);
+            }else{
+                zatz = tbStAsj.getXalb();
+            }
+            tbStAsj.setXalb(zatz);
+        }
+
+        List<TbStAsj> list = YpglAsjService.selectAjtztq(tbStAsj);
+        Integer integer = YpglAsjService.selectAjtztqCount(tbStAsj);
+        for (TbStAsj stAsj:list){
+            if (!StringUtil.isEmpty(stAsj.getAjxz())){
+                TreeSet<String> treeSet = new TreeSet<>();
+                String[] split = stAsj.getAjxz().split(",");
+                for (String str:split){
+                    DictItem dictItem2 = new DictItem();
+                    dictItem2.setCode(str);
+                    dictItem2.setGroupid("CODE_GABAJXZLB");
+                    String code1 = dicItemService.getCode(dictItem2);
+                    treeSet.add(code1);
+                }
+                String replace =treeSet.toString().replace(" ", "");
+                stAsj.setAjxzmc(replace.substring(1,replace.length()-1));
+            }
+        }
+        map.put("list",list);
+        map.put("total",integer);
+        return XzxtRestResult.build(200, "获取标签案件列表信息成功", "", map);
+    }
+
+    @RequestMapping(value = "/toAsjxg",method = {RequestMethod.GET,RequestMethod.POST})
+    @ResponseBody
+    public JSONObject toAsjxg(@RequestBody TbXwAsjbzKeyword tbXwAsjbzKeyword){
+        JSONObject resultJSON = new JSONObject();
+        ExecutorService executorService = Executors.newFixedThreadPool(1000);
+
+        try{
+            RunAsjxg runAsjxg = new RunAsjxg(tbXwAsjbzKeyword);
+            executorService.execute(runAsjxg);
+            executorService.shutdown();
+            resultJSON.put("status","success");
+            resultJSON.put("message", "成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            executorService.shutdown();
+            resultJSON.put("status","fail");
+            resultJSON.put("message", e.getMessage());
+        }
+        return resultJSON;
+    }
+
+    class RunAsjxg extends Thread{
+        private final TbXwAsjbzKeyword tbXwAsjbzKeyword;
+
+        public  RunAsjxg(TbXwAsjbzKeyword tbXwAsjbzKeyword){
+            this.tbXwAsjbzKeyword = tbXwAsjbzKeyword;
+        }
+
+
+        @Override
+        public void run() {
+//            删除
+            if(tbXwAsjbzKeyword.getState().equals("1")){
+                TbXwAsjbzKeyword selectkey = tbXwAsjbzKeywordService.selectkey(tbXwAsjbzKeyword);
+                List<Asjbz> selectkey1 = asjbzService.selectkey(selectkey.getXxzjbh());
+                if(selectkey1!=null&&selectkey1.size()>0){
+                    for (Asjbz asjbz:selectkey1){
+                        String zj = asjbz.getZj();
+                        List<String> zjlist = new ArrayList<>();
+                        if(!StringUtil.isEmpty(zj)){
+                            String[] split = zj.split(",");
+                            for (String str:split){
+                                if(!str.equals(selectkey.getKeyword())){
+                                    zjlist.add(str);
+                                }
+                            }
+                        }
+                        if(zjlist!=null&&zjlist.size()>0){
+                            String replace =zjlist.toString().replace(" ", "");
+                            asjbz.setZj(replace.substring(1,replace.length()-1));
+                        }
+                        asjbzService.updateAsjbz(asjbz);
+                    }
+                }
+            }else if(tbXwAsjbzKeyword.getState().equals("2")){
+                TbXwAsjbzKeyword selectkey = tbXwAsjbzKeywordService.selectkey(tbXwAsjbzKeyword);
+                List<Asjbz> selectkey1 = asjbzService.selectkey(selectkey.getXxzjbh());
+                if(selectkey1!=null&&selectkey1.size()>0){
+                    for (Asjbz asjbz:selectkey1){
+                        String zj = asjbz.getZj();
+                        int count = 99999;
+                        String keywords = asjbz.getKeywords();
+                        List<String> zjlist = new ArrayList<>();
+                        if(!StringUtil.isEmpty(keywords)){
+                            String[] split = keywords.split(",");
+                            for (int i=0;i<split.length;i++){
+                                if(split[i].equals(tbXwAsjbzKeyword.getXxzjbh())){
+                                    count =i;
+                                }
+                            }
+                        }
+                        if(!StringUtil.isEmpty(zj)){
+                            String[] split = zj.split(",");
+                            if (count<=split.length){
+                                for (int i=0;i<split.length;i++){
+                                    if(i==count){
+                                        zjlist.add(selectkey.getKeyword());
+                                    }else {
+                                        zjlist.add(split[i]);
+                                    }
+                                }
+                            }
+                        }
+                        if(zjlist!=null&&zjlist.size()>0){
+                            String replace =zjlist.toString().replace(" ", "");
+                            asjbz.setZj(replace.substring(1,replace.length()-1));
+                        }
+                        asjbzService.updateAsjbz(asjbz);
+                    }
+                }
+            }
+        }
+    }
+
+
+    @RequestMapping(value = "/toAsjup",method = {RequestMethod.GET,RequestMethod.POST})
+    @ResponseBody
+    public JSONObject toAsjup(@RequestBody TbXwAsjbzKeyword tbXwAsjbzKeyword){
+        JSONObject resultJSON = new JSONObject();
+
+        try{
+            //            删除
+            if(tbXwAsjbzKeyword.getState().equals("1")){
+                TbXwAsjbzKeyword selectkey = tbXwAsjbzKeywordService.selectkey(tbXwAsjbzKeyword);
+                List<Asjbz> selectkey1 = asjbzService.selectkey(selectkey.getXxzjbh());
+                if(selectkey1!=null&&selectkey1.size()>0){
+                    for (Asjbz asjbz:selectkey1){
+                        String zj = asjbz.getZj();
+                        List<String> zjlist = new ArrayList<>();
+                        if(!StringUtil.isEmpty(zj)){
+                            String[] split = zj.split(",");
+                            for (String str:split){
+                                if(str.equals(selectkey.getKeyword())){
+                                    zjlist.add("0");
+                                }else {
+                                    zjlist.add(str);
+                                }
+                            }
+                        }
+                        if(zjlist!=null&&zjlist.size()>0){
+                            String replace =zjlist.toString().replace(" ", "");
+                            asjbz.setZj(replace.substring(1,replace.length()-1));
+                        }
+                        asjbzService.updateAsjbz(asjbz);
+                    }
+                }
+            }else if(tbXwAsjbzKeyword.getState().equals("2")){
+                TbXwAsjbzKeyword selectkey = tbXwAsjbzKeywordService.selectkey(tbXwAsjbzKeyword);
+                List<Asjbz> selectkey1 = asjbzService.selectkey(selectkey.getXxzjbh());
+                if(selectkey1!=null&&selectkey1.size()>0){
+                    for (Asjbz asjbz:selectkey1){
+                        String zj = asjbz.getZj();
+                        int count = 99999;
+                        String keywords = asjbz.getKeywords();
+                        List<String> zjlist = new ArrayList<>();
+                        if(!StringUtil.isEmpty(keywords)){
+                            String[] split = keywords.split(",");
+                            for (int i=0;i<split.length;i++){
+                                if(split[i].equals(tbXwAsjbzKeyword.getXxzjbh())){
+                                    count =i;
+                                }
+                            }
+                        }
+                        if(!StringUtil.isEmpty(zj)){
+                            String[] split = zj.split(",");
+                            if (count<=split.length){
+                                for (int i=0;i<split.length;i++){
+                                    if(i==count){
+                                        zjlist.add(selectkey.getKeyword());
+                                    }else {
+                                        zjlist.add(split[i]);
+                                    }
+                                }
+                            }
+                        }
+                        if(zjlist!=null&&zjlist.size()>0){
+                            String replace =zjlist.toString().replace(" ", "");
+                            asjbz.setZj(replace.substring(1,replace.length()-1));
+                        }
+                        asjbzService.updateAsjbz(asjbz);
+                    }
+                }
+            }
+
+            resultJSON.put("status","success");
+            resultJSON.put("message", "成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            resultJSON.put("status","fail");
+            resultJSON.put("message", e.getMessage());
+        }
+        return resultJSON;
+    }
+}

service/publicapi/src/main/java/com/founder/publicapi/controller/ypglController/TbXwAsjbzKeywordController.java

+package com.founder.publicapi.controller.ypglController;
+
+
+import com.founder.commonutils.model.newPublicEntity.ApprovalEntity.EasyUIPage;
+import com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword;
+import com.founder.commonutils.util.StringUtil;
+import com.founder.commonutils.util.XzxtRestResult;
+import com.founder.publicapi.service.TbXwAsjbzKeywordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+
+import java.util.*;
+
+@Controller
+@CrossOrigin  //跨域访问
+@RequestMapping("/asjbzKeyword")
+public class TbXwAsjbzKeywordController {
+    @Autowired
+    private TbXwAsjbzKeywordService tbXwAsjbzKeywordService;
+
+    @RequestMapping(value = "/selectTbXwAsjbzKeywordList", method = {RequestMethod.GET, RequestMethod.POST})
+    @ResponseBody
+    public XzxtRestResult selectTbXwAsjbzKeywordList(@RequestBody TbXwAsjbzKeyword tbXwAsjbzKeyword) {
+        EasyUIPage easyUIPage = new EasyUIPage();
+  /*      easyUIPage.setPage(tbXwAsjbzKeyword.getPage());
+        easyUIPage.setPagePara(tbXwAsjbzKeyword.getLimit());
+        int begin = easyUIPage.getBegin();
+        int end = easyUIPage.getEnd();*/
+        tbXwAsjbzKeyword.setPage((tbXwAsjbzKeyword.getPage()-1)*tbXwAsjbzKeyword.getLimit());
+        tbXwAsjbzKeyword.setLimit(tbXwAsjbzKeyword.getLimit());
+        List<TbXwAsjbzKeyword> list = new ArrayList<>();
+        TreeSet<TbXwAsjbzKeyword> treeSet = new TreeSet<>(
+                Comparator.comparing(TbXwAsjbzKeyword::getXxzjbh)
+        );
+//       传来同义和关键词，分别查询  //page 1  limit 10
+        if (!StringUtil.isEmpty(tbXwAsjbzKeyword.getSyKey())){
+            tbXwAsjbzKeyword.setKeyword(tbXwAsjbzKeyword.getSyKey());
+            List<TbXwAsjbzKeyword> tbXwAsjbzKeywords1 = tbXwAsjbzKeywordService.selectTbXwAsjbzKeywordList(tbXwAsjbzKeyword);
+            tbXwAsjbzKeyword.setKeyword("");
+            tbXwAsjbzKeyword.setSynonyms(tbXwAsjbzKeyword.getSyKey());
+            List<TbXwAsjbzKeyword> tbXwAsjbzKeywords2 = tbXwAsjbzKeywordService.selectTbXwAsjbzKeywordList(tbXwAsjbzKeyword);
+            treeSet.addAll(tbXwAsjbzKeywords1);
+            treeSet.addAll(tbXwAsjbzKeywords2);
+            list.addAll(treeSet);
+        }else {
+            list = tbXwAsjbzKeywordService.selectTbXwAsjbzKeywordList(tbXwAsjbzKeyword);
+        }
+
+        for (TbXwAsjbzKeyword keyword:list){
+            if(!StringUtil.isEmpty(keyword.getMultiplexing_keyword())){
+                String multiplexing_keyword = keyword.getMultiplexing_keyword();
+                String s = getkeywordName(multiplexing_keyword);
+                keyword.setKeywordName(s);
+            }
+        }
+
+        System.out.println("======" + list.size());
+        return XzxtRestResult.build(200, "获取关键词、同义词列表信息", "", list);
+    }
+
+//    通过multiplexing_keyword 获关键词名
+    public String getkeywordName(String key){
+        String str = "";
+        String[] split = key.split(",");
+        for (int i=0;i<split.length;i++){
+            TbXwAsjbzKeyword keyword = new TbXwAsjbzKeyword();
+            keyword.setXxzjbh(split[i]);
+            List<TbXwAsjbzKeyword> tbXwAsjbzKeywords = tbXwAsjbzKeywordService.selectKEYWORD(keyword);
+            str = str + tbXwAsjbzKeywords.get(0).getKeyword();
+        }
+        return str;
+    }
+
+
+    @RequestMapping(value = "/selectTbXwAsjbzKeywordCount", method = {RequestMethod.GET, RequestMethod.POST})
+    @ResponseBody
+    public XzxtRestResult selectTbXwAsjbzKeywordCount(@RequestBody TbXwAsjbzKeyword tbXwAsjbzKeyword) {
+
+        Integer count = 0;
+        TreeSet<TbXwAsjbzKeyword> treeSet = new TreeSet<>(
+                Comparator.comparing(TbXwAsjbzKeyword::getXxzjbh)
+        );
+        if (!StringUtil.isEmpty(tbXwAsjbzKeyword.getSyKey())){
+            tbXwAsjbzKeyword.setKeyword(tbXwAsjbzKeyword.getSyKey());
+            List<TbXwAsjbzKeyword> list = tbXwAsjbzKeywordService.selectTbXwAsjbzCount(tbXwAsjbzKeyword);
+            tbXwAsjbzKeyword.setKeyword("");
+            tbXwAsjbzKeyword.setSynonyms(tbXwAsjbzKeyword.getSyKey());
+            List<TbXwAsjbzKeyword> list1 = tbXwAsjbzKeywordService.selectTbXwAsjbzCount(tbXwAsjbzKeyword);
+            treeSet.addAll(list);
+            treeSet.addAll(list1);
+            count = treeSet.size();
+        }else {
+            count = tbXwAsjbzKeywordService.selectTbXwAsjbzKeywordCount(tbXwAsjbzKeyword);
+        }
+        return XzxtRestResult.build(200, "获取关键词、同义词总数", "", count);
+    }
+
+    @RequestMapping(value = "/deleteTbXwAsjbzKeyword", method = {RequestMethod.GET, RequestMethod.POST})
+    @ResponseBody
+    public XzxtRestResult deleteTbXwAsjbzKeyword(@RequestBody TbXwAsjbzKeyword tbXwAsjbzKeyword) {
+        if(StringUtil.isEmpty(tbXwAsjbzKeyword.getXxzjbh())){
+            return XzxtRestResult.build(500, "删除关键词、同义词失败，主键为空", "");
+        }
+       int count= tbXwAsjbzKeywordService.deleteTbXwAsjbzKeyword(tbXwAsjbzKeyword);
+        return XzxtRestResult.build(200, "删除关键词、同义词成功", "", count);
+    }
+
+    @RequestMapping(value = "/saveTbXwAsjbzKeyword", method = {RequestMethod.GET, RequestMethod.POST})
+    @ResponseBody
+    public XzxtRestResult saveTbXwAsjbzKeyword(@RequestBody TbXwAsjbzKeyword tbXwAsjbzKeyword) {
+        tbXwAsjbzKeywordService.saveTbXwAsjbzKeyword(tbXwAsjbzKeyword);
+        return XzxtRestResult.build(200, "保存关键词、同义词成功", "", "");
+    }
+
+    @RequestMapping(value = "/selectTbXwAsjbzKeywordByCondition", method = {RequestMethod.GET, RequestMethod.POST})
+    @ResponseBody
+    public XzxtRestResult selectTbXwAsjbzKeywordByCondition(@RequestBody TbXwAsjbzKeyword tbXwAsjbzKeyword) {
+       List<TbXwAsjbzKeyword> list= tbXwAsjbzKeywordService.selectTbXwAsjbzKeywordByCondition(tbXwAsjbzKeyword);
+        return XzxtRestResult.build(200, "根据条件查询关键词、同义词成功", "", list);
+    }
+
+
+    @RequestMapping(value = "/selectTbXwByKey", method = {RequestMethod.GET, RequestMethod.POST})
+    @ResponseBody
+    public XzxtRestResult selectTbXwByKey(@RequestBody TbXwAsjbzKeyword tbXwAsjbzKeyword) {
+        List<TbXwAsjbzKeyword> list= tbXwAsjbzKeywordService.selectTbXwByKey(tbXwAsjbzKeyword);
+        List keyList = new ArrayList();
+        for (TbXwAsjbzKeyword keyword:list){
+            Map map = new HashMap();
+            List<String> list1 = new ArrayList<>();
+            String synonyms = keyword.getSynonyms();
+            String multiplexing_keyword = keyword.getMultiplexing_keyword();
+            String getsynonyms = getsynonyms(multiplexing_keyword);
+            String para = synonyms+","+getsynonyms;
+            String[] split = para.split(",");
+            for (int i = 0; i <split.length ; i++) {
+                list1.add(split[i]);
+            }
+
+            map.put(keyword.getKeyword(),list1);
+            keyList.add(map);
+        }
+        
+        return XzxtRestResult.build(200, "根据条件查询关键词、同义词成功", "", keyList);
+    }
+
+    //    通过multiplexing_keyword 获名
+    public String getsynonyms(String key){
+        String str = "";
+        if (!StringUtil.isEmpty(key)){
+            String[] split = key.split(",");
+            for (int i=0;i<split.length;i++){
+                TbXwAsjbzKeyword keyword = new TbXwAsjbzKeyword();
+                keyword.setXxzjbh(split[i]);
+                List<TbXwAsjbzKeyword> tbXwAsjbzKeywords = tbXwAsjbzKeywordService.selectKEYWORD(keyword);
+                str = str + tbXwAsjbzKeywords.get(0).getSynonyms();
+            }
+        }
+        return str;
+    }
+
+}

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

+package com.founder.publicapi.mapper.mysqlMapper;
+
+import com.founder.commonutils.model.ypglEntity.Asjbz;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Mapper
+public interface AsjbzKeyMapper {
+
+    int addAsjbz(Asjbz asjbz);
+
+    List<Asjbz> selectAsjbz(Asjbz asjbz);
+    List<Asjbz> selectkey(String key);
+
+    int updateAsjbz(Asjbz asjbz);
+
+}

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

+package com.founder.publicapi.mapper.mysqlMapper;
+
+import com.founder.commonutils.model.ypglEntity.DictItem;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Mapper
+public interface IDictitemDao {
+
+
+
+	List<DictItem> findCodeAllByType(DictItem dictItem);
+
+
+
+    String getCode(DictItem dictItem);
+
+    List<DictItem> getCodeByName(DictItem dictItem);
+    String getNameByCode(Map<String, String> map);
+
+
+
+}

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

+package com.founder.publicapi.mapper.mysqlMapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * @ClassName: 案件语义分析提取
+ * @Description TODO:
+ * @Author: founder
+ * @Date: 2021/9/26 12:04
+ * @Version: 1.0
+ **/
+@Repository
+public interface JqaqfxMapper {
+    String getAjtztqMaxDjsj(int days);
+}

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

+package com.founder.publicapi.mapper.mysqlMapper;
+
+import com.founder.commonutils.model.ypglEntity.Phone;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @ClassName: PhoneMapper
+ * @Description TODO:
+ * @Author: founder_fzy
+ * @Date: 2021/9/26 12:04
+ * @Version: 1.0
+ **/
+@Repository
+public interface PhoneMapper {
+    Phone selectPc(String phone);
+    List<Phone> selectJzxx();
+}

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

+package com.founder.publicapi.mapper.mysqlMapper;
+
+
+import com.founder.commonutils.model.ypglEntity.Asjbz;
+import com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface TbXwAsjbzKeywordMapper {
+    List<TbXwAsjbzKeyword> selectTbXwAsjbzKeywordList(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    List<TbXwAsjbzKeyword> selectTbXwAsjbzList(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    List<TbXwAsjbzKeyword> selectTbXwAsjbzCount(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    Integer selectTbXwAsjbzKeywordCount(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    int updateTbXwAsjbzKeyword(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    int insertTbXwAsjbzKeyword(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    List<TbXwAsjbzKeyword> selectTbXwAsjbzKeywordByCondition(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    List<TbXwAsjbzKeyword> selectKEYWORD(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+
+    List<TbXwAsjbzKeyword> selectTbXwByKey(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    TbXwAsjbzKeyword selectkey(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    String selectTbXwBySy(String synonyms);
+    List<String> selectTbXwBySyList(String synonyms);
+
+    List<Asjbz> selectKeyList();
+}

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

+package com.founder.publicapi.mapper.mysqlMapper;
+
+
+import com.founder.commonutils.model.ypglEntity.AsjQygz;
+import com.founder.commonutils.model.ypglEntity.JzmxKkEntity;
+import com.founder.commonutils.model.ypglEntity.TbStAsj;
+import com.founder.commonutils.model.ypglEntity.TbXwZbfzxyr;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface YpglAsjMapper {
+    List<AsjQygz> queryAsjxxToQygz(AsjQygz asjQygz);
+
+    List<AsjQygz> queryAsjxxByBhList(AsjQygz asjQygz);
+
+    AsjQygz queryAsjxxByAsjbh(@Param("asjbh") String asjbh);
+
+    List<TbXwZbfzxyr> selectTbXwZbfzxyrList(TbXwZbfzxyr tbXwZbfzxyr);
+
+    List<TbStAsj> findAsjxxList(TbStAsj tbStAsj);
+
+    List<TbStAsj> findAsjxxListFy(TbStAsj tbStAsj);
+    int selectBzCount();
+    int findAsjxxCount();
+
+    int insertAsjbz(TbStAsj tbStAsj);
+    int insertAsjbzAll(TbStAsj tbStAsj);
+    int deletebz();
+    TbStAsj selectAsjbz(String asjbh);
+
+    int updateAsjbz(TbStAsj tbStAsj);
+
+    List<TbStAsj> selectAsjBybz(TbStAsj tbStAsj);
+    List<TbStAsj> selectAsjBybzList(TbStAsj tbStAsj);
+
+    Integer selectAsjBybzCount(TbStAsj tbStAsj);
+
+    List<TbStAsj> selectAsjBybzNO(TbStAsj tbStAsj);
+
+    Integer selectAsjBybzCountNO(TbStAsj tbStAsj);
+
+    int updateStAsjbz();
+
+    int updateAsjbzAll();
+
+    List<TbStAsj> selectAjtztq(TbStAsj tbStAsj);
+    Integer selectAjtztqCount(TbStAsj tbStAsj);
+
+    List<TbStAsj> selectAsj(TbStAsj tbStAsj);
+    int insertAsjTime(TbStAsj tbStAsjs);
+
+    int updateAsjTime();
+    JzmxKkEntity selectAsjXxByAsjbh(@Param("asjbh") String asjbh);
+}

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!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.AsjbzKeyMapper">
+
+    <insert id="addAsjbz" parameterType="com.founder.commonutils.model.ypglEntity.Asjbz">
+        insert into TB_XW_ASJBZ_KEYWORD_RULES
+        (XXZJBH,
+        ajzlbCode,
+        ajxzlbCode,
+        CODE,
+        KEYWORDS,
+        OPERATORS,
+        XXDJRY_GMSFHM,
+        XXDJDW_GAJGMC,
+        XXDJDW_GAJGJGDM,
+        XXCZRY_XM,
+        XXCZRY_GMSFHM,
+        XXDJRY_LXDH,
+        XXCZDW_GAJGJGDM,
+        XXCZDW_GAJGMC,
+        zj,
+        XXSC_PDBZ)
+        VALUES
+        (#{xxzjbh, jdbcType=VARCHAR},
+        #{ajzlbCode, jdbcType=VARCHAR},
+        #{ajxzlbCode, jdbcType=VARCHAR},
+        <if test="code != null and code != ''">
+            #{code, jdbcType=VARCHAR},
+        </if>
+        <if test="code == null || code == ''">
+            null,
+        </if>
+        <if test="keywords != null and keywords != ''">
+            #{keywords, jdbcType=VARCHAR},
+        </if>
+        <if test="keywords == null || keywords == ''">
+            null,
+        </if>
+        <if test="operators != null and operators != ''">
+            #{operators, jdbcType=VARCHAR},
+        </if>
+        <if test="operators == null || operators == ''">
+            null,
+        </if>
+        <if test="xxdjrygmsfhm != null and xxdjrygmsfhm != ''">
+            #{xxdjrygmsfhm, jdbcType=VARCHAR},
+        </if>
+        <if test="xxdjrygmsfhm == null || xxdjrygmsfhm == ''">
+            null,
+        </if>
+        <if test="xxdjdwgajgmc != null and xxdjdwgajgmc != ''">
+            #{xxdjdwgajgmc, jdbcType=VARCHAR},
+        </if>
+        <if test="xxdjdwgajgmc == null || xxdjdwgajgmc == ''">
+            null,
+        </if>
+        <if test="xxjdwgajgjgdm != null and xxjdwgajgjgdm != ''">
+            #{xxjdwgajgjgdm, jdbcType=VARCHAR},
+        </if>
+        <if test="xxjdwgajgjgdm == null || xxjdwgajgjgdm == ''">
+            null,
+        </if>
+        <if test="xxczryxm != null and xxczryxm != ''">
+            #{xxczryxm, jdbcType=VARCHAR},
+        </if>
+        <if test="xxczryxm == null || xxczryxm == ''">
+            null,
+        </if>
+        <if test="xxczrygmsfhm != null and xxczrygmsfhm != ''">
+            #{xxczrygmsfhm, jdbcType=VARCHAR},
+        </if>
+        <if test="xxczrygmsfhm == null || xxczrygmsfhm == ''">
+            null,
+        </if>
+        <if test="xxdjrylxdh != null and xxdjrylxdh != ''">
+            #{xxdjrylxdh, jdbcType=VARCHAR},
+        </if>
+        <if test="xxdjrylxdh == null || xxdjrylxdh == ''">
+            null,
+        </if>
+        <if test="xxczdwgajgjgdm != null and xxczdwgajgjgdm != ''">
+            #{xxczdwgajgjgdm, jdbcType=VARCHAR},
+        </if>
+        <if test="xxczdwgajgjgdm == null || xxczdwgajgjgdm == ''">
+            null,
+        </if>
+        <if test="xxczdwgajgmc != null and xxczdwgajgmc != ''">
+            #{xxczdwgajgmc, jdbcType=VARCHAR},
+        </if>
+        <if test="xxczdwgajgmc == null || xxczdwgajgmc == ''">
+            null,
+        </if>
+        #{zj, jdbcType=VARCHAR},
+        '0'
+        )
+    </insert>
+
+    <select id="selectAsjbz" resultType="com.founder.commonutils.model.ypglEntity.Asjbz">
+
+        select t2.*
+        from (
+        select t1.*,
+        rownum as rn
+        from (
+        select r.XXZJBH,
+        (select name from sys_dictitem where groupid='CODE_AJLB' and code=r.ajzlbCode and scbz = '0') as ajzlb,
+        r.ajzlbCode,
+        (select name from sys_dictitem where groupid='CODE_AJXZ' and code=r.ajxzlbCode and scbz = '0') as ajxzlb,
+        r.ajxzlbCode,
+        (select name from sys_dictitem where groupid='CODE_GABAJXZLB' and code=r.CODE and scbz = '0') as caj,
+        r.CODE,
+        r.KEYWORDS,
+        r.OPERATORS,
+        r.XXDJRY_GMSFHM as xxdjrygmsfhm,
+        r.XXDJDW_GAJGMC as xxdjdwgajgmc,
+        r.XXDJDW_GAJGJGDM as xxjdwgajgjgdm,
+        r.XXCZRY_XM as xxczryxm,
+        r.XXCZRY_GMSFHM as xxczrygmsfhm,
+        r.XXDJRY_LXDH as xxdjrylxdh,
+        r.XXCZDW_GAJGJGDM as xxczdwgajgjgdm,
+        r.XXCZDW_GAJGMC as xxczdwgajgmc,
+        r.XXSC_PDBZ as xxscpdbz
+         from TB_XW_ASJBZ_KEYWORD_RULES  r where XXSC_PDBZ = '0'
+        <if test="xxzjbh != null and xxzjbh !=''">
+            and r.xxzjbh = #{xxzjbh, jdbcType=VARCHAR}
+        </if>
+        <if test="code != null and code !=''">
+            and r.code like #{code, jdbcType=VARCHAR} || '%'
+        </if>
+        <if test="ajzlb != null and ajzlb !=''">
+            and r.ajzlbCode like #{ajzlb, jdbcType=VARCHAR} || '%'
+        </if>
+        <if test="ajxzlb != null and ajxzlb !=''">
+            and r.ajxzlbCode like #{ajxzlb, jdbcType=VARCHAR} || '%'
+        </if>
+        <if test="keywords != null and keywords !=''">
+            and r.keywords like '%' || #{keywords, jdbcType=VARCHAR} || '%'
+        </if>
+        <if test="operators != null and operators != ''">
+            and r.operators like '%' || #{operators, jdbcType=VARCHAR} || '%'
+        </if>
+        ) t1
+        where rownum <![CDATA[ <= ]]> #{endNum}
+        ) t2
+        where rn <![CDATA[ > ]]> #{startNum}
+    </select>
+
+    <update id="updateAsjbz" parameterType="com.founder.commonutils.model.ypglEntity.Asjbz">
+        UPDATE TB_XW_ASJBZ_KEYWORD_RULES
+        <set>
+            <if test="ajzlbCode != null and ajzlbCode !=''">
+                ajzlbCode = #{ajzlbCode, jdbcType=VARCHAR},
+            </if>
+            <if test="ajxzlbCode != null and ajxzlbCode !=''">
+                ajxzlbCode = #{ajxzlbCode, jdbcType=VARCHAR},
+            </if>
+            <if test="code != null and code !=''">
+                code = #{code, jdbcType=VARCHAR},
+            </if>
+            <if test="keywords != null and keywords != ''">
+                KEYWORDS = #{keywords, jdbcType=VARCHAR},
+            </if>
+            <if test="operators != null and operators !=''">
+                OPERATORS = #{operators, jdbcType=VARCHAR},
+            </if>
+            <if test="xxdjrygmsfhm != null and xxdjrygmsfhm != ''">
+                XXDJRY_GMSFHM = #{xxdjrygmsfhm, jdbcType=VARCHAR},
+            </if>
+            <if test="xxdjdwgajgmc != null and xxdjdwgajgmc !=''">
+                XXDJDW_GAJGMC = #{xxdjdwgajgmc, jdbcType=VARCHAR},
+            </if>
+            <if test="xxjdwgajgjgdm != null and xxjdwgajgjgdm !=''">
+                XXDJDW_GAJGJGDM  = #{xxjdwgajgjgdm, jdbcType=VARCHAR},
+            </if>
+            <if test="xxczryxm != null and xxczryxm != ''">
+                XXCZRY_XM = #{xxczryxm, jdbcType=VARCHAR},
+            </if>
+            <if test="xxczrygmsfhm !=null and xxczrygmsfhm !=''">
+                XXCZRY_GMSFHM = #{xxczrygmsfhm, jdbcType=VARCHAR},
+            </if>
+            <if test="xxdjrylxdh != null and xxdjrylxdh !=''">
+                XXDJRY_LXDH = #{xxdjrylxdh, jdbcType=VARCHAR},
+            </if>
+            <if test="xxczdwgajgjgdm != null and xxczdwgajgjgdm != ''">
+                XXCZDW_GAJGJGDM = #{xxczdwgajgjgdm, jdbcType=VARCHAR},
+            </if>
+            <if test="xxczdwgajgmc != null and xxczdwgajgmc !=''">
+                XXCZDW_GAJGMC = #{xxczdwgajgmc, jdbcType=VARCHAR},
+            </if>
+            <if test="xxscpdbz != null and xxscpdbz !=''">
+                XXSC_PDBZ = #{xxscpdbz, jdbcType=VARCHAR},
+            </if>
+            <if test="zj != null and zj !=''">
+                zj = #{zj, jdbcType=VARCHAR},
+            </if>
+            GXSJ = NOW()
+        </set>
+        WHERE XXZJBH = #{xxzjbh, jdbcType=VARCHAR}
+    </update>
+
+    <select id="selectkey" parameterType="java.lang.String" resultType="com.founder.commonutils.model.ypglEntity.Asjbz">
+     select XXZJBH,zj,keywords
+     from TB_XW_ASJBZ_KEYWORD_RULES where
+        keywords  like '%' || #{key, jdbcType=VARCHAR} || '%'
+    </select>
+</mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!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.IDictitemDao">
+
+
+
+    <select id="findCodeAllByType" parameterType="com.founder.commonutils.model.ypglEntity.DictItem" resultType="com.founder.commonutils.model.ypglEntity.DictItem">
+        select distinct
+            id,
+            isparent,
+            groupid,
+            code ,
+            name,
+            groupname,
+            pid,
+            description,
+            yycj1,
+            yycj2,
+            yycj3,
+            yycj4,
+            yycj5,
+            yycj6,
+            yycj7,
+            yycj8,
+            yycj9,
+            startcode,
+            endcode
+        from sys_dictitem
+		where 1=1
+		and scbz = '0' and isparent = 'false'
+		<if test="groupid != null and groupid != ''">
+			and groupid=#{groupid, jdbcType=VARCHAR}
+		</if>
+        <if test="code != null and code != ''">
+            and code like #{code, jdbcType=VARCHAR} || '%'
+        </if>
+		order by code asc
+    </select>
+
+
+    <select id="getCode" parameterType="com.founder.commonutils.model.ypglEntity.DictItem" resultType="java.lang.String">
+         select distinct name from sys_dictitem
+		where 1=1
+		and scbz = '0'
+        <if test="code != null">
+            and code=#{code, jdbcType=VARCHAR}
+        </if>
+        <if test="groupid != null">
+            and groupid=#{groupid, jdbcType=VARCHAR}
+        </if>
+    </select>
+
+    <select id="getCodeByName" parameterType="com.founder.commonutils.model.ypglEntity.DictItem" resultType="com.founder.commonutils.model.ypglEntity.DictItem">
+        SELECT code,name,groupid FROM sys_dictitem
+        <where>
+            1=1
+            <if test="groupid != null and groupid != ''">
+                and groupid = #{groupid, jdbcType=VARCHAR}
+            </if>
+            <if test="code != null and code != ''">
+                and code like #{code, jdbcType=VARCHAR} || '%'
+            </if>
+            <if test="name != null and name != ''">
+                and name like '%' || #{name, jdbcType=VARCHAR} || '%'
+            </if>
+        </where>
+    </select>
+    <!-- 根据code和groupid查询name值-->
+    <select id="getNameByCode" parameterType="java.util.Map" resultType="java.lang.String">
+        select name from sys_dictitem where scbz='0'
+        <if test="groupid!=null and groupid!=''">and groupid = #{groupid}</if>
+        <if test="code!=null and code!=''">and code = #{code}</if>
+    </select>
+</mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!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.JqaqfxMapper">
+
+    <select id="getAjtztqMaxDjsj"  parameterType="java.lang.Integer" resultType="java.lang.String">
+        SELECT to_char(max(djsj)- #{days},'yyyy-mm-dd')
+        FROM TB_XW_JQAQFX
+    </select>
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!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.PhoneMapper">
+
+    <select id="selectPc" parameterType="java.lang.String" resultType="com.founder.commonutils.model.ypglEntity.Phone">
+        select * from tb_st_phoneno where phone = #{phone}
+    </select>
+
+    <select id="selectJzxx" resultType="com.founder.commonutils.model.ypglEntity.Phone">
+        select lat,lon from tb_st_jzxx where province = '重庆市'
+    </select>
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!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.TbXwAsjbzKeywordMapper">
+    <!-- 查询条件 -->
+    <sql id="where_sql">
+        XXSC_PDBZ='0'
+        <if test="keyword != null and keyword != ''">
+            and keyword like "%"#{ keyword , jdbcType=VARCHAR }"%"
+        </if>
+        <if test="synonyms != null and synonyms != ''">
+            AND synonyms like "%"#{ synonyms , jdbcType=VARCHAR }"%"
+        </if>
+        <if test="xxdjry_xm != null and xxdjry_xm != ''">
+            AND xxdjry_xm like "%"#{ xxdjry_xm , jdbcType=VARCHAR }"%"
+        </if>
+        <if test="djsj != null">
+            and to_char(djsj,'yyyy-mm-dd') = #{djsj , jdbcType=VARCHAR }
+        </if>
+        <if test="xxzjbh != null and xxzjbh != ''">
+            and xxzjbh = #{xxzjbh , jdbcType=VARCHAR }
+        </if>
+    </sql>
+
+    <!-- 查询List 分页 -->
+    <select id="selectTbXwAsjbzKeywordList" parameterType="com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword" resultType="com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword">
+<!--        select * from (
+        select o.*,rownum as rn from (
+        SELECT
+        *
+        FROM TB_XW_ASJBZ_KEYWORD
+        WHERE
+        <include refid="where_sql"/>
+        ) o where ROWNUM <![CDATA[<=]]> #{end}
+        ) s where rn <![CDATA[>=]]>  #{begin}-->
+        SELECT *
+        FROM TB_XW_ASJBZ_KEYWORD
+        WHERE <include refid="where_sql"/>
+        LIMIT  #{page} ,#{limit} ;
+    </select>
+
+    <select id="selectTbXwAsjbzList" parameterType="com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword" resultType="com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword">
+        SELECT
+        *
+        FROM TB_XW_ASJBZ_KEYWORD
+        WHERE
+        <include refid="where_sql"/>
+    </select>
+
+    <!-- 查询总数 分页 -->
+    <select id="selectTbXwAsjbzKeywordCount" parameterType="com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword" resultType="java.lang.Integer">
+        SELECT count(*)
+        FROM TB_XW_ASJBZ_KEYWORD
+        WHERE
+        <include refid="where_sql"/>
+    </select>
+
+    <select id="selectTbXwAsjbzCount" parameterType="com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword" resultType="com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword">
+        SELECT *
+        FROM TB_XW_ASJBZ_KEYWORD
+        WHERE
+        <include refid="where_sql"/>
+    </select>
+
+    <update id="updateTbXwAsjbzKeyword" parameterType="com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword">
+        UPDATE TB_XW_ASJBZ_KEYWORD
+        <set>
+        <if test="keyword != null and keyword != ''">
+             keyword= #{keyword , jdbcType=VARCHAR },
+        </if>
+        <if test="multiplexing_keyword != null and multiplexing_keyword != ''">
+             multiplexing_keyword = #{multiplexing_keyword , jdbcType=VARCHAR },
+        </if>
+        <if test="xxczry_xm != null and xxczry_xm != ''">
+             xxczry_xm = #{xxczry_xm , jdbcType=VARCHAR },
+        </if>
+        <if test="xxczry_gmsfhm != null and xxczry_gmsfhm != ''">
+             xxczry_gmsfhm = #{xxczry_gmsfhm , jdbcType=VARCHAR },
+        </if>
+        <if test="xxczdw_gajgjgdm != null and xxczdw_gajgjgdm != ''">
+             xxczdw_gajgjgdm = #{xxczdw_gajgjgdm , jdbcType=VARCHAR },
+        </if>
+        <if test="xxczdw_gajgmc != null and xxczdw_gajgmc != ''">
+             xxczdw_gajgmc = #{xxczdw_gajgmc , jdbcType=VARCHAR },
+        </if>
+        <if test="xxsc_pdbz != null and xxsc_pdbz != ''">
+             xxsc_pdbz = #{xxsc_pdbz , jdbcType=VARCHAR },
+        </if>
+        <if test="synonyms != null and synonyms != ''">
+             synonyms = #{synonyms , jdbcType=VARCHAR },
+        </if>
+        <if test="state != null and state != ''">
+            state = #{state , jdbcType=VARCHAR },
+        </if>
+        gxsj= NOW()
+        </set>
+        where xxzjbh = #{xxzjbh}
+    </update>
+
+    <insert id="insertTbXwAsjbzKeyword" parameterType="com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword">
+        insert into TB_XW_ASJBZ_KEYWORD
+        (xxzjbh,
+        keyword,
+       multiplexing_keyword,
+        xxdjry_xm,
+       xxdjry_gmsfhm,
+        xxdjdw_gajgmc,
+        xxdjdw_gajgjgdm,
+        xxczry_xm,
+        xxczry_gmsfhm,
+        xxdjry_lxdh,
+        xxczdw_gajgjgdm,
+       xxczdw_gajgmc,
+       synonyms,
+        state,
+        xxsc_pdbz
+        )
+        values (
+       #{xxzjbh , jdbcType=VARCHAR },
+       #{keyword , jdbcType=VARCHAR },
+       #{multiplexing_keyword , jdbcType=VARCHAR },
+       #{xxdjry_xm , jdbcType=VARCHAR },
+       #{xxdjry_gmsfhm , jdbcType=VARCHAR },
+        #{xxdjdw_gajgmc , jdbcType=VARCHAR },
+       #{xxdjdw_gajgjgdm , jdbcType=VARCHAR },
+       #{xxczry_xm , jdbcType=VARCHAR },
+        #{xxczry_gmsfhm , jdbcType=VARCHAR },
+       #{xxdjry_lxdh , jdbcType=VARCHAR },
+       #{xxczdw_gajgjgdm , jdbcType=VARCHAR },
+       #{xxczdw_gajgmc , jdbcType=VARCHAR },
+       #{synonyms , jdbcType=VARCHAR },
+        #{state , jdbcType=VARCHAR },
+        '0'
+        )
+    </insert>
+
+
+    <select id="selectTbXwAsjbzKeywordByCondition" parameterType="com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword" resultType="com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword">
+        SELECT
+        *
+        FROM TB_XW_ASJBZ_KEYWORD
+        WHERE xxsc_pdbz='0'
+        <if test="xxzjbh != null and xxzjbh != ''">
+          and   xxzjbh = #{xxzjbh , jdbcType=VARCHAR }
+        </if>
+        <if test="removeXxzjbh != null and removeXxzjbh != ''">
+           and  xxzjbh != #{removeXxzjbh , jdbcType=VARCHAR }
+        </if>
+
+    </select>
+
+    <select id="selectKEYWORD" parameterType="com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword" resultType="com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword">
+        SELECT
+        *
+        FROM TB_XW_ASJBZ_KEYWORD
+        WHERE XXSC_PDBZ = '0'
+        <if test="xxzjbh != null and xxzjbh != ''">
+            and   xxzjbh = #{xxzjbh , jdbcType=VARCHAR }
+        </if>
+        <if test="removeXxzjbh != null and removeXxzjbh != ''">
+            and  xxzjbh != #{removeXxzjbh , jdbcType=VARCHAR }
+        </if>
+
+    </select>
+
+    <select id="selectTbXwByKey" parameterType="com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword" resultType="com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword">
+        select * from TB_XW_ASJBZ_KEYWORD where XXSC_PDBZ = '0'  and keyword like '%' || #{keyword , jdbcType=VARCHAR } || '%'
+    </select>
+
+    <select id="selectTbXwBySy" parameterType="java.lang.String" resultType="java.lang.String">
+        select KEYWORD from TB_XW_ASJBZ_KEYWORD  where  XXSC_PDBZ = '0'  and synonyms like '%' || #{synonyms} || '%'
+    </select>
+
+    <select id="selectTbXwBySyList" parameterType="java.lang.String" resultType="java.lang.String">
+        select KEYWORD from TB_XW_ASJBZ_KEYWORD  where  XXSC_PDBZ = '0'  and synonyms like '%' || #{synonyms} || '%'
+    </select>
+
+    <select id="selectKeyList" resultType="com.founder.commonutils.model.ypglEntity.Asjbz">
+        select
+        r.zj ,
+        (select name from sys_dictitem where groupid='CODE_GABAJXZLB' and code=r.code and scbz = '0') as xalb,
+        r.code,
+        r.operators
+        from TB_XW_ASJBZ_KEYWORD_RULES r where XXSC_PDBZ = '0'
+    </select>
+
+    <select id="selectkey" parameterType="com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword" resultType="com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword">
+        SELECT
+          *
+        FROM TB_XW_ASJBZ_KEYWORD WHERE xxzjbh = #{xxzjbh , jdbcType=VARCHAR }
+    </select>
+</mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!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.YpglAsjMapper">
+    <select id="queryAsjxxToQygz" resultType="com.founder.commonutils.model.ypglEntity.AsjQygz" parameterType="com.founder.commonutils.model.ypglEntity.AsjQygz">
+        select ASJBH as asjbh,
+        AJMC as asjmc,
+        (select name from sys_dictitem where groupid='CODE_AJLB' and code=AJLBDM) as ajlbmc,
+        AJLBDM as ajlbdm,
+        XXDJRY_GMSFHM as zjhm,
+        XXDJRY_XM as trueName,
+        ASJFSDD_DQJD as j,
+        ASJFSDD_DQWD as w,
+        ASJFSSJ_ASJFSKSSJ as kssj,
+        ASJFSSJ_ASJFSJSSJ as jssj
+        from tb_st_asj
+        <where>
+            XXSC_PDBZ='0'
+            <!--<if test="ajlbdm != null and ajlbdm != ''">
+                and (ZATZ_JYQK not in (${ajlbdm}) or ZATZ_JYQK is null)
+            </if>-->
+            and ZATZ_JYQK like   #{ajlbdm}||'%'
+            and ASJFSDD_DQJD IS NOT NULL
+            AND ASJFSDD_DQWD IS NOT NULL
+            AND ASJFSSJ_ASJFSKSSJ IS NOT NULL
+            AND ASJFSSJ_ASJFSJSSJ IS NOT NULL
+            AND  DJSJ  <![CDATA[ >= ]]> to_date(#{kssj},'yyyy-MM-dd HH24:mi:ss')
+            AND  DJSJ  <![CDATA[ <= ]]> to_date(#{jssj},'yyyy-MM-dd HH24:mi:ss')
+        </where>
+    </select>
+    <!--同类犯罪嫌疑人 chent-->
+    <select id="selectTbXwZbfzxyrList" parameterType="com.founder.commonutils.model.ypglEntity.TbXwZbfzxyr" resultType="com.founder.commonutils.model.ypglEntity.TbXwZbfzxyr">
+        select b.zhfzxyr_xm,b.zhfzxyr_cyzj_zjhm,b.zhfzxyr_lxdh from tb_xw_zbfzxyr b
+        left join tb_st_asj a on a.asjbh=b.asjbh and b.xxsc_pdbz='0'
+        <where>
+            a.XXSC_PDBZ='0'
+            <if test="ajlbdm != null and ajlbdm != ''">
+                and a.AJLBDM = #{ajlbdm}
+            </if>
+            <if test="sfzhList != null and sfzhList.size() > 0">
+                and b.zhfzxyr_cyzj_zjhm in
+                <foreach collection="sfzhList" index="index" item="sfzh" open="(" separator="," close=")">
+                    #{sfzh}
+                </foreach>
+            </if>
+        </where>
+
+    </select>
+
+    <select id="findAsjxxList" resultType="com.founder.commonutils.model.ypglEntity.TbStAsj" parameterType="com.founder.commonutils.model.ypglEntity.TbStAsj">
+        select a.ASJBH as asjbh,
+        a.AJLBDM as ajlbdm,
+        a.AJMC as ajmc,
+        a.ASJFSSJ_ASJFSKSSJ as asjfssj_asjfskssj,
+        a.ASJFSSJ_ASJFSJSSJ as asjfssj_asjfsjssj,
+        a.asjfsdd_dqjd as asjfsjd ,
+        a.asjfsdd_dqwd as asjfswd,
+        a.zatz_jyqk,
+        a.fxasjsj,
+        a.fxasjdd_dzmc,
+        a.sldw_gajgmc,
+        a.ladw_gajgmc,
+        a.jyaq
+        from tb_st_asj a
+        <!--left join TB_XW_JQAQFX b  on a.asjbh=b.asjbh-->
+        <where>
+            a.XXSC_PDBZ='0' <!--and b.asjbh is   null-->
+            <if test="asjbh != null and asjbh != ''">
+                and a.asjbh = #{asjbh}
+            </if>
+            <if test="asjfssj_asjfskssj != null and asjfssj_asjfskssj != ''">
+                and a.ASJFSSJ_ASJFSKSSJ <![CDATA[ >= ]]> #{asjfssj_asjfskssj}
+            </if>
+            <if test="kssj != null">
+                and a.asjfssj_asjfskssj <![CDATA[ >= ]]> #{kssj}
+            </if>
+            <if test="jssj != null and jssj != ''">
+                and a.ASJFSSJ_ASJFSKSSJ <![CDATA[ <= ]]> #{asjfssj_asjfsjssj}
+            </if>
+            <if test="ajlbdm != null and ajlbdm != ''">
+                and a.ajlbdm like #{ajlbdm , jdbcType=VARCHAR } || '%'
+            </if>
+            <if test="gxsj != null and gxsj != ''">
+                and a.gxsj <![CDATA[ >= ]]> #{gxsj}
+            </if>
+            <if test="djsj != null">
+                and a.djsj <![CDATA[ >= ]]> #{djsj}
+            </if>
+            <if test="djsjEnd != null">
+                and a.djsj <![CDATA[ <= ]]>  #{djsjEnd}
+            </if>
+            <if test="zatz_jyqk != null and zatz_jyqk != ''">
+                and a.zatz_jyqk =  #{zatz_jyqk}
+            </if>
+        </where>
+    </select>
+
+     <select id="selectBzCount" resultType="java.lang.Integer">
+         select count(*) from tb_st_asjbz
+     </select>
+
+    <select id="findAsjxxListFy" resultType="com.founder.commonutils.model.ypglEntity.TbStAsj" parameterType="com.founder.commonutils.model.ypglEntity.TbStAsj">
+          SELECT t1.ASJBH AS asjbh,
+               t1.AJLBDM AS ajlbdm,
+               t1.AJMC AS ajmc,
+               t1.ASJFSSJ_ASJFSKSSJ AS asjfssj_asjfskssj,
+               t1.ASJFSSJ_ASJFSJSSJ AS asjfssj_asjfsjssj,
+               t1.ASJFSDD_DQJD AS asjfsdd_dqjd,
+               t1.ASJFSDD_DQWD AS asjfsdd_dqwd,
+               t1.zatz_jyqk AS zatz_jyqk,
+               t1.zagj_jyqk AS zagj_jyqk,
+               t1.ladw_gajgmc AS ladwGajgjgdm,
+               t1.jyaq
+        FROM tb_st_asj t1
+        WHERE t1.XXSC_PDBZ='0'
+        AND t1.asjfssj_asjfskssj > '2021-01-01 00:00:00'
+        ORDER BY t1.asjfssj_asjfskssj
+        LIMIT #{startNum}, #{endNum};
+    </select>
+
+    <select id="findAsjxxCount" resultType="java.lang.Integer">
+        select count(*) from tb_st_asj  where XXSC_PDBZ='0' and asjfssj_asjfskssj <![CDATA[>]]>  '2021-01-01  00:00:00'
+    </select>
+
+    <insert id="insertAsjbz" parameterType="com.founder.commonutils.model.ypglEntity.TbStAsj" >
+        insert into tb_st_asjbz (ASJBH,BZZT,BQYP,keyword,zj,ajxz,ISKEY) values (
+        #{asjbh , jdbcType=VARCHAR },
+         '1',
+          #{bqyp , jdbcType=VARCHAR },
+          #{keyword , jdbcType=VARCHAR},
+          #{zj , jdbcType=VARCHAR},
+          #{ajxz , jdbcType=VARCHAR},
+        <if test="isKey != null and isKey != ''">
+         #{isKey , jdbcType=VARCHAR}
+        </if>
+        <if test="isKey == null or isKey == ''">
+        '0'
+        </if>
+        )
+    </insert>
+    <delete id="deletebz" >
+        delete from tb_st_asjbz where asjbh = '1'
+    </delete>
+    <insert id="insertAsjbzAll" parameterType="com.founder.commonutils.model.ypglEntity.TbStAsj" >
+        insert into tb_st_ajtztq (ASJBH,AJLB,JZMD,SDTD,XALB,ZADD,ZAGJ,ZASJ,BQYP,GXSJ,zasf,zahj,zamb,zj,ajxz) values (
+        #{asjbh , jdbcType=VARCHAR },
+        #{ajlbdm, jdbcType=VARCHAR},
+        <if test="jzmd != null and jzmd != ''">
+            #{jzmd, jdbcType=VARCHAR},
+        </if>
+        <if test="jzmd == null || jzmd == ''">
+            '0',
+        </if>
+        #{sdtd, jdbcType=VARCHAR},
+        #{zatz_jyqk, jdbcType=VARCHAR},
+        #{zadd, jdbcType=VARCHAR},
+        #{zagj_jyqk, jdbcType=VARCHAR},
+        #{zasj, jdbcType=VARCHAR},
+        #{bqyp, jdbcType=VARCHAR},
+        NOW(),
+        #{zasf, jdbcType=VARCHAR},
+        #{zahj, jdbcType=VARCHAR},
+        #{zamb, jdbcType=VARCHAR},
+        #{zj, jdbcType=VARCHAR},
+        #{ajxz, jdbcType=VARCHAR}
+        )
+    </insert>
+
+    <select id="selectAsjbz" parameterType="java.lang.String" resultType="com.founder.commonutils.model.ypglEntity.TbStAsj">
+        select * from tb_st_asjbz where ASJBH = #{asjbh , jdbcType=VARCHAR}
+    </select>
+
+    <update id="updateAsjbz" parameterType="com.founder.commonutils.model.ypglEntity.TbStAsj">
+        update tb_st_asjbz set BQYP = #{bqyp , jdbcType=VARCHAR} where ASJBH = #{asjbh , jdbcType=VARCHAR}
+    </update>
+
+    <select id="selectAsjBybz" parameterType="com.founder.commonutils.model.ypglEntity.TbStAsj" resultType="com.founder.commonutils.model.ypglEntity.TbStAsj">
+      <!--  select t2.*
+        from (
+        select t1.*,
+        rownum as rn
+        from (
+        select a.*,Z.BZZT,Z.bqyp,Z.keyword,Z.ISKEY,z.ajxz from tb_st_asj a left join tb_st_asjbz Z on  a.ASJBH = Z.ASJBH
+        where  a.ASJBH = Z.ASJBH
+        <if test="bzzt == 1 ">
+            and Z.ajxz  is not null
+        </if>
+        <if test="bzzt == 2 ">
+            and Z.ajxz  is  null
+        </if>
+        <if test="zjList != null and zjList.size() > 0">
+            <foreach collection="zjList" index="index" item="item" open="AND " close=" " separator="AND">
+                 Z.zj  like '%' || #{item , jdbcType=VARCHAR } || '%'
+            </foreach>
+        </if>
+        <if test="keyword != null and keyword != ''">
+            and Z.keyword like '%' || #{keyword , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="asjbh != null and asjbh != ''">
+            and a.ASJBH =  #{asjbh , jdbcType=VARCHAR }
+        </if>
+        <if test="djsj != null">
+            and a.djsj <![CDATA[ >= ]]> #{djsj}
+        </if>
+        <if test="djsjEnd != null">
+            and a.djsj <![CDATA[ <= ]]>  #{djsjEnd}
+        </if>
+        <if test="asjfskssj != null and asjfskssj != ''" >
+            and to_char(a.asjfssj_asjfskssj,'yyyy-mm-dd HH24:MI:SS') <![CDATA[ >= ]]> #{asjfskssj}
+        </if>
+        <if test="asjfsjssj != null and asjfsjssj != ''">
+            and to_char(a.asjfssj_asjfsjssj,'yyyy-mm-dd HH24:MI:SS') <![CDATA[ <= ]]>  #{asjfsjssj}
+        </if>
+        <if test="ajlbdm != null and ajlbdm != ''">
+            and a.ajlbdm like #{ajlbdm , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="zatz_jyqk != null and zatz_jyqk != ''">
+            and a.zatz_jyqk like  #{zatz_jyqk , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="ajxz != null and ajxz != ''">
+            and z.ajxz like  '%' || #{ajxz , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="isKey != null and isKey != ''">
+            and Z.ISKEY =  #{isKey , jdbcType=VARCHAR }
+        </if>
+        ) t1
+        where rownum <![CDATA[ <= ]]> #{endNum}
+        ) t2
+        where rn <![CDATA[ > ]]> #{startNum}-->
+        SELECT *, Z.BZZT, Z.bqyp, Z.keyword, Z.ISKEY, Z.AJXZ
+        FROM tb_st_asj a
+        LEFT JOIN tb_st_asjbz Z ON a.ASJBH = Z.ASJBH
+        WHERE a.ASJBH = Z.ASJBH
+        <if test="bzzt == 1 ">
+            AND Z.AJXZ IS NOT NULL
+        </if>
+        <if test="bzzt == 2 ">
+            AND Z.AJXZ IS NULL
+        </if>
+        <if test="zjList != null and zjList.size() > 0">
+            AND (
+            <foreach collection="zjList" index="index" item="item" separator="OR">
+                Z.zj LIKE CONCAT('%', #{item, jdbcType=VARCHAR}, '%')
+            </foreach>
+            )
+        </if>
+        <if test="keyword != null and keyword != ''">
+            AND Z.keyword LIKE CONCAT('%', #{keyword, jdbcType=VARCHAR}, '%')
+        </if>
+        <if test="asjbh != null and asjbh != ''">
+            AND a.ASJBH =  #{asjbh, jdbcType=VARCHAR}
+        </if>
+        <if test="djsj != null">
+            AND a.djsj <![CDATA[ >= ]]> #{djsj}
+        </if>
+        <if test="djsjEnd != null">
+            AND a.djsj <![CDATA[ <= ]]> #{djsjEnd}
+        </if>
+        <if test="asjfskssj != null and asjfskssj != ''" >
+            AND DATE_FORMAT(a.asjfssj_asjfskssj,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{asjfskssj}
+        </if>
+        <if test="asjfsjssj != null and asjfsjssj != ''">
+            AND DATE_FORMAT(a.asjfssj_asjfsjssj,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{asjfsjssj}
+        </if>
+        <if test="ajlbdm != null and ajlbdm != ''">
+            AND a.ajlbdm LIKE CONCAT(#{ajlbdm, jdbcType=VARCHAR}, '%')
+        </if>
+        <if test="zatz_jyqk != null and zatz_jyqk != ''">
+            AND a.zatz_jyqk LIKE CONCAT(#{zatz_jyqk, jdbcType=VARCHAR}, '%')
+        </if>
+        <if test="ajxz != null and ajxz != ''">
+            AND z.AJXZ LIKE CONCAT('%', #{ajxz, jdbcType=VARCHAR}, '%')
+        </if>
+        <if test="isKey != null and isKey != ''">
+            AND Z.ISKEY =  #{isKey, jdbcType=VARCHAR}
+        </if>
+        LIMIT #{startNum}, #{endNum}
+
+    </select>
+
+    <select id="selectAsjBybzList" parameterType="com.founder.commonutils.model.ypglEntity.TbStAsj" resultType="com.founder.commonutils.model.ypglEntity.TbStAsj">
+        select a.*,Z.BZZT,Z.bqyp,Z.keyword,Z.ISKEY from tb_st_asj a left join tb_st_asjbz Z on  a.ASJBH = Z.ASJBH
+        where  a.ASJBH = Z.ASJBH
+        <if test="bzzt != null and bzzt != ''">
+            and Z.BZZT = #{bzzt , jdbcType=VARCHAR}
+        </if>
+        <if test="bqyp != null and bqyp != ''">
+            and Z.bqyp like '%' || #{bqyp , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="keyword != null and keyword != ''">
+            and Z.keyword like '%' || #{keyword , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="asjbh != null and asjbh != ''">
+            and a.ASJBH =  #{asjbh , jdbcType=VARCHAR }
+        </if>
+        <if test="djsj != null">
+            and a.djsj <![CDATA[ >= ]]> #{djsj}
+        </if>
+        <if test="djsjEnd != null">
+            and a.djsj <![CDATA[ <= ]]>  #{djsjEnd}
+        </if>
+        <if test="asjfskssj != null and asjfskssj != ''" >
+            and (a.asjfssj_asjfskssj,'yyyy-mm-dd HH24:MI:SS') <![CDATA[ >= ]]> #{asjfskssj}
+        </if>
+        <if test="asjfsjssj != null and asjfsjssj != ''">
+            and (a.asjfssj_asjfsjssj,'yyyy-mm-dd HH24:MI:SS') <![CDATA[ <= ]]>  #{asjfsjssj}
+        </if>
+        <if test="ajlbdm != null and ajlbdm != ''">
+            and a.ajlbdm like #{ajlbdm , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="zatz_jyqk != null and zatz_jyqk != ''">
+            and a.zatz_jyqk like #{zatz_jyqk , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="isKey != null and isKey != ''">
+            and Z.ISKEY =  #{isKey , jdbcType=VARCHAR }
+        </if>
+    </select>
+
+    <select id="selectAsjBybzCount" parameterType="com.founder.commonutils.model.ypglEntity.TbStAsj" resultType="java.lang.Integer">
+
+        select COUNT(*) from tb_st_asj a left join tb_st_asjbz Z on  a.ASJBH = Z.ASJBH
+        where  a.ASJBH = Z.ASJBH
+        <if test="bzzt == 1 ">
+            and Z.ajxz  is not null
+        </if>
+        <if test="bzzt == 2 ">
+            and Z.ajxz  is  null
+        </if>
+        <if test="zjList != null and zjList.size() > 0">
+            <foreach collection="zjList" index="index" item="item" open="AND " close=" " separator="AND">
+                Z.zj  like '%' || #{item , jdbcType=VARCHAR } || '%'
+            </foreach>
+        </if>
+        <if test="keyword != null and keyword != ''">
+            and Z.keyword like '%' || #{keyword , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="asjbh != null and asjbh != ''">
+            and a.ASJBH =  #{asjbh , jdbcType=VARCHAR }
+        </if>
+        <if test="djsj != null">
+            and a.djsj <![CDATA[ >= ]]> #{djsj}
+        </if>
+        <if test="djsjEnd != null">
+            and a.djsj <![CDATA[ <= ]]>  #{djsjEnd}
+        </if>
+        <if test="asjfskssj != null and asjfskssj != ''" >
+            and (a.asjfssj_asjfskssj,'yyyy-mm-dd HH24:MI:SS') <![CDATA[ >= ]]> #{asjfskssj}
+        </if>
+        <if test="asjfsjssj != null and asjfsjssj != ''">
+            and (a.asjfssj_asjfsjssj,'yyyy-mm-dd HH24:MI:SS') <![CDATA[ <= ]]>  #{asjfsjssj}
+        </if>
+        <if test="ajlbdm != null and ajlbdm != ''">
+            and a.ajlbdm like #{ajlbdm , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="zatz_jyqk != null and zatz_jyqk != ''">
+            and a.zatz_jyqk like  #{zatz_jyqk , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="ajxz != null and ajxz != ''">
+            and z.ajxz like  '%' || #{ajxz , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="isKey != null and isKey != ''">
+            and Z.ISKEY =  #{isKey , jdbcType=VARCHAR }
+        </if>
+    </select>
+
+
+    <select id="selectAsjBybzNO" parameterType="com.founder.commonutils.model.ypglEntity.TbStAsj" resultType="com.founder.commonutils.model.ypglEntity.TbStAsj">
+        select t2.*
+        from (
+        select t1.*,
+        rownum as rn
+        from (
+        select a.*,Z.BZZT,Z.bqyp,Z.keyword,Z.ISKEY,z.ajxz from tb_st_asj a left join tb_st_asjbz Z on a.ASJBH = Z.ASJBH
+        where a.ASJBH = Z.ASJBH and a.ASJBH NOT IN (select a.ASJBH from tb_st_asj a left join tb_st_asjbz Z on a.ASJBH = Z.ASJBH
+        WHERE 1=1
+        <if test="bzzt != null and bzzt != ''">
+            and Z.BZZT = '1'
+        </if>
+
+        )
+        <if test="bqyp != null and bqyp != ''">
+            and Z.bqyp like '%' || #{bqyp , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="keyword != null and keyword != ''">
+            and Z.keyword like '%' || #{keyword , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="asjbh != null and asjbh != ''">
+            and a.ASJBH =  #{asjbh , jdbcType=VARCHAR }
+        </if>
+        <if test="djsj != null">
+            and a.djsj <![CDATA[ >= ]]> #{djsj}
+        </if>
+        <if test="djsjEnd != null">
+            and a.djsj <![CDATA[ <= ]]>  #{djsjEnd}
+        </if>
+        <if test="asjfskssj != null and asjfskssj != ''" >
+            and (a.asjfssj_asjfskssj,'yyyy-mm-dd HH24:MI:SS') <![CDATA[ >= ]]> #{asjfskssj}
+        </if>
+        <if test="asjfsjssj != null and asjfsjssj != ''">
+            and (a.asjfssj_asjfsjssj,'yyyy-mm-dd HH24:MI:SS') <![CDATA[ <= ]]>  #{asjfsjssj}
+        </if>
+        <if test="ajlbdm != null and ajlbdm != '' and zatz_jyqk == '' and ajxz == ''">
+            and a.ajlbdm like #{ajlbdm , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="zatz_jyqk != null and zatz_jyqk != '' and ajxz == ''">
+            and a.zatz_jyqk like  #{zatz_jyqk , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="ajxz != null and ajxz != ''">
+            and z.ajxz like  '%' || #{ajxz , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="isKey != null and isKey != ''">
+            and Z.ISKEY =  #{isKey , jdbcType=VARCHAR }
+        </if>
+        ) t1
+        where rownum <![CDATA[ <= ]]> #{endNum}
+        ) t2
+        where rn <![CDATA[ > ]]> #{startNum}
+    </select>
+
+    <select id="selectAsjBybzCountNO" parameterType="com.founder.commonutils.model.ypglEntity.TbStAsj" resultType="java.lang.Integer">
+
+        select COUNT(*) from tb_st_asj a left join tb_st_asjbz Z on  a.ASJBH = Z.ASJBH
+        where  a.ASJBH = Z.ASJBH and
+
+        a.ASJBH NOT IN (select a.ASJBH from tb_st_asj a left join tb_st_asjbz Z on a.ASJBH = Z.ASJBH
+        WHERE 1=1
+        <if test="bzzt != null and bzzt != ''">
+            and Z.BZZT = '1'
+        </if>
+        )
+        <if test="bqyp != null and bqyp != ''">
+            and Z.bqyp like '%' || #{bqyp , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="keyword != null and keyword != ''">
+            and Z.keyword like '%' || #{keyword , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="asjbh != null and asjbh != ''">
+            and a.ASJBH =  #{asjbh , jdbcType=VARCHAR }
+        </if>
+        <if test="djsj != null">
+            and a.djsj <![CDATA[ >= ]]> #{djsj}
+        </if>
+        <if test="djsjEnd != null">
+            and a.djsj <![CDATA[ <= ]]>  #{djsjEnd}
+        </if>
+        <if test="asjfskssj != null and asjfskssj != ''" >
+            and (a.asjfssj_asjfskssj,'yyyy-mm-dd HH24:MI:SS') <![CDATA[ >= ]]> #{asjfskssj}
+        </if>
+        <if test="asjfsjssj != null and asjfsjssj != ''">
+            and (a.asjfssj_asjfsjssj,'yyyy-mm-dd HH24:MI:SS') <![CDATA[ <= ]]>  #{asjfsjssj}
+        </if>
+        <if test="ajlbdm != null and ajlbdm != ''">
+            and a.ajlbdm like #{ajlbdm , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="zatz_jyqk != null and zatz_jyqk != ''">
+            and a.zatz_jyqk like  #{zatz_jyqk , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="ajxz != null and ajxz != ''">
+            and z.ajxz like  '%' || #{ajxz , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="isKey != null and isKey != ''">
+            and Z.ISKEY =  #{isKey , jdbcType=VARCHAR }
+        </if>
+    </select>
+
+    <update id="updateStAsjbz">
+        Truncate table tb_st_asjbz
+    </update>
+
+    <update id="updateAsjbzAll">
+        Truncate table tb_st_ajtztq
+    </update>
+
+
+    <select id="selectAjtztq" parameterType="com.founder.commonutils.model.ypglEntity.TbStAsj" resultType="com.founder.commonutils.model.ypglEntity.TbStAsj">
+        select t2.*
+        from (
+        select t1.*,
+        rownum as rn
+        from (
+        select a.*,
+        (select name from sys_dictitem where groupid='CODE_AJLB' and code=Z.ajlb and scbz = '0') as ajlb,
+        Z.bqyp,
+        (select name from sys_dictitem where groupid='CODE_AJXZ' and code=Z.xalb and scbz = '0') as xalb,
+        Z.jzmd,Z.zadd,Z.zagj,Z.zasj,Z.sdtd,Z.ajxz from tb_st_asj a , tb_st_ajtztq Z
+        where  a.ASJBH = Z.ASJBH
+        <if test="ajxz != null and ajxz != ''">
+            and Z.ajxz  like '%' ||  #{ajxz , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="asjbh != null and asjbh != ''">
+            and a.ASJBH = #{asjbh , jdbcType=VARCHAR }
+        </if>
+        <if test="ajlb != null and ajlb != ''">
+            and Z.ajlb like #{ajlb , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="xalb != null and xalb != ''">
+            and Z.xalb like #{xalb , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="jzmd != null and jzmd != ''">
+            and Z.jzmd = #{jzmd , jdbcType=VARCHAR }
+        </if>
+        <if test="zadd != null and zadd != ''">
+            and Z.zadd = #{zadd , jdbcType=VARCHAR }
+        </if>
+        <if test="zagj != null and zagj != ''">
+            and Z.zagj = #{zagj , jdbcType=VARCHAR }
+        </if>
+        <if test="zasj != null and zasj != ''">
+            and Z.zasj = #{zasj , jdbcType=VARCHAR }
+        </if>
+        <if test="sdtd != null and sdtd != ''">
+            and Z.sdtd like '%' || #{sdtd , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="asjfskssj != null and asjfskssj != ''" >
+            and (a.fxasjsj,'yyyy-mm-dd HH24:MI:SS') <![CDATA[ >= ]]> #{asjfskssj}
+        </if>
+        <if test="asjfsjssj != null and asjfsjssj != ''">
+            and (a.fxasjsj,'yyyy-mm-dd HH24:MI:SS') <![CDATA[ <= ]]>  #{asjfsjssj}
+        </if>
+        order by Z.zadd,Z.zagj NULLS LAST
+        ) t1
+        where rownum <![CDATA[ <= ]]> #{endNum}
+        ) t2
+        where rn <![CDATA[ > ]]> #{startNum}
+    </select>
+
+    <select id="selectAjtztqCount" parameterType="com.founder.commonutils.model.ypglEntity.TbStAsj" resultType="java.lang.Integer">
+        select count(*) from tb_st_asj a , tb_st_ajtztq Z
+        where  a.ASJBH = Z.ASJBH
+        <if test="ajxz != null and ajxz != ''">
+            and Z.ajxz  like '%' ||  #{ajxz , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="asjbh != null and asjbh != ''">
+            and a.ASJBH = #{asjbh , jdbcType=VARCHAR }
+        </if>
+        <if test="ajlb != null and ajlb != ''">
+            and Z.ajlb like #{ajlb , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="xalb != null and xalb != ''">
+            and Z.xalb like #{xalb , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="jzmd != null and jzmd != ''">
+            and Z.jzmd = #{jzmd , jdbcType=VARCHAR }
+        </if>
+        <if test="zadd != null and zadd != ''">
+            and Z.zadd = #{zadd , jdbcType=VARCHAR }
+        </if>
+        <if test="zagj != null and zagj != ''">
+            and Z.zagj = #{zagj , jdbcType=VARCHAR }
+        </if>
+        <if test="zasj != null and zasj != ''">
+            and Z.zasj = #{zasj , jdbcType=VARCHAR }
+        </if>
+        <if test="sdtd != null and sdtd != ''">
+            and Z.sdtd like '%' || #{sdtd , jdbcType=VARCHAR } || '%'
+        </if>
+        <if test="asjfskssj != null and asjfskssj != ''" >
+            and (a.fxasjsj,'yyyy-mm-dd HH24:MI:SS') <![CDATA[ >= ]]> #{asjfskssj}
+        </if>
+        <if test="asjfsjssj != null and asjfsjssj != ''">
+            and (a.fxasjsj,'yyyy-mm-dd HH24:MI:SS') <![CDATA[ <= ]]>  #{asjfsjssj}
+        </if>
+    </select>
+
+    <select id="selectAsj" parameterType="com.founder.commonutils.model.ypglEntity.TbStAsj" resultType="com.founder.commonutils.model.ypglEntity.TbStAsj">
+        select a.asjbh,b.zhfzxyr_cyzj_zjhm from tb_st_asj a,tb_xw_zbfzxyr b
+        where a.asjbh=b.asjbh and a.zcjddm = '0600'
+        and (a.asjfssj_asjfskssj,'YYYY-MM-DD') <![CDATA[ >= ]]> '2021-06-01'
+        and (a.asjfssj_asjfskssj,'YYYY-MM-DD') <![CDATA[ <= ]]>  '2021-12-31'
+        <if test="asjbh != null and asjbh != ''">
+            and a.asjbh = #{asjbh , jdbcType=VARCHAR }
+        </if>
+    </select>
+
+    <update id="updateAsjTime">
+        Truncate table tb_st_asjTime
+    </update>
+
+    <insert id="insertAsjTime" parameterType="com.founder.commonutils.model.ypglEntity.TbStAsj">
+        INSERT INTO tb_st_asjTime(
+        xxzjbh,
+        asjbh,
+        ajmc,
+        zatz_jyqk,
+        fxasjsj,
+        fxasjdd_dzmc,
+        sldw_gajgmc,
+        ladw_gajgmc,
+        jyaq,
+        state,
+        counts,
+        glAsjbh
+        )values
+            (
+            #{xxzjbh , jdbcType=VARCHAR },
+            #{asjbh , jdbcType=VARCHAR },
+            #{ajmc , jdbcType=VARCHAR },
+            #{zatz_jyqk , jdbcType=VARCHAR },
+            #{fxasjsj},
+            #{fxasjdd_dzmc , jdbcType=VARCHAR },
+            #{sldw_gajgmc , jdbcType=VARCHAR },
+            #{ladw_gajgmc , jdbcType=VARCHAR },
+            #{jyaq , jdbcType=VARCHAR },
+            #{state , jdbcType=VARCHAR },
+            #{counts , jdbcType=VARCHAR },
+            #{glAsjbh , jdbcType=VARCHAR } )
+    </insert>
+    <select id="selectAsjXxByAsjbh" parameterType="java.lang.String" resultType="com.founder.commonutils.model.ypglEntity.JzmxKkEntity">
+        select
+        asjbh as asjbh,
+        asj.asjfssj_asjfskssj as afkssj,
+        asj.asjfssj_asjfsjssj as afjssj,
+        asj.asjfsdd_dqjd as x,
+        asj.asjfsdd_dqwd as y
+        from tb_st_asj asj where ASJBH=#{asjbh}
+    </select>
+</mapper>

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

+package com.founder.publicapi.service;
+
+
+
+import com.founder.commonutils.model.ypglEntity.Asjbz;
+
+import java.util.List;
+
+public interface AsjbzService {
+
+    int addAsjbz(Asjbz asjbz);
+
+    List<Asjbz> selectAsjbz(Asjbz asjbz);
+    List<Asjbz> selectkey(String key);
+    int updateAsjbz(Asjbz asjbz);
+}

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

+package com.founder.publicapi.service;
+
+import com.founder.commonutils.model.ypglEntity.DictItem;
+
+import java.util.List;
+
+public interface IDicItemService {
+
+    String getCode(DictItem dictItem);
+    public List<DictItem> getCodeAllByType(DictItem dictItem);
+    List<DictItem> getCodeByName(DictItem dictItem);
+}

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

+package com.founder.publicapi.service;
+
+
+import com.founder.commonutils.model.ypglEntity.Phone;
+
+import java.util.List;
+
+/**
+ * @ClassName: PhoneService
+ * @Description TODO:
+ * @Author: founder_fzy
+ * @Date: 2021/9/26 12:05
+ * @Version: 1.0
+ **/
+public interface PhoneService {
+    Phone selectPc(String phone);
+    List<Phone> selectJzxx();
+}

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

+package com.founder.publicapi.service;
+
+
+import com.founder.commonutils.model.ypglEntity.Asjbz;
+import com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword;
+
+import java.util.List;
+
+
+public interface TbXwAsjbzKeywordService {
+    List<TbXwAsjbzKeyword> selectTbXwAsjbzKeywordList(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    List<TbXwAsjbzKeyword> selectTbXwAsjbzList(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    List<TbXwAsjbzKeyword> selectTbXwAsjbzCount(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    Integer selectTbXwAsjbzKeywordCount(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    void saveTbXwAsjbzKeyword(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    int deleteTbXwAsjbzKeyword(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    List<TbXwAsjbzKeyword> selectTbXwAsjbzKeywordByCondition(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    List<TbXwAsjbzKeyword> selectKEYWORD(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    TbXwAsjbzKeyword selectkey(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    List<TbXwAsjbzKeyword> selectTbXwByKey(TbXwAsjbzKeyword tbXwAsjbzKeyword);
+    String selectTbXwBySy(String synonyms);
+    List<String> selectTbXwBySyList(String synonyms);
+    List<Asjbz> selectKeyList();
+}

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

+package com.founder.publicapi.service;
+
+
+
+import com.founder.commonutils.model.ypglEntity.AsjQygz;
+import com.founder.commonutils.model.ypglEntity.TbStAsj;
+
+import java.util.List;
+
+/**
+ * @ClassName： TbStAsjService
+ * @Auther： wushanyu
+ * @Description: 案件信息查询接口
+ * @CreateDate： 2019-07-02
+ * @Version: 1.0
+ */
+public interface YpglAsjService {
+
+    List<AsjQygz> queryAsjxxToQygz(AsjQygz asjQygz);
+
+    List<AsjQygz> queryAsjxxByBhList(AsjQygz asjQygz);
+
+    String getAjtztqMaxDjsj(int days);
+
+    List<TbStAsj> findAsjxxList(TbStAsj tbStAsj);
+    List<TbStAsj> findAsjxxListFy(TbStAsj tbStAsj);
+    int findAsjxxCount();
+    int selectBzCount();
+    int deletebz();
+    int insertAsjbz(TbStAsj tbStAsj);
+    int insertAsjbzAll(TbStAsj tbStAsj);
+    TbStAsj selectAsjbz(String asjbh);
+
+    int updateAsjbz(TbStAsj tbStAsj);
+
+    List<TbStAsj> selectAsjBybz(TbStAsj tbStAsj);
+    List<TbStAsj> selectAsjBybzList(TbStAsj tbStAsj);
+    Integer selectAsjBybzCount(TbStAsj tbStAsj);
+
+
+    List<TbStAsj> selectAsjBybzNO(TbStAsj tbStAsj);
+
+    Integer selectAsjBybzCountNO(TbStAsj tbStAsj);
+
+    int updateStAsjbz();
+    int updateAsjbzAll();
+    int updateAsjTime();
+
+    List<TbStAsj> selectAjtztq(TbStAsj tbStAsj);
+    Integer selectAjtztqCount(TbStAsj tbStAsj);
+
+    List<TbStAsj> selectAsj(TbStAsj tbStAsj);
+    int insertAsjTime(TbStAsj tbStAsjs);
+}

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

+package com.founder.publicapi.service.serviceimpl;
+
+
+
+import com.founder.commonutils.model.ypglEntity.Asjbz;
+import com.founder.publicapi.mapper.mysqlMapper.AsjbzKeyMapper;
+import com.founder.publicapi.service.AsjbzService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class AsjbzServiceImpl implements AsjbzService {
+
+    @Autowired
+    private AsjbzKeyMapper asjbzKeyMapper;
+
+    @Override
+    public int addAsjbz(Asjbz asjbz) {
+        return asjbzKeyMapper.addAsjbz(asjbz);
+    }
+
+    @Override
+    public List<Asjbz> selectAsjbz(Asjbz asjbz) {
+        return asjbzKeyMapper.selectAsjbz(asjbz);
+    }
+
+    @Override
+    public List<Asjbz> selectkey(String key) {
+        return asjbzKeyMapper.selectkey(key);
+    }
+
+    @Override
+    public int updateAsjbz(Asjbz asjbz) {
+        return asjbzKeyMapper.updateAsjbz(asjbz);
+    }
+}

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

@@ -117,6 +117,15 @@ public class DataStatisticsServiceImpl implements DataStatisticsService {
     // 发案公共类别处理
     public DataStatisticsParams getDataParams(DataStatisticsParams params) {
 
+        //不使用模型查询
+        if (params.getMxbh()==null || params.getMxbh()==""){
+            params.setAjztdm( String.join(",", params.getAjztdmList())); //实体设置侦察阶段代码
+            params.setAjlbdm(String.join(",", params.getAjlbdmList()));//实体设置案件类别代码
+            params.setXzlb(String.join(",", params.getZatzJyqkList()));//实体设置小案类别代码
+            return params;
+
+        }
+        //直接使用模型去查询
         WaringVo waringVo = DetialBymxbh(params.getMxbh());
 
         if(StringUtils.isNotBlank(waringVo.getZcjddm())){

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

+package com.founder.publicapi.service.serviceimpl;
+
+
+import com.founder.commonutils.model.ypglEntity.DictItem;
+import com.founder.publicapi.mapper.mysqlMapper.IDictitemDao;
+import com.founder.publicapi.service.IDicItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class IDicItemServiceImpl implements IDicItemService {
+	@Autowired
+    IDictitemDao dicItemDao;
+
+
+
+
+
+    @Override
+    public String getCode(DictItem code) {
+        return dicItemDao.getCode(code);
+    }
+
+    @Override
+    public List<DictItem> getCodeAllByType(DictItem dictItem) {
+        return dicItemDao.findCodeAllByType(dictItem);
+    }
+
+
+    @Override
+    public List<DictItem> getCodeByName(DictItem dictItem) {
+        return dicItemDao.getCodeByName(dictItem);
+    }
+
+
+
+}
\ No newline at end of file

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

+package com.founder.publicapi.service.serviceimpl;
+
+
+import com.founder.commonutils.model.ypglEntity.Phone;
+import com.founder.publicapi.mapper.mysqlMapper.PhoneMapper;
+import com.founder.publicapi.service.PhoneService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+    *@ClassName: PhoneServiceImpl
+    *@Description TODO: 
+    *@Author: founder_fzy
+    *@Date: 2021/9/26 12:06
+    *@Version: 1.0
+**/
+@Service
+public class PhoneServiceImpl implements PhoneService {
+
+
+    @Autowired
+    private PhoneMapper phoneMapper;
+
+    @Override
+    public Phone selectPc(String phone) {
+        return phoneMapper.selectPc(phone);
+    }
+
+    @Override
+    public List<Phone> selectJzxx() {
+        return phoneMapper.selectJzxx();
+    }
+}

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

+package com.founder.publicapi.service.serviceimpl;
+
+
+import com.founder.commonutils.model.ypglEntity.Asjbz;
+import com.founder.commonutils.model.ypglEntity.TbXwAsjbzKeyword;
+import com.founder.commonutils.util.KeyUtil;
+import com.founder.commonutils.util.StringUtil;
+import com.founder.publicapi.mapper.mysqlMapper.TbXwAsjbzKeywordMapper;
+import com.founder.publicapi.service.TbXwAsjbzKeywordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+import java.util.List;
+
+@Service
+public class TbXwAsjbzKeywordServiceImpl implements TbXwAsjbzKeywordService {
+
+    @Autowired
+    private TbXwAsjbzKeywordMapper tbXwAsjbzKeywordMapper;
+
+    @Override
+    public List<TbXwAsjbzKeyword> selectTbXwAsjbzKeywordList(TbXwAsjbzKeyword tbXwAsjbzKeyword) {
+       return tbXwAsjbzKeywordMapper.selectTbXwAsjbzKeywordList(tbXwAsjbzKeyword);
+    }
+
+    @Override
+    public List<TbXwAsjbzKeyword> selectTbXwAsjbzList(TbXwAsjbzKeyword tbXwAsjbzKeyword) {
+        return tbXwAsjbzKeywordMapper.selectTbXwAsjbzList(tbXwAsjbzKeyword);
+    }
+
+    @Override
+    public List<TbXwAsjbzKeyword> selectTbXwAsjbzCount(TbXwAsjbzKeyword tbXwAsjbzKeyword) {
+        return tbXwAsjbzKeywordMapper.selectTbXwAsjbzCount(tbXwAsjbzKeyword);
+    }
+
+    @Override
+    public Integer selectTbXwAsjbzKeywordCount(TbXwAsjbzKeyword tbXwAsjbzKeyword) {
+        return tbXwAsjbzKeywordMapper.selectTbXwAsjbzKeywordCount(tbXwAsjbzKeyword);
+    }
+
+    @Override
+    public void saveTbXwAsjbzKeyword(TbXwAsjbzKeyword tbXwAsjbzKeyword) {
+        if(!StringUtil.isEmpty(tbXwAsjbzKeyword.getXxzjbh())){//修改
+            tbXwAsjbzKeywordMapper.updateTbXwAsjbzKeyword(tbXwAsjbzKeyword);
+        }else{
+            tbXwAsjbzKeyword.setXxzjbh(KeyUtil.getUUIDKey("AK"));
+            tbXwAsjbzKeywordMapper.insertTbXwAsjbzKeyword(tbXwAsjbzKeyword);
+        }
+    }
+
+    @Override
+    public int deleteTbXwAsjbzKeyword(TbXwAsjbzKeyword tbXwAsjbzKeyword) {
+        tbXwAsjbzKeyword.setXxsc_pdbz("1");
+        return tbXwAsjbzKeywordMapper.updateTbXwAsjbzKeyword(tbXwAsjbzKeyword);
+    }
+    @Override
+    public List<TbXwAsjbzKeyword> selectTbXwAsjbzKeywordByCondition(TbXwAsjbzKeyword tbXwAsjbzKeyword) {
+        List<TbXwAsjbzKeyword> list= tbXwAsjbzKeywordMapper.selectTbXwAsjbzKeywordByCondition(tbXwAsjbzKeyword);
+        return list;
+    }
+
+    @Override
+    public List<TbXwAsjbzKeyword> selectKEYWORD(TbXwAsjbzKeyword tbXwAsjbzKeyword) {
+        List<TbXwAsjbzKeyword> list= tbXwAsjbzKeywordMapper.selectKEYWORD(tbXwAsjbzKeyword);
+        return list;
+    }
+
+    @Override
+    public TbXwAsjbzKeyword selectkey(TbXwAsjbzKeyword tbXwAsjbzKeyword) {
+        return tbXwAsjbzKeywordMapper.selectkey(tbXwAsjbzKeyword);
+    }
+
+    @Override
+    public List<TbXwAsjbzKeyword> selectTbXwByKey(TbXwAsjbzKeyword tbXwAsjbzKeyword) {
+        return tbXwAsjbzKeywordMapper.selectTbXwByKey(tbXwAsjbzKeyword);
+    }
+
+    @Override
+    public String selectTbXwBySy(String synonyms) {
+        return tbXwAsjbzKeywordMapper.selectTbXwBySy(synonyms);
+    }
+
+    @Override
+    public List<String> selectTbXwBySyList(String synonyms) {
+        return tbXwAsjbzKeywordMapper.selectTbXwBySyList(synonyms);
+    }
+
+    @Override
+    public List<Asjbz> selectKeyList() {
+        return tbXwAsjbzKeywordMapper.selectKeyList();
+    }
+
+}

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

+package com.founder.publicapi.service.serviceimpl;
+
+
+import com.founder.commonutils.model.ypglEntity.AsjQygz;
+import com.founder.commonutils.model.ypglEntity.TbStAsj;
+import com.founder.publicapi.mapper.mysqlMapper.JqaqfxMapper;
+import com.founder.publicapi.mapper.mysqlMapper.YpglAsjMapper;
+import com.founder.publicapi.service.YpglAsjService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class YpglAsjServiceImpl implements YpglAsjService {
+
+    @Autowired
+    YpglAsjMapper YpglAsjMapper;
+    @Autowired
+    JqaqfxMapper jqaqfxMapper;
+
+    @Override
+    public List<AsjQygz> queryAsjxxToQygz(AsjQygz asjQygz) {
+        return YpglAsjMapper.queryAsjxxToQygz(asjQygz);
+    }
+
+
+    @Override
+    public List<AsjQygz> queryAsjxxByBhList(AsjQygz asjQygz) {
+        return YpglAsjMapper.queryAsjxxByBhList(asjQygz);
+    }
+
+    /**
+     * 根据指定条件获取案事件集合
+     *
+     * @param tbStAsj 参数实体
+     * @return
+     */
+    @Override
+    public List<TbStAsj> findAsjxxList(TbStAsj tbStAsj) {
+        return YpglAsjMapper.findAsjxxList(tbStAsj);
+    }
+
+    @Override
+    public List<TbStAsj> findAsjxxListFy(TbStAsj tbStAsj) {
+        return YpglAsjMapper.findAsjxxListFy(tbStAsj);
+    }
+
+    @Override
+    public int findAsjxxCount() {
+        return YpglAsjMapper.findAsjxxCount();
+    }
+
+    @Override
+    public int selectBzCount() {
+        return YpglAsjMapper.selectBzCount();
+    }
+
+    @Override
+    public int deletebz() {
+        return YpglAsjMapper.deletebz();
+    }
+
+    @Override
+    public int insertAsjbz(TbStAsj tbStAsj) {
+        return YpglAsjMapper.insertAsjbz(tbStAsj);
+    }
+
+    @Override
+    public int insertAsjbzAll(TbStAsj tbStAsj) {
+        return YpglAsjMapper.insertAsjbzAll(tbStAsj);
+    }
+
+    @Override
+    public TbStAsj selectAsjbz(String asjbh) {
+        return YpglAsjMapper.selectAsjbz(asjbh);
+    }
+
+    @Override
+    public int updateAsjbz(TbStAsj tbStAsj) {
+        return YpglAsjMapper.updateAsjbz(tbStAsj);
+    }
+
+    @Override
+    public List<TbStAsj> selectAsjBybz(TbStAsj tbStAsj) {
+        return YpglAsjMapper.selectAsjBybz(tbStAsj);
+    }
+
+    @Override
+    public List<TbStAsj> selectAsjBybzList(TbStAsj tbStAsj) {
+        return YpglAsjMapper.selectAsjBybzList(tbStAsj);
+    }
+
+    @Override
+    public Integer selectAsjBybzCount(TbStAsj tbStAsj) {
+        return YpglAsjMapper.selectAsjBybzCount(tbStAsj);
+    }
+
+    @Override
+    public List<TbStAsj> selectAsjBybzNO(TbStAsj tbStAsj) {
+        return YpglAsjMapper.selectAsjBybzNO(tbStAsj);
+    }
+
+    @Override
+    public Integer selectAsjBybzCountNO(TbStAsj tbStAsj) {
+        return YpglAsjMapper.selectAsjBybzCountNO(tbStAsj);
+    }
+
+    @Override
+    public int updateStAsjbz() {
+        return YpglAsjMapper.updateStAsjbz();
+    }
+
+    @Override
+    public int updateAsjbzAll() {
+        return YpglAsjMapper.updateAsjbzAll();
+    }
+
+    @Override
+    public int updateAsjTime() {
+        return YpglAsjMapper.updateAsjTime();
+    }
+
+    @Override
+    public List<TbStAsj> selectAjtztq(TbStAsj tbStAsj) {
+        return YpglAsjMapper.selectAjtztq(tbStAsj);
+    }
+
+    @Override
+    public Integer selectAjtztqCount(TbStAsj tbStAsj) {
+        return YpglAsjMapper.selectAjtztqCount(tbStAsj);
+    }
+
+    @Override
+    public List<TbStAsj> selectAsj(TbStAsj tbStAsj) {
+        return YpglAsjMapper.selectAsj(tbStAsj);
+    }
+
+    @Override
+    public int insertAsjTime(TbStAsj tbStAsjs) {
+        return YpglAsjMapper.insertAsjTime(tbStAsjs);
+    }
+
+    /**
+     * 获取最大登记时间
+     * @param days  减的天数
+     * @return
+     */
+    @Override
+    public String getAjtztqMaxDjsj(int days){
+        return jqaqfxMapper.getAjtztqMaxDjsj(days);
+    }
+
+}

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

@@ -13,6 +13,7 @@ import com.founder.publicapi.mapper.mysqlMapper.TbStAsjMapper;
 import com.founder.publicapi.mapper.mysqlMapper.TbStZtypFwbshMapper;
 import com.founder.publicapi.mapper.mysqlMapper.ZtypMapper;
 import com.founder.publicapi.service.ZtypService;
+import com.founder.servicebase.service.KshService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

service/publicapi/src/main/resources/bootstrap-dev.properties

@@ -19,13 +19,22 @@ spring.datasource.xzxtdb.password=ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
 spring.datasource.xzxtdb.type=com.alibaba.druid.pool.DruidDataSource
 
 #oracle?????????(?????)
-spring.datasource.qgdb.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.qgdb.url=ENC(T0NmBjW9iRM92xTRkj5iTWDkIMeqdHcsi2nsP6Ro6bYDNwGVDGDCqtpZrxg9SYL3RlpDyIvbS5R2uXxn702du4YNbolcvEbEWL+QCeJN7mwldnIHfF1xr7e/2TuD1QnlMg/Hhi9xBGymzDb0T2wdoT954YtUwhIa8eJQ5E6QAGk=)
 #spring.datasource.qgdb.username=ENC(x4Dk5STviTUvoo3r+p7cFQ==)
 #spring.datasource.qgdb.password=ENC(tVUXCj15Zc7cT5Jpz5LRKg==)
-spring.datasource.qgdb.url=ENC(Y1dXm7lJCGbPffW6Pbg/Uid1UK2Z1Tu2TNdp9AgqT/iXb4hNRriak+glPXYD6BnO4fQwN9Sj/zguByboO4FagHEQRN0tE57RI6rJEUeTt2JHb1rc2BG1wE9QPK96E5o9K/1TSAjnD/Rr2eAxy11tFLL2fQP35EOX)
-spring.datasource.qgdb.username=ENC(e7qsvm7EnrdHG04YnaTMsw==)
-spring.datasource.qgdb.password=ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
+#spring.datasource.qgdb.driver-class-name=com.mysql.cj.jdbc.Driver
+#spring.datasource.qgdb.url=ENC(Y1dXm7lJCGbPffW6Pbg/Uid1UK2Z1Tu2TNdp9AgqT/iXb4hNRriak+glPXYD6BnO4fQwN9Sj/zguByboO4FagHEQRN0tE57RI6rJEUeTt2JHb1rc2BG1wE9QPK96E5o9K/1TSAjnD/Rr2eAxy11tFLL2fQP35EOX)
+#spring.datasource.qgdb.username=ENC(e7qsvm7EnrdHG04YnaTMsw==)
+#spring.datasource.qgdb.password=ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
+
+spring.datasource.qgdb.driver-class-name=oracle.jdbc.driver.OracleDriver
+spring.datasource.qgdb.url=ENC(F3NAnTcXK25hW/eX14Rtsc6JvW/9OkDow5JUKCxhR5sMFzFWu3Fwy81nFThMzsTybNi9QMGSsAlW012Kx9SKe5t9ALanqy2EU+Rw+KMARsSv2Kak7iACTCqCAmykUIhXuRNS10/w78A5xTtJjmX5GOmxmdDeKRXLTN6ewTPPdEI=)
+spring.datasource.qgdb.username=ENC(6HETvo6SL1DaIiCsXkT4cA==)
+spring.datasource.qgdb.password=ENC(MYNgdGJQeAkfylGgcxEbmMf0Wb76TNiZ)
+
+#spring.datasource.qgdb.url=jdbc:oracle:thin:@//47.92.48.137:15212/XZXT?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+#spring.datasource.qgdb.username=XZXT
+#spring.datasource.qgdb.password=XzxtPwdAly#00
 spring.datasource.qgdb.type=com.alibaba.druid.pool.DruidDataSource
 
 #redis