调整架构代码,Oracle环境,侦查专项、协查任务等代码1.0版本

common/common_utils/src/main/java/com/founder/commonutils/model/BaseDto.java

+package com.founder.commonutils.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author Godffy
+ * @create 2023-06-06 10:49
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BaseDto implements Serializable {
+
+    /**
+     * 页码 默认1
+     */
+    private Integer pageNum = 1;
+    /**
+     * 每页显示条数 默认10
+     */
+    private Integer pageSize = 10;
+
+    /**
+     * 开始时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date beginTime;
+
+    /**
+     * 结束时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+}

common/common_utils/src/main/java/com/founder/commonutils/model/PageSimpleVO.java

+package com.founder.commonutils.model;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Godffy
+ * @create 2023-06-08 10:54
+ */
+@Data
+public class PageSimpleVO<T> {
+    //当前页
+    private Long current;
+    //总数
+    private Long total;
+    // 列表
+    private List<T> records;
+    //其他数据
+    private Map<String, Object> map;
+
+    public PageSimpleVO() {
+
+    }
+
+    public PageSimpleVO(Long totalNumber, List<T> list) {
+        this.total = totalNumber;
+        this.records = list;
+    }
+
+    public PageSimpleVO(Long totalNumber, List<T> list, Map<String, Object> map) {
+        this.total = totalNumber;
+        this.records = list;
+        this.map = map;
+    }
+
+    public PageSimpleVO(Long currentPage, Long totalNumber, List<T> list) {
+        this.current = currentPage;
+        this.total = totalNumber;
+        this.records = list;
+    }
+
+}

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

@@ -24,8 +24,8 @@ import java.util.Date;
 @TableName("sk_interceptor")
 @ApiModel(value="(sk_interceptor)表实体类", description="拦截器信息表")
 public class SkInterceptor extends Model<SkInterceptor> {
-    @TableId(type = IdType.INPUT)
 
+    @TableId(type = IdType.INPUT)
     @ApiModelProperty(value = "主键id")
     private String id;
 

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

@@ -2,7 +2,6 @@ package com.founder.commonutils.model.newPublicEntity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -132,14 +131,26 @@ public class SysUser extends Model<SysUser> {
     @ApiModelProperty(value = "特权用户判断标志 00：否 01：是")
     private String tqyhbz;
 
-    private String jgzPhotoZm;
+    @ApiModelProperty(value = "值班中心单位代码（株洲）")
+    private String zbzxDwdm;
 
-    private String jgzPhotoFm;
+    @ApiModelProperty(value = "网警是否能够查看全市交案人判断标志  0-不能查看  1-能够查看")
+    private String wjFlag;
 
-    private String zbzxDwdm;
+    @ApiModelProperty(value = "是否为网警交案人")
+    private String wjjaFlag;
+
+    @ApiModelProperty(value = "电诈劝阻角色，1是分局负责人，2是市局负责人，0是核查民警")
+    private String qzRole;
+
+    @ApiModelProperty(value = "侦查组织选择警员 空-存在 0-不存在")
+    private String zczzRole;
 
-    private String grdf;
+    @ApiModelProperty(value = "借调单位代码")
+    private String jddwcode;
 
+    @ApiModelProperty(value = "借调单位名称")
+    private String jddwname;
 
     /**
      * 获取主键值

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

+package com.founder.commonutils.model.zczxEntity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Godffy
+ * @create 2023-06-06 10:08
+ */
+@Data
+@TableName("tb_st_asj")
+@ApiModel(value = "智侦案事件(tb_st_asj)表实体类",description = "")
+public class TbStAsj extends Model<TbStAsj> {
+
+    @TableId(type = IdType.INPUT)
+    @ApiModelProperty(value = "案事件编号")
+    private String asjbh;
+
+    @ApiModelProperty(value = "案件名称")
+    private String ajmc;
+
+    @ApiModelProperty(value = "案事件发生时间_案事件发生开始时间")
+    private Date asjfssjAsjfskssj;
+
+    @ApiModelProperty(value = "案事件简要情况")
+    @TableField(value = "jyaq")
+    private String asjJyqk;
+
+}

common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/TbStAsjJq.java

+package com.founder.commonutils.model.zczxEntity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Godffy
+ * @create 2023-06-06 10:08
+ */
+@Data
+@TableName("tb_xw_asj_110jq")
+@ApiModel(value = "智侦110案事件警情(tb_xw_asj_110jq)表实体类",description = "")
+public class TbStAsjJq extends Model<TbStAsjJq> {
+
+    @TableId(type = IdType.INPUT)
+    @ApiModelProperty(value = "接警单编号")
+    private String jjdbh;
+
+    @ApiModelProperty(value = "报警内容")
+    @TableField(value = "bjnr")
+    private String jqJyqk;
+
+}

common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/TbStYq.java

+package com.founder.commonutils.model.zczxEntity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Godffy
+ * @create 2023-06-06 10:08
+ */
+@Data
+@TableName("tb_st_yq")
+@ApiModel(value = "智侦要情(tb_st_yq)表实体类",description = "")
+public class TbStYq extends Model<TbStYq> {
+
+    @TableId(value = "infoid",type = IdType.INPUT)
+    @ApiModelProperty(value = "要情编号")
+    private String yqbh;
+
+    @ApiModelProperty(value = "要情标题")
+    @TableField(value = "title")
+    private String yqmc;
+
+    @ApiModelProperty(value = "要情简要情况")
+    @TableField(value = "content")
+    private String yqJyqk;
+
+}

common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Xcrw.java

+package com.founder.commonutils.model.zczxEntity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Godffy
+ * @create 2023-06-09 16:48
+ */
+@Data
+@TableName("tb_wh_xcrw")
+@ApiModel(value = "协查任务(tb_wh_xcrw)表实体类",description = "")
+public class Xcrw extends Model<Xcrw> {
+
+    @TableId(type = IdType.INPUT)
+    @ApiModelProperty(value = "协查任务编号")
+    private String xcrwbh;
+
+    @ApiModelProperty(value = "协查任务名称")
+    private String xcrwmc;
+
+    @TableField(exist = false)
+    private List<XcrwFile> xcrwSqd;
+
+    @TableField(exist = false)
+    private List<XcrwFile> xcrwFkd;
+
+    @ApiModelProperty(value = "专项编号")
+    private String zxbh;
+
+    @ApiModelProperty(value = "专项名称")
+    private String zxmc;
+
+    @ApiModelProperty(value = "协查任务类型")
+    private String xcrwlx;
+
+    @ApiModelProperty(value = "协查任务开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date xcrwkssj;
+
+    @ApiModelProperty(value = "协查任务结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date xcrwjssj;
+
+    @ApiModelProperty(value = "协查任务创建人警号")
+    private String xcrwcjrjh;
+
+    @ApiModelProperty(value = "协查任务创建人联系电话")
+    private String xcrwcjrlxdh;
+
+    @ApiModelProperty(value = "协查任务创建人身份证号")
+    private String xcrwcjrsfzh;
+
+    @ApiModelProperty(value = "协查任务创建人单位代码")
+    private String xcrwcjrdwdm;
+
+    @ApiModelProperty(value = "协查任务创建人单位名称")
+    private String xcrwcjrdwmc;
+
+    @ApiModelProperty(value = "信息删除_判断标志")
+    private String xxscPdbz;
+
+    @ApiModelProperty(value = "协查任务接收人（机构账号作为用户名存用户表）")
+    private String xcrwjsr;
+
+    @ApiModelProperty(value = "协查任务接收人单位代码")
+    private String xcrwjsrdwdm;
+
+    @ApiModelProperty(value = "协查任务接收人单位名称")
+    private String xcrwjsrdwmc;
+
+    @ApiModelProperty(value = "协查任务反馈人单位代码")
+    private String xcrwfkrdwdm;
+
+    @ApiModelProperty(value = "协查任务反馈人单位名称")
+    private String xcrwfkrdwmc;
+
+    @ApiModelProperty(value = "协查任务流转时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date xcrwlzsj;
+
+    @ApiModelProperty(value = "协查任务反馈时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date xcrwfksj;
+
+    @ApiModelProperty(value = "协查任务_审批状态")
+    private String xcrwSpzt;
+
+    @ApiModelProperty(value = "协查任务_超时状态")
+    private String xcrwCszt;
+
+    @ApiModelProperty(value = "案事件编号")
+    private String asjbh;
+
+    @ApiModelProperty(value = "案件名称")
+    private String ajmc;
+
+    @ApiModelProperty(value = "案件类别代码")
+    private String ajlbdm;
+
+    @ApiModelProperty(value = "警情编号")
+    private String jqbh;
+
+    @ApiModelProperty(value = "要情编号")
+    private String yqbh;
+
+    @ApiModelProperty(value = "协查任务反馈状态")
+    private String xcrwFkzt;
+
+    @ApiModelProperty(value = "协查任务审批人警号")
+    private String xcrwsprjh;
+
+    @ApiModelProperty(value = "协查任务审批人姓名")
+    private String xcrwsprxm;
+
+    @ApiModelProperty(value = "协查任务审批人单位代码")
+    private String xcrwsprdwdm;
+
+    @ApiModelProperty(value = "协查任务审批人单位名称")
+    private String xcrwsprdwmc;
+
+    @ApiModelProperty(value = "协查任务简要情况")
+    private String xcrwJyqk;
+
+    @ApiModelProperty(value = "协查任务侦查措施")
+    private String xcrwZccs;
+
+    @ApiModelProperty(value = "协查任务协查需求")
+    private String xcrwXcxq;
+
+    @ApiModelProperty(value = "协查任务备注")
+    private String xcrwBz;
+
+    @ApiModelProperty(value = "协查任务_反馈信息")
+    private String xcrwFkxx;
+
+    @ApiModelProperty(value = "协查任务创建人姓名")
+    private String xcrwcjrxm;
+
+    @ApiModelProperty(value = "协查任务接收人姓名")
+    private String xcrwjsrxm;
+
+    @ApiModelProperty(value = "协查任务接收人身份证号")
+    private String xcrwjsrsfzh;
+
+    @ApiModelProperty(value = "协查任务接收人警号")
+    private String xcrwjsrjh;
+
+    @ApiModelProperty(value = "协查任务接收人账号")
+    private String xcrwjsrzh;
+
+    @ApiModelProperty(value = "协查任务接收人联系电话")
+    private String xcrwjsrlxdh;
+
+    @ApiModelProperty(value = "协查任务反馈人警号")
+    private String xcrwfkrjh;
+
+    @ApiModelProperty(value = "协查任务反馈人姓名")
+    private String xcrwfkrxm;
+
+    @ApiModelProperty(value = "协查任务反馈人联系电话")
+    private String xcrwfkrlxdh;
+
+    @ApiModelProperty(value = "协查任务退回状态")
+    private String xcrwThzt;
+
+    @ApiModelProperty(value = "协查任务_退回信息")
+    private String xcrwThxx;
+
+
+
+
+//    @ApiModelProperty(value = "协查任务_申请单_名字")
+//    private String xcrwSqdName;
+//
+//    @ApiModelProperty(value = "协查任务_申请单_字节数据")
+//    private byte[] xcrwSqdContent;
+//
+//    @ApiModelProperty(value = "协查任务_申请单_后缀")
+//    private String xcrwSqdEx;
+//
+//    @ApiModelProperty(value = "协查任务_申请单_大小")
+//    private String xcrwSqdSize;
+//
+//    @ApiModelProperty(value = "协查任务_反馈单_名字")
+//    private String xcrwFkdName;
+//
+//    @ApiModelProperty(value = "协查任务_反馈单_字节数据")
+//    private byte[] xcrwFkdContent;
+//
+//    @ApiModelProperty(value = "协查任务_反馈单_后缀")
+//    private String xcrwFkdEx;
+//
+//    @ApiModelProperty(value = "协查任务_反馈单_大小")
+//    private String xcrwFkdSize;
+
+
+}

common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/XcrwDto.java

+package com.founder.commonutils.model.zczxEntity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.founder.commonutils.model.BaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Date;
+
+/**
+ * @author Godffy
+ * @create 2023-06-09 16:48
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class XcrwDto extends BaseDto {
+
+    @TableId(type = IdType.INPUT)
+    @ApiModelProperty(value = "协查任务编号")
+    private String xcrwbh;
+
+    @ApiModelProperty(value = "协查任务名称")
+    private String xcrwmc;
+
+    @ApiModelProperty(value = "专项编号")
+    private String zxbh;
+
+    @ApiModelProperty(value = "专项名称")
+    private String zxmc;
+
+    @ApiModelProperty(value = "协查任务类型")
+    private String xcrwlx;
+
+    @ApiModelProperty(value = "协查任务开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date xcrwkssj;
+
+    @ApiModelProperty(value = "协查任务开始时间开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date xcrwkssjKssj;
+
+    @ApiModelProperty(value = "协查任务开始时间结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date xcrwkssjJssj;
+
+    @ApiModelProperty(value = "协查任务结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date xcrwjssj;
+
+    @ApiModelProperty(value = "协查任务创建人警号")
+    private String xcrwcjrjh;
+
+    @ApiModelProperty(value = "协查任务创建人联系电话")
+    private String xcrwcjrlxdh;
+
+    @ApiModelProperty(value = "协查任务创建人身份证号")
+    private String xcrwcjrsfzh;
+
+    @ApiModelProperty(value = "协查任务创建人单位代码")
+    private String xcrwcjrdwdm;
+
+    @ApiModelProperty(value = "协查任务创建人单位名称")
+    private String xcrwcjrdwmc;
+
+    @ApiModelProperty(value = "协查任务接收人（机构账号作为用户名存用户表）")
+    private String xcrwjsr;
+
+    @ApiModelProperty(value = "协查任务接收人姓名")
+    private String xcrwjsrxm;
+
+    @ApiModelProperty(value = "协查任务接收人身份证号")
+    private String xcrwjsrsfzh;
+
+    @ApiModelProperty(value = "协查任务接收人警号")
+    private String xcrwjsrjh;
+
+    @ApiModelProperty(value = "协查任务接收人账号")
+    private String xcrwjsrzh;
+
+    @ApiModelProperty(value = "协查任务接收人联系电话")
+    private String xcrwjsrlxdh;
+
+    @ApiModelProperty(value = "协查任务接收人单位代码")
+    private String xcrwjsrdwdm;
+
+    @ApiModelProperty(value = "协查任务接收人单位名称")
+    private String xcrwjsrdwmc;
+
+    @ApiModelProperty(value = "协查任务反馈人单位代码")
+    private String xcrwfkrdwdm;
+
+    @ApiModelProperty(value = "协查任务反馈人单位名称")
+    private String xcrwfkrdwmc;
+
+    @ApiModelProperty(value = "协查任务流转时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date xcrwlzsj;
+
+    @ApiModelProperty(value = "协查任务反馈时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date xcrwfksj;
+
+    @ApiModelProperty(value = "协查任务_审批状态")
+    private String xcrwSpzt;
+
+    @ApiModelProperty(value = "协查任务_超时状态")
+    private String xcrwCszt;
+
+    @ApiModelProperty(value = "案事件编号")
+    private String asjbh;
+
+    @ApiModelProperty(value = "案件名称")
+    private String asjmc;
+
+    @ApiModelProperty(value = "案件类别代码")
+    private String ajlbdm;
+
+    @ApiModelProperty(value = "警情编号")
+    private String jqbh;
+
+    @ApiModelProperty(value = "要情编号")
+    private String yqbh;
+
+    @ApiModelProperty(value = "协查任务反馈状态")
+    private String xcrwFkzt;
+
+    @ApiModelProperty(value = "协查任务审批人警号")
+    private String xcrwsprjh;
+
+    @ApiModelProperty(value = "协查任务审批人姓名")
+    private String xcrwsprxm;
+
+    @ApiModelProperty(value = "协查任务审批人单位代码")
+    private String xcrwsprdwdm;
+
+    @ApiModelProperty(value = "协查任务审批人单位名称")
+    private String xcrwsprdwmc;
+
+    @ApiModelProperty(value = "文件名")
+    private String fileName;
+
+    @ApiModelProperty(value = "文件字节数据")
+    private byte[] fileContent;
+
+    @ApiModelProperty(value = "文件后缀")
+    private String fileEx;
+
+    @ApiModelProperty(value = "文件大小")
+    private String fileSize;
+
+    @ApiModelProperty(value = "文件类型,1：协查任务申请单，2：协查任务反馈单")
+    private String fileType;
+
+    @ApiModelProperty(value = "文件")
+    private MultipartFile file;
+
+    @ApiModelProperty(value = "协查任务简要情况")
+    private String xcrwJyqk;
+
+    @ApiModelProperty(value = "协查任务侦查措施")
+    private String xcrwZccs;
+
+    @ApiModelProperty(value = "协查任务协查需求")
+    private String xcrwXcxq;
+
+    @ApiModelProperty(value = "协查任务备注")
+    private String xcrwBz;
+
+    @ApiModelProperty(value = "协查任务_反馈信息")
+    private String xcrwFkxx;
+
+    @ApiModelProperty(value = "协查任务创建人姓名")
+    private String xcrwcjrxm;
+
+
+
+    @ApiModelProperty(value = "协查任务反馈人警号")
+    private String xcrwfkrjh;
+
+    @ApiModelProperty(value = "协查任务反馈人姓名")
+    private String xcrwfkrxm;
+
+    @ApiModelProperty(value = "协查任务反馈人联系电话")
+    private String xcrwfkrlxdh;
+
+    @ApiModelProperty(value = "协查任务退回状态")
+    private String xcrwThzt;
+
+    @ApiModelProperty(value = "协查任务_退回信息")
+    private String xcrwThxx;
+}

common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/XcrwFile.java

+package com.founder.commonutils.model.zczxEntity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Godffy
+ * @create 2023-06-12 09:48
+ */
+@Data
+@TableName("tb_wh_xcrw_file")
+@ApiModel(value = "协查任务文件(tb_wh_xcrw_file)表实体类",description = "")
+public class XcrwFile extends Model<XcrwFile> {
+
+    @TableId(type = IdType.INPUT)
+    @ApiModelProperty(value = "协查任务文件编号")
+    private String id;
+
+    @ApiModelProperty(value = "协查任务编号")
+    private String xcrwbh;
+
+    @ApiModelProperty(value = "文件名")
+    private String fileName;
+
+    @ApiModelProperty(value = "文件字节数据")
+    private byte[] fileContent;
+
+    @ApiModelProperty(value = "文件后缀")
+    private String fileEx;
+
+    @ApiModelProperty(value = "文件大小")
+    private long fileSize;
+
+    @ApiModelProperty(value = "信息删除判断标志")
+    private String xxscPdbz;
+
+    @ApiModelProperty(value = "文件类型,1：协查任务申请单，2：协查任务反馈单")
+    private String fileType;
+
+}

common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/XcrwFileDto.java

+package com.founder.commonutils.model.zczxEntity;
+
+import com.founder.commonutils.model.BaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.Serializable;
+
+/**
+ * @author Godffy
+ * @create 2023-06-12 09:48
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class XcrwFileDto extends BaseDto implements Serializable {
+
+    @ApiModelProperty(value = "协查任务文件编号")
+    private String id;
+
+    @ApiModelProperty(value = "文件")
+    private MultipartFile file;
+
+    @ApiModelProperty(value = "协查任务编号")
+    private String xcrwbh;
+
+    @ApiModelProperty(value = "文件名")
+    private String fileName;
+
+    @ApiModelProperty(value = "文件字节数据")
+    private byte[] fileContent;
+
+    @ApiModelProperty(value = "文件后缀")
+    private String fileEx;
+
+    @ApiModelProperty(value = "文件大小")
+    private long fileSize;
+
+    @ApiModelProperty(value = "信息删除判断标志")
+    private String xxscPdbz;
+
+    @ApiModelProperty(value = "文件类型,1：协查任务申请单，2：协查任务反馈单")
+    private String fileType;
+
+}

common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Zczx.java

+package com.founder.commonutils.model.zczxEntity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author Godffy
+ * @create 2023-06-06 10:08
+ */
+@Data
+@TableName("tb_wh_zczx")
+@ApiModel(value = "侦查专项(tb_wh_zczx)表实体类",description = "")
+public class Zczx extends Model<Zczx> {
+
+    @TableId(type = IdType.INPUT)
+    @ApiModelProperty(value = "侦查专项编号")
+    private String zxbh;
+
+    @ApiModelProperty(value = "侦查专项名称")
+    private String zxmc;
+
+    @ApiModelProperty(value = "侦查专项来源说明")
+    private String zxlysm;
+
+    @ApiModelProperty(value = "侦查专项开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zxkssj;
+
+    @ApiModelProperty(value = "侦查专项结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zxjssj;
+
+    @ApiModelProperty(value = "侦查专项创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zxcjsj;
+
+    @ApiModelProperty(value = "侦查专项创建单位代码")
+    private String zxcjdwdm;
+
+    @ApiModelProperty(value = "侦查专项创建单位名称")
+    private String zxcjdwmc;
+
+    @ApiModelProperty(value = "侦查专项创建人")
+    private String zxcjr;
+
+    @ApiModelProperty(value = "侦查专项创建人警号")
+    private String zxcjrjh;
+
+    @ApiModelProperty(value = "案件编号")
+    private String asjbh;
+
+    @ApiModelProperty(value = "案件名称")
+    private String ajmc;
+
+    @ApiModelProperty(value = "案事件简要情况")
+    private String asjJyqk;
+
+    @ApiModelProperty(value = "警情编号")
+    private String jqbh;
+
+//    @ApiModelProperty(value = "警情名称")
+//    private String jqmc;
+
+    @ApiModelProperty(value = "警情简要情况")
+    private String jqJyqk;
+
+    //未添加
+    @ApiModelProperty(value = "要情编号")
+    private String yqbh;
+
+    //未添加
+    @ApiModelProperty(value = "要情名称")
+    private String yqmc;
+
+    //未添加
+    @ApiModelProperty(value = "要情简要情况")
+    private String yqJyqk;
+
+    @ApiModelProperty(value = "是否抓捕_判断标志")
+    private String sfzbPdbz;
+
+    @ApiModelProperty(value = "是否图侦_判断标志")
+    private String sftzPdbz;
+
+    @ApiModelProperty(value = "是否串并案_判断标志")
+    private String sfcbaPdbz;
+
+    @ApiModelProperty(value = "是否发起市局情报网合_判断标志")
+    private String sffqsjqbwhPdbz;
+
+    @ApiModelProperty(value = "是否发起市局网警网合_判断标志")
+    private String sffqsjwjwhPdbz;
+
+    @ApiModelProperty(value = "是否发起分局网合_判断标志")
+    private String sffqfjwhPdbz;
+
+    @ApiModelProperty(value = "是否发起其他协查_判断标志")
+    private String sffqqtxcPdbz;
+
+    @ApiModelProperty(value = "更新时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date gxsj;
+
+    @ApiModelProperty(value = "信息删除_判断标志")
+    private String xxscPdbz;
+
+    @ApiModelProperty(value = "是否刑技_判断标志")
+    private String sfxjPdbz;
+
+    @ApiModelProperty(value = "市局情报网合编号")
+    private String sjqbwhbh;
+
+    @ApiModelProperty(value = "市局网警网合编号")
+    private String sjwjwhbh;
+
+    @ApiModelProperty(value = "是否发起技侦研判_判断标志")
+    private String sffqjzypPdbz;
+
+    @ApiModelProperty(value = "技侦研判编号")
+    private String jzypbh;
+
+    @ApiModelProperty(value = "分局网合编号")
+    private String fjwhbh;
+
+    @ApiModelProperty(value = "其他协查编号")
+    private String qtxcbh;
+
+    @ApiModelProperty(value = "案事件发生时间_案事件发生开始时间")
+    private Date asjfssjAsjfskssj;
+
+    @ApiModelProperty(value = "角色Id")
+    @TableField(exist = false)
+    private String roleId;
+
+    @ApiModelProperty(value = "角色名")
+    @TableField(exist = false)
+    private String roleName;
+
+    @ApiModelProperty(value = "侦查专项_参与状态")
+    @TableField(exist = false)
+    private String zczxCyzt;
+
+    @ApiModelProperty(value = "侦查专项_收藏状态")
+    @TableField(exist = false)
+    private String zczxSczt;
+
+}

common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxDto.java

+package com.founder.commonutils.model.zczxEntity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.founder.commonutils.model.BaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author Godffy
+ * @create 2023-06-06 10:08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ZczxDto extends BaseDto {
+
+    @ApiModelProperty(value = "侦查专项编号")
+    private String zxbh;
+
+    @ApiModelProperty(value = "侦查专项名称")
+    private String zxmc;
+
+    @ApiModelProperty(value = "侦查专项来源说明")
+    private String zxlysm;
+
+    @ApiModelProperty(value = "侦查专项开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date zxkssj;
+
+    @ApiModelProperty(value = "侦查专项开始时间开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date zxkssjKssj;
+
+    @ApiModelProperty(value = "侦查专项开始时间结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date zxkssjJssj;
+
+    @ApiModelProperty(value = "侦查专项结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date zxjssj;
+
+    @ApiModelProperty(value = "侦查专项创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date zxcjsj;
+
+    @ApiModelProperty(value = "侦查专项创建时间开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date zxcjsjKssj;
+
+    @ApiModelProperty(value = "侦查专项创建时间结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date zxcjsjJssj;
+
+    @ApiModelProperty(value = "侦查专项创建单位代码")
+    private String zxcjdwdm;
+
+    @ApiModelProperty(value = "侦查专项创建单位名称")
+    private String zxcjdwmc;
+
+    @ApiModelProperty(value = "侦查专项创建人")
+    private String zxcjr;
+
+    @ApiModelProperty(value = "侦查专项创建人警号")
+    private String zxcjrjh;
+
+    @ApiModelProperty(value = "案件编号")
+    private String asjbh;
+
+    @ApiModelProperty(value = "案件名称")
+    private String aj;
+
+    @ApiModelProperty(value = "案事件简要情况")
+    private String asjJyqk;
+
+    @ApiModelProperty(value = "警情编号")
+    private String jqbh;
+
+    @ApiModelProperty(value = "警情名称")
+    private String jqmc;
+
+    @ApiModelProperty(value = "警情简要情况")
+    private String jqJyqk;
+
+    @ApiModelProperty(value = "要情编号")
+    private String yqbh;
+
+    @ApiModelProperty(value = "要情名称")
+    private String yqmc;
+
+    @ApiModelProperty(value = "要情简要情况")
+    private String yqJyqk;
+
+    @ApiModelProperty(value = "是否抓捕_判断标志")
+    private String sfzbPdbz;
+
+    @ApiModelProperty(value = "是否图侦_判断标志")
+    private String sftzPdbz;
+
+    @ApiModelProperty(value = "是否串并案_判断标志")
+    private String sfcbaPdbz;
+
+    @ApiModelProperty(value = "是否发起市局情报网合_判断标志")
+    private String sffqsjqbwhPdbz;
+
+    @ApiModelProperty(value = "是否发起市局网警网合_判断标志")
+    private String sffqsjwjwhPdbz;
+
+    @ApiModelProperty(value = "是否发起分局网合_判断标志")
+    private String sffqfjwhPdbz;
+
+    @ApiModelProperty(value = "是否发起其他协查_判断标志")
+    private String sffqqtxcPdbz;
+
+    @ApiModelProperty(value = "更新时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date gxsj;
+
+    @ApiModelProperty(value = "是否刑技_判断标志")
+    private String sfxjPdbz;
+
+    @ApiModelProperty(value = "市局情报网合编号")
+    private String sjqbwhbh;
+
+    @ApiModelProperty(value = "市局网警网合编号")
+    private String sjwjwhbh;
+
+    @ApiModelProperty(value = "是否发起技侦研判_判断标志")
+    private String sffqjzypPdbz;
+
+    @ApiModelProperty(value = "技侦研判编号")
+    private String jzypbh;
+
+    @ApiModelProperty(value = "分局网合编号")
+    private String fjwhbh;
+
+    @ApiModelProperty(value = "其他协查编号")
+    private String qtxcbh;
+
+    @ApiModelProperty(value = "案事件发生时间_案事件发生开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date asjfssjAsjfskssj;
+
+    @ApiModelProperty(value = "案事件发生时间_案事件发生开始时间_开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date asjfssjAsjfskssjKssj;
+
+    @ApiModelProperty(value = "案事件发生时间_案事件发生开始时间_结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date asjfssjAsjfskssjJssj;
+
+    @ApiModelProperty(value = "侦查专项_参与状态")
+    private String zczxCyzt;
+
+    @ApiModelProperty(value = "侦查专项_收藏状态")
+    private String zczxSczt;
+
+    @ApiModelProperty(value = "专项登录人警号")
+    private String zxdlrjh;
+
+    /**
+     * 1：我参与的
+     * 2：全镇街的
+     * 3：我辖区的
+     * 4：我创建的
+     * 5：我收藏的
+     * 6：分享至本单位的
+     * 7：分享至本人的
+     */
+    @ApiModelProperty(value = "查询类型")
+    private String cxlx;
+
+    //用来查当前登陆的账号,能看到哪些侦查专项
+    @ApiModelProperty(value = "单位代码")
+    private String unitcode;
+
+    //分享的指定单位代码
+    @ApiModelProperty(value = "单位代码")
+    private String targetUnitCode;
+
+
+}

common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxRole.java

+package com.founder.commonutils.model.zczxEntity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Godffy
+ * @create 2023-06-16 10:28
+ */
+@Data
+@TableName("TB_WH_ZCZX_ROLE")
+@ApiModel(value = "侦查专项角色(TB_WH_ZCZX_ROLE)表实体类",description = "")
+public class ZczxRole extends Model<ZczxRole> {
+
+    @TableId(type = IdType.INPUT)
+    @ApiModelProperty(value = "侦查专项角色主键")
+    private String id;
+
+    @ApiModelProperty(value = "专项编号")
+    private String zxbh;
+
+    @ApiModelProperty(value = "警号")
+    private String policemanid;
+
+    /**
+     * 1：侦查员
+     * 2：图侦员
+     * 3：技侦联络员
+     * 4：网警联络员
+     * 5：指挥联络员
+     * 6：情报员
+     */
+    @ApiModelProperty(value = "角色ID")
+    private String roleId;
+
+    @ApiModelProperty(value = "角色名字")
+    private String roleName;
+
+    @ApiModelProperty(value = "侦查专项_参与状态")
+    private String zczxCyzt;
+
+    @ApiModelProperty(value = "侦查专项_收藏状态")
+    private String zczxSczt;
+
+    @ApiModelProperty(value = "机构代码")
+    private String unitcode;
+
+    @ApiModelProperty(value = "机构名称")
+    private String unitname;
+
+}

common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxRoleDto.java

+package com.founder.commonutils.model.zczxEntity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.founder.commonutils.model.BaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author Godffy
+ * @create 2023-06-16 10:28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ZczxRoleDto extends BaseDto {
+
+    @TableId(type = IdType.INPUT)
+    @ApiModelProperty(value = "侦查专项角色主键")
+    private String id;
+
+    @ApiModelProperty(value = "专项编号")
+    private String zxbh;
+
+    @ApiModelProperty(value = "警号")
+    private String policemanid;
+
+    /**
+     * 1：侦查员
+     * 2：图侦员
+     * 3：技侦联络员
+     * 4：网警联络员
+     * 5：指挥联络员
+     * 6：情报员
+     */
+    @ApiModelProperty(value = "角色ID")
+    private String roleId;
+
+    @ApiModelProperty(value = "角色名字")
+    private String roleName;
+
+    @ApiModelProperty(value = "侦查专项_参与状态")
+    private String zczxCyzt;
+
+    @ApiModelProperty(value = "侦查专项_收藏状态")
+    private String zczxSczt;
+
+    @ApiModelProperty(value = "机构代码")
+    private String unitcode;
+
+    @ApiModelProperty(value = "机构名称")
+    private String unitname;
+
+    /**
+     * 1：我参与的
+     * 2：全镇街的
+     * 3：我辖区的
+     * 4：我创建的
+     * 5：我收藏的
+     * 6：分享至本单位的
+     * 7：分享至本人的
+     */
+    @ApiModelProperty(value = "查询类型")
+    private String cxlx;
+
+}

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

@@ -5,7 +5,6 @@ import org.apache.commons.codec.binary.Base64;
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
-import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -125,7 +124,7 @@ public class AesEncryptUtil {
      */
     public static void main(String args[]) throws Exception {
 
-        String test1 = "430000000000000000";
+        String test1 = "test_wh";
         String test =new String(test1.getBytes(),"UTF-8");
         String data = null;
         String key =  KEY;
@@ -137,6 +136,9 @@ public class AesEncryptUtil {
         String jiemi =desEncrypt(data, key, iv).trim();
         System.out.println("解密："+jiemi);
 
+//        String s = desEncrypt("90b9aa7e25f80cf4f64e990b78a9fc5ebd6cecad");
+//        System.out.println("解密："+s);
+
 
     }
 

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

@@ -67,8 +67,8 @@ public class Base64Util {
 	}
 
 	public static void main(String[] args) {
-		System.out.println(Base64Util.encode("0"));
-		System.out.println(Base64Util.decode("MA=="));
+		System.out.println(Base64Util.encode("123456"));
+		System.out.println(Base64Util.decode("MTIzNDU2"));
 
 	}
 

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

+package com.founder.commonutils.util;
+
+import java.util.Arrays;
+import java.util.HashMap;
+
+/**
+ * 设置HttpServletResponse contentType格式
+ * Created by Founder on 2017/3/29.
+ */
+public class ContentTypeUtil {
+
+    public final static HashMap<String, String> FILE_TYPE_MAP = new HashMap<>();
+
+    static{
+        FILE_TYPE_MAP.put("ffd8ff", "jpg"); //JPEG (jpg)
+        FILE_TYPE_MAP.put("89504e", "png"); //PNG (png)
+        FILE_TYPE_MAP.put("474946", "gif"); //GIF (gif)
+        FILE_TYPE_MAP.put("49492a", "tif"); //TIFF (tif)
+        FILE_TYPE_MAP.put("424d", "bmp"); //256色位图(bmp)
+        FILE_TYPE_MAP.put("414331", "dwg"); //CAD (dwg)
+        FILE_TYPE_MAP.put("3c2144", "html"); //HTML (html)
+        FILE_TYPE_MAP.put("3c2164", "htm"); //HTM (htm)
+        FILE_TYPE_MAP.put("48544d", "css"); //css
+        FILE_TYPE_MAP.put("696b2e", "js"); //js
+        FILE_TYPE_MAP.put("7b5c72", "rtf"); //Rich Text Format (rtf)
+        FILE_TYPE_MAP.put("384250", "psd"); //Photoshop (psd)
+        FILE_TYPE_MAP.put("46726f", "eml"); //Email [Outlook Express 6] (eml)
+        FILE_TYPE_MAP.put("d0cf11", "doc"); //MS Excel 注意：word、msi 和 excel的文件头一样
+        FILE_TYPE_MAP.put("d0cf11", "vsd"); //Visio 绘图
+        FILE_TYPE_MAP.put("537461", "mdb"); //MS Access (mdb)
+        FILE_TYPE_MAP.put("252150", "ps");
+        FILE_TYPE_MAP.put("255044", "pdf"); //Adobe Acrobat (pdf)
+        FILE_TYPE_MAP.put("2e524d", "rmvb"); //rmvb/rm相同
+        FILE_TYPE_MAP.put("464c56", "flv"); //flv与f4v相同
+        FILE_TYPE_MAP.put("000000", "mp4");
+        FILE_TYPE_MAP.put("494433", "mp3");
+        FILE_TYPE_MAP.put("000001", "mpg"); //
+        FILE_TYPE_MAP.put("3026b2", "wmv"); //wmv与asf相同
+        FILE_TYPE_MAP.put("524946", "wav"); //Wave (wav)
+        FILE_TYPE_MAP.put("524946", "avi");
+        FILE_TYPE_MAP.put("4d5468", "mid"); //MIDI (mid)
+        FILE_TYPE_MAP.put("504b03", "zip");
+        FILE_TYPE_MAP.put("526172", "rar");
+        FILE_TYPE_MAP.put("235468", "ini");
+        FILE_TYPE_MAP.put("504b03", "jar");
+        FILE_TYPE_MAP.put("4d5a90", "exe");//可执行文件
+        FILE_TYPE_MAP.put("3c2540", "jsp");//jsp文件
+        FILE_TYPE_MAP.put("4d616e", "mf");//MF文件
+        FILE_TYPE_MAP.put("3c3f78", "xml");//xml文件
+        FILE_TYPE_MAP.put("494e53", "sql");//xml文件
+        FILE_TYPE_MAP.put("706163", "java");//java文件
+        FILE_TYPE_MAP.put("406563", "bat");//bat文件
+        FILE_TYPE_MAP.put("1f8b08", "gz");//gz文件
+        FILE_TYPE_MAP.put("6c6f67", "properties");//bat文件
+        FILE_TYPE_MAP.put("cafeba", "class");//bat文件
+        FILE_TYPE_MAP.put("495453", "chm");//bat文件
+        FILE_TYPE_MAP.put("040000", "mxp");//bat文件
+        FILE_TYPE_MAP.put("504b03", "docx");//docx文件
+        FILE_TYPE_MAP.put("d0cf11", "wps");//WPS文字wps、表格et、演示dps都是一样的
+        FILE_TYPE_MAP.put("643130", "torrent");
+        FILE_TYPE_MAP.put("6D6F6F", "mov"); //Quicktime (mov)
+        FILE_TYPE_MAP.put("FF5750", "wpd"); //WordPerfect (wpd)
+        FILE_TYPE_MAP.put("CFAD12", "dbx"); //Outlook Express (dbx)
+        FILE_TYPE_MAP.put("214244", "pst"); //Outlook (pst)
+        FILE_TYPE_MAP.put("AC9EBD", "qdf"); //Quicken (qdf)
+        FILE_TYPE_MAP.put("E38285", "pwl"); //Windows Password (pwl)
+        FILE_TYPE_MAP.put("2E7261", "ram"); //Real Audio (ram)
+    }
+
+    public static String bytesToHexString(byte[] src) {
+        StringBuilder stringBuilder = new StringBuilder();
+        if (src == null || src.length <= 0) {
+            return null;
+        }
+        for (int i = 0; i < src.length; i++) {
+            int v = src[i] & 0xFF;
+            String hv = Integer.toHexString(v);
+            if (hv.length() < 2) {
+                stringBuilder.append(0);
+            }
+            stringBuilder.append(hv);
+        }
+        return stringBuilder.toString();
+    }
+
+    public static String getFileType(byte[] fileContent){
+        String res = "";
+        byte[] b = Arrays.copyOf(fileContent,10);
+        String fileCode = bytesToHexString(b);
+        //这种方法在字典的头代码不够位数的时候可以用但是速度相对慢一点
+        for (String key : FILE_TYPE_MAP.keySet()) {
+            assert fileCode != null;
+            if (key.toLowerCase().startsWith(fileCode.toLowerCase()) || fileCode.toLowerCase().startsWith(key.toLowerCase())) {
+                res=FILE_TYPE_MAP.get(key);
+                break;
+            }
+        }
+
+        return res;
+    }
+
+  //获取contentType格式
+     public static  String  gettingContentType(byte[] fileContent){
+        return settingContentType(getFileType(fileContent));
+    }
+
+      private static  String settingContentType(String gs){
+          String type=null;
+          if(gs.equalsIgnoreCase( "doc")){
+              type="application/msword";
+          }else if(gs.equalsIgnoreCase( "xls")){
+              type="application/x-xls";
+          }
+          else if(gs.equalsIgnoreCase( "pdf")){
+              type="application/pdf";
+          }else if(gs.equalsIgnoreCase( "jpg")){
+              type="application/x-jpg";
+          }else if(gs.equalsIgnoreCase( "bmp")){
+              type="application/x-bmp";
+          }
+          else if(gs.equalsIgnoreCase( "png")){
+              type="application/x-png";
+          } else if(gs.equalsIgnoreCase( "ppt")){
+              type="application/x-ppt";
+          }else if(gs.equalsIgnoreCase( "zip")){
+              type="application/zip";
+          }else if(gs.equalsIgnoreCase( "gzip")){
+              type="application/gzip";
+          }
+          else{//其它格式,设置成未知名格式文件传输流。
+              type="application/octet-stream";
+          }
+
+
+        return  type;
+      }
+
+    //视频格式判断
+    public static boolean compareSpGs(String gs){
+        boolean flag=false;
+        if( gs.equals(".RM")
+                ||gs.equals(".RMVB")
+                ||gs.equals(".WMV")
+                ||gs.equals(".AVI")
+                ||gs.equals(".MP4")
+                ||gs.equals(".3GP")
+                ||gs.equals(".MKV")
+                ){
+            flag=true;
+        }
+        return  flag;
+    }
+
+
+
+
+}

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

@@ -115,4 +115,8 @@ public class DigestUtil extends org.springframework.util.DigestUtils {
 		return sha1(md5Hex(data));
 	}
 
+	public static void main(String[] args) {
+		System.out.println(encrypt("test_wh"));
+	}
+
 }

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

@@ -48,9 +48,29 @@ public class JasyptEncryptorUtils {
      * 测试
      */
     public static void main(String args[]) throws Exception {
-        String test1 = "123456";
+//        String test1 = "jdbc:oracle:thin:@68.174.25.89:1521:XZXT";
+//        encode(test1);
+
+//        String test1 = "XZXT";
+//        encode(test1);
+
+        String test1 = "XZXT#44";
         encode(test1);
-        decode(encode(test1));
+
+
+
+
+//        decode(encode(test1));
+
+//        encode("jdbc:mysql://47.92.48.137:3900/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai");
+//        encode("root");
+
+
+//        decode("Y1dXm7lJCGbPffW6Pbg/Uid1UK2Z1Tu2TNdp9AgqT/iXb4hNRriak+glPXYD6BnO4fQwN9Sj/zguByboO4FagHEQRN0tE57RI6rJEUeTt2JHb1rc2BG1wE9QPK96E5o9K/1TSAjnD/Rr2eAxy11tFLL2fQP35EOX");
+//        decode("e7qsvm7EnrdHG04YnaTMsw==");
+//        decode("XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn");
+
+
     }
 }
 

common/pom.xml

@@ -74,6 +74,12 @@
             <artifactId>transport</artifactId>
             <version>6.4.3</version>
         </dependency>
+        <!--配置数据库驱动-->
+        <dependency>
+            <groupId>org.oracle</groupId>
+            <artifactId>ojdbc6</artifactId>
+            <version>10</version>
+        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>

common/service_base/src/main/java/com/founder/servicebase/config/MybatisOracleDbConfig.java

@@ -11,11 +11,10 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
 
-@Configuration
+//@Configuration
 @MapperScan(basePackages = {"com.founder.*.mapper.oracleMapper"},
         sqlSessionTemplateRef = "oracleSqlTemplate")
 public class MybatisOracleDbConfig {

common/service_base/src/main/java/com/founder/servicebase/config/Swagger2Config.java

+package com.founder.servicebase.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.*;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.security.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+//@Configuration
+@EnableSwagger2
+public class Swagger2Config {
+    public static final String ASJBASE_PACKAGE = "com.founder.controller.AsjController";
+    //public static final String ZYBASE_PACKAGE ="com.founder.controller.ZyController";
+    public static final String ZYBASE_PACKAGE ="com.founder.controller.ResourceController";
+    public static final String SERVICEBASE_PACKAGE ="com.founder.controller.ServiceController";
+    public static final String WABASE_PACKAGE = "com.founder.controller.Wacontroller";
+    public static final String POIBASE_PACKAGE = "com.founder.controller.PoiController";
+    public static final String LOGBASE_PACKAGE = "com.founder.controller.LogController";
+    public static final String SYSTEMBASE_PACKAGE ="com.founder.controller.SystemController";
+    public static final String Zdry_PACKAGE ="com.founder.controller.ZdryController";
+    public static final String ES_RPACKAGE ="com.founder.controller.EsController";
+
+    @Value("${swagger.enable}")
+    private boolean enableSwagger;
+ /*   @Bean
+    public Docket AsjRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("案件服务")
+                .apiInfo(asjapiInfo())                // 生产环境的时候关闭 swagger 比较安全
+                .enable(enableSwagger)                //将Timestamp类型全部转为Long类型
+                .directModelSubstitute(Timestamp.class, Long.class)                //将Date类型全部转为Long类型
+                .directModelSubstitute(Date.class, Long.class)
+                .select()                // 扫描接口的包路径，不要忘记改成自己的
+                .apis(RequestHandlerSelectors.basePackage(ASJBASE_PACKAGE))
+                .paths(PathSelectors.any())
+                .build()
+                //认证
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts());
+    }*/
+   @Bean
+   public Docket ZdryRestApi() {
+      return new Docket(DocumentationType.SWAGGER_2)
+             .groupName("重点人员服务")
+             .apiInfo(regionalInfo())                // 生产环境的时候关闭 swagger 比较安全
+             .enable(enableSwagger)                //将Timestamp类型全部转为Long类型
+             .directModelSubstitute(Timestamp.class, Long.class)                //将Date类型全部转为Long类型
+             .directModelSubstitute(Date.class, Long.class)
+             .select()                // 扫描接口的包路径，不要忘记改成自己的
+             .apis(RequestHandlerSelectors.basePackage(Zdry_PACKAGE))
+             .paths(PathSelectors.any())
+             .build()
+             //认证
+             .securitySchemes(securitySchemes())
+             .securityContexts(securityContexts());
+    }
+    @Bean
+    public Docket TarilRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("资源服务")
+                .apiInfo(tarilInfo())                // 生产环境的时候关闭 swagger 比较安全
+                .enable(enableSwagger)                //将Timestamp类型全部转为Long类型
+                .directModelSubstitute(Timestamp.class, Long.class)                //将Date类型全部转为Long类型
+                .directModelSubstitute(Date.class, Long.class)
+                .select()                // 扫描接口的包路径，不要忘记改成自己的
+                .apis(RequestHandlerSelectors.basePackage(ZYBASE_PACKAGE))
+                .paths(PathSelectors.any())
+                .build()
+                //认证
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts());
+    }
+    @Bean
+    public Docket ServiceRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("区域服务")
+                .apiInfo(regionalInfo())                // 生产环境的时候关闭 swagger 比较安全
+                .enable(enableSwagger)                //将Timestamp类型全部转为Long类型
+                .directModelSubstitute(Timestamp.class, Long.class)                //将Date类型全部转为Long类型
+                .directModelSubstitute(Date.class, Long.class)
+                .select()                // 扫描接口的包路径，不要忘记改成自己的
+                .apis(RequestHandlerSelectors.basePackage(SERVICEBASE_PACKAGE))
+                .paths(PathSelectors.any())
+                .build()
+                //认证
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts());
+    }
+    @Bean
+    public Docket SystemRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("系统管理服务")
+                .apiInfo(regionalInfo())                // 生产环境的时候关闭 swagger 比较安全
+                .enable(enableSwagger)                //将Timestamp类型全部转为Long类型
+                .directModelSubstitute(Timestamp.class, Long.class)                //将Date类型全部转为Long类型
+                .directModelSubstitute(Date.class, Long.class)
+                .select()                // 扫描接口的包路径，不要忘记改成自己的
+                .apis(RequestHandlerSelectors.basePackage(SYSTEMBASE_PACKAGE))
+                .paths(PathSelectors.any())
+                .build()
+                //认证
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts());
+    }
+    @Bean
+    public Docket EsRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("ES资源服务")
+                .apiInfo(regionalInfo())                // 生产环境的时候关闭 swagger 比较安全
+                .enable(enableSwagger)                //将Timestamp类型全部转为Long类型
+                .directModelSubstitute(Timestamp.class, Long.class)                //将Date类型全部转为Long类型
+                .directModelSubstitute(Date.class, Long.class)
+                .select()                // 扫描接口的包路径，不要忘记改成自己的
+                .apis(RequestHandlerSelectors.basePackage(ES_RPACKAGE))
+                .paths(PathSelectors.any())
+                .build()
+                .useDefaultResponseMessages(false)   //关闭默认的所有http状态码，去掉该行显示所有的默认http状态码
+                //认证
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts());
+    }
+   /* @Bean
+    public Docket WaRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("网安服务")
+                .apiInfo(waapiInfo())                // 生产环境的时候关闭 swagger 比较安全
+                .enable(enableSwagger)                //将Timestamp类型全部转为Long类型
+                .directModelSubstitute(Timestamp.class, Long.class)                //将Date类型全部转为Long类型
+                .directModelSubstitute(Date.class, Long.class)
+                .select()                // 扫描接口的包路径，不要忘记改成自己的
+                .apis(RequestHandlerSelectors.basePackage(WABASE_PACKAGE))
+                .paths(PathSelectors.any())
+                .build()
+                //认证
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts());
+    }
+    @Bean
+    public Docket SysGnsyrzRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("日志服务")
+                .apiInfo(sysGnsyrzInfo())                // 生产环境的时候关闭 swagger 比较安全
+                .enable(enableSwagger)                //将Timestamp类型全部转为Long类型
+                .directModelSubstitute(Timestamp.class, Long.class)                //将Date类型全部转为Long类型
+                .directModelSubstitute(Date.class, Long.class)
+                .select()                // 扫描接口的包路径，不要忘记改成自己的
+                .apis(RequestHandlerSelectors.basePackage(LOGBASE_PACKAGE))
+                .paths(PathSelectors.any())
+                .build()
+                //认证
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts());
+    }
+    @Bean
+    public Docket PoiRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("solr服务")
+                .apiInfo(poiInfo())                // 生产环境的时候关闭 swagger 比较安全
+                .enable(enableSwagger)                //将Timestamp类型全部转为Long类型
+                .directModelSubstitute(Timestamp.class, Long.class)                //将Date类型全部转为Long类型
+                .directModelSubstitute(Date.class, Long.class)
+                .select()                // 扫描接口的包路径，不要忘记改成自己的
+                .apis(RequestHandlerSelectors.basePackage(POIBASE_PACKAGE))
+                .paths(PathSelectors.any())
+                .build()
+                //认证
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts());
+    }*/
+  /*  private ApiInfo asjapiInfo() {        return new ApiInfoBuilder()
+            .title("MAP RESTful APIs")
+            .description("案件 API 服务")
+            .termsOfServiceUrl("http://swagger.io/")
+            .contact(new Contact("CHANG_CHAO", "127.0.0.1", "changchao@founser.com"))
+            .version("1.0")
+            .build();
+    }*/
+    private ApiInfo tarilInfo() {        return new ApiInfoBuilder()
+            .title("MAP RESTful APIs")
+            .description("资源 API 服务")
+            .termsOfServiceUrl("http://swagger.io/")
+            .contact(new Contact("CHANG_CHAO", "127.0.0.1", "changchao@founser.com"))
+            .version("1.0")
+            .build();
+    }
+    private ApiInfo regionalInfo() {        return new ApiInfoBuilder()
+            .title("MAP RESTful APIs")
+            .description("区域 API 服务")
+            .termsOfServiceUrl("http://swagger.io/")
+            .contact(new Contact("CHANG_CHAO", "127.0.0.1", "changchao@founser.com"))
+            .version("1.0")
+            .build();
+    }
+   /* private ApiInfo waapiInfo() {        return new ApiInfoBuilder()
+            .title("MAP RESTful APIs")
+            .description("网安 API 服务")
+            .termsOfServiceUrl("http://swagger.io/")
+            .contact(new Contact("CHANG_CHAO", "127.0.0.1", "changchao@founser.com"))
+            .version("1.0")
+            .build();
+    }
+    private ApiInfo sysGnsyrzInfo() {        return new ApiInfoBuilder()
+            .title("MAP RESTful APIs")
+            .description("日志 API 服务")
+            .termsOfServiceUrl("http://swagger.io/")
+            .contact(new Contact("CHANG_CHAO", "127.0.0.1", "changchao@founser.com"))
+            .version("1.0")
+            .build();
+    }
+    private ApiInfo poiInfo() {        return new ApiInfoBuilder()
+            .title("MAP RESTful APIs")
+            .description("POI API 服务")
+            .termsOfServiceUrl("http://swagger.io/")
+            .contact(new Contact("CHANG_CHAO", "127.0.0.1", "changchao@founser.com"))
+            .version("1.0")
+            .build();
+    }*/
+    //securitySchemes与securityContexts作用为配置全局Authorization参数
+    private List<ApiKey> securitySchemes() {
+        List<ApiKey> apiKeys = new ArrayList<>();
+        apiKeys.add(new ApiKey("Authorization", "Authorization", "header"));
+        return apiKeys;
+    }
+
+    private List<SecurityContext> securityContexts() {
+        List<SecurityContext> securityContexts = new ArrayList<>();
+        securityContexts.add(SecurityContext.builder()
+                .securityReferences(defaultAuth())
+               // .forPaths(PathSelectors.regex("^(?!auth).*$"))
+                .build());
+        return securityContexts;
+    }
+
+    private List<SecurityReference> defaultAuth() {
+        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+        authorizationScopes[0] = authorizationScope;
+        List<SecurityReference> securityReferences = new ArrayList<>();
+        securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
+        return securityReferences;
+    }
+
+}

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

 package com.founder.servicebase.controller;
+
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -12,14 +13,10 @@ import com.founder.servicebase.logs.OperationType;
 import com.founder.servicebase.service.SysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -33,6 +30,7 @@ import static com.founder.commonutils.util.AesEncryptUtil.desEncrypt;
  * @author jlt
  * @since 2022-03-17 14:09:46
  */
+@CrossOrigin
 @RestController
 @RequestMapping("/user")
 @Api(tags = "User登录")
@@ -64,23 +62,34 @@ public class SysUserController extends ApiController {
             return MapRestResult.build(201, "解密失败", "解密失败");
         }
         QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("USERNAME", username);
-        queryWrapper.eq("PASSWORD", DigestUtil.encrypt(password));
-        queryWrapper.eq("SCBZ", 0);
+        queryWrapper.eq("username", username);
+        //自定义加密 先MD5再SHA1
+//        queryWrapper.eq("password", DigestUtil.encrypt(password));
+//        System.out.println(DigestUtil.encrypt(password));
+
+        //Base64加密
+        queryWrapper.eq("password", Base64Util.encode(password));
+        System.out.println(Base64Util.encode(password));
+
+//        queryWrapper.eq("scbz", 0);
         SysUser one = sysUserService.getOne(queryWrapper);
         if (one == null) {
             return MapRestResult.build(500, "该用户不存在", null);
         }
 
-        if (!DigestUtil.encrypt(password).equals(one.getPassword())) {
+//        if (!DigestUtil.encrypt(password).equals(one.getPassword())) {
+//            return MapRestResult.build(500, "账号、密码不正确", null);
+//        }
+        if (!Base64Util.encode(password).equals(one.getPassword())) {
             return MapRestResult.build(500, "账号、密码不正确", null);
         }
         // 拿到真实ip
         one.setIp(NetworkUtil.getIpAddr(request));
         JwtUser util = new JwtUser();
         String ip = request.getRemoteAddr();
-        //密码加密与刑专一致
-        Token tokenEntity=new Token(one.getUsername(),one.getIp(), DigestUtil.encrypt(password));
+        //密码加密与智侦统一
+//        Token tokenEntity=new Token(one.getUsername(),one.getIp(), DigestUtil.encrypt(password));
+        Token tokenEntity=new Token(one.getUsername(),one.getIp(), Base64Util.encode(password));
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(tokenEntity);
         //用户JWT生成token
         String token = util.createJWT(jsonObject.toString());

common/service_base/src/main/java/com/founder/servicebase/interceptor/TokenInterceptor.java

@@ -6,10 +6,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.founder.commonutils.Exception.TokenException;
-import com.founder.commonutils.model.newPublicEntity.*;
 import com.founder.commonutils.model.newPublicEntity.CodeYymc.SkCodeYymc;
 import com.founder.commonutils.model.newPublicEntity.CodeYymc.SysYhczrz;
-import com.founder.commonutils.util.*;
+import com.founder.commonutils.model.newPublicEntity.*;
+import com.founder.commonutils.util.HttpUtil;
+import com.founder.commonutils.util.JwtUser;
+import com.founder.commonutils.util.NetworkUtil;
+import com.founder.commonutils.util.ResultUtil;
 import com.founder.servicebase.mapper.mysqlMapper.CodeYymcMapper;
 import com.founder.servicebase.service.SkServiceApplyService;
 import com.founder.servicebase.service.SkServiceService;
@@ -176,11 +179,11 @@ public class TokenInterceptor implements HandlerInterceptor {
         queryWrapper.eq("username", token.getUsername());
         queryWrapper.eq("password", token.getPassword());
         queryWrapper.eq("SCBZ", 0);
-        SysUser one = sysUserService.getOne(queryWrapper);
+//        SysUser one = sysUserService.getOne(queryWrapper);
         SysUser user = sysUserService.getOne(queryWrapper);
         //此处我们将查找的用户信息放到request中
         request.setAttribute("user",user);
-        if (one == null) {
+        if (user == null) {
             return "账号、密码不正确";
         } else {
             return "";

common/service_base/src/main/java/com/founder/servicebase/logs/SkSysLog.java

 package  com.founder.servicebase.logs;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 日志实体类 SysLog
@@ -30,7 +32,7 @@ public class SkSysLog implements Serializable {
 
     private String ip;  // 请求IP
 
-    private String createdate;// 请求时间
+    private Date createdate;// 请求时间
 
     private Long totaltime; //总耗时长（毫秒）
 

common/service_base/src/main/java/com/founder/servicebase/logs/SysLogAspect.java

@@ -13,7 +13,6 @@ import com.founder.commonutils.util.NetworkUtil;
 import com.founder.servicebase.logs.mapper.mysqlMapper.SkSysLogMapper;
 import io.jsonwebtoken.Claims;
 import lombok.SneakyThrows;
-import org.apache.ibatis.session.SqlSessionFactory;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -89,9 +88,10 @@ public class SysLogAspect {
         sysLog.setParams(map.toString());
         //请求时间
         Date date = new Date();
-        String pattern = "yyyy-MM-dd HH:mm:ss";
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
-        sysLog.setCreatedate(simpleDateFormat.format(date));
+//        String pattern = "yyyy-MM-dd HH:mm:ss";
+//        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
+//        sysLog.setCreatedate(simpleDateFormat.format(date));
+        sysLog.setCreatedate(date);
         //获取用户名
         //获取用户ip地址
         // 接收到请求，记录请求内容

common/service_base/src/main/resources/bootstrap.properties

@@ -14,10 +14,44 @@ logging.level.root=INFO
 #spring.datasource.username=root
 #spring.datasource.password=gkptCcYy123
 
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.xzxtdb.url=ENC(Y1dXm7lJCGbPffW6Pbg/Uid1UK2Z1Tu2TNdp9AgqT/iXb4hNRriak+glPXYD6BnO4fQwN9Sj/zguByboO4FagHEQRN0tE57RI6rJEUeTt2JHb1rc2BG1wE9QPK96E5o9K/1TSAjnD/Rr2eAxy11tFLL2fQP35EOX)
-spring.datasource.xzxtdb.username=ENC(e7qsvm7EnrdHG04YnaTMsw==)
-spring.datasource.xzxtdb.password=ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
+#\u8BB0\u5F55\u65E5\u5FD7\u7684\u7EBF\u4E0B\u5730\u5740
+logUrl=http://39.99.155.173:8764/yhczrz/savaYhczrz
+#\u8BB0\u5F55\u65E5\u5FD7\u7684token
+logtoken=Basic 9b6c45cfcf3a4a629e3ed90fa3e5d058
+#xzxtlog=true /false   ture \u8868\u793A\u5F00\u542F\u65E5\u5FD7\uFF0Cfalse\u8868\u793A\u5173\u95ED\u65E5\u5FD7\uFF0C\u9ED8\u8BA4\u662Fture
+xzxtlog =true
+
+#swagger
+swagger.enable=true
+
+#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u053F
+jasypt.encryptor.password=lybgeek
+#\u05B8\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u3DE8(\u012C\uFFFD\uFFFD)
+jasypt.encryptor.algorithm=PBEWithMD5AndDES
+
+#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.type=com.alibaba.druid.pool.DruidDataSource
+
+#spring.datasource.xzxtdb.driver-class-name=com.mysql.cj.jdbc.Driver
+#spring.datasource.xzxtdb.url=ENC(Y1dXm7lJCGbPffW6Pbg/Uid1UK2Z1Tu2TNdp9AgqT/iXb4hNRriak+glPXYD6BnO4fQwN9Sj/zguByboO4FagHEQRN0tE57RI6rJEUeTt2JHb1rc2BG1wE9QPK96E5o9K/1TSAjnD/Rr2eAxy11tFLL2fQP35EOX)
+#spring.datasource.xzxtdb.username=ENC(e7qsvm7EnrdHG04YnaTMsw==)
+#spring.datasource.xzxtdb.password=ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
+#spring.datasource.xzxtdb.type=com.alibaba.druid.pool.DruidDataSource
+
+spring.datasource.xzxtdb.driver-class-name=oracle.jdbc.driver.OracleDriver
+spring.datasource.xzxtdb.url=ENC(Nb+P9CS/i1D+5Tb2AtSDTu5AMH+Lzvr3xpmOz9p8Et5HTbWFHzqo/tSt0kydLARJIlvLqCRuwPE=)
+spring.datasource.xzxtdb.username=ENC(yITtMpDU9iFa7spyahMKPQ==)
+spring.datasource.xzxtdb.password=ENC(fVPAdBUhJ4IEnVCVkM5BbA==)
+spring.datasource.xzxtdb.type=com.alibaba.druid.pool.DruidDataSource
+
+spring.datasource.oracledb.driver-class-name=oracle.jdbc.driver.OracleDriver
+spring.datasource.oracledb.url=ENC(Nb+P9CS/i1D+5Tb2AtSDTu5AMH+Lzvr3xpmOz9p8Et5HTbWFHzqo/tSt0kydLARJIlvLqCRuwPE=)
+spring.datasource.oracledb.username=ENC(yITtMpDU9iFa7spyahMKPQ==)
+spring.datasource.oracledb.password=ENC(fVPAdBUhJ4IEnVCVkM5BbA==)
+spring.datasource.oracledb.type=com.alibaba.druid.pool.DruidDataSource
 
 #oracle\uFFFD\uFFFD\uFFFD\u077F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 #spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver

pom.xml

@@ -91,6 +91,13 @@
                 <version>${velocity.version}</version>
             </dependency>
 
+            <!--配置数据库驱动-->
+            <dependency>
+                <groupId>org.oracle</groupId>
+                <artifactId>ojdbc6</artifactId>
+                <version>10</version>
+            </dependency>
+
             <!-- 数据库驱动包 -->
             <!-- <dependency>
                  <groupId>org.oracle</groupId>
@@ -99,24 +106,24 @@
                  <scope>system</scope>
                  <systemPath>${project.basedir}/libs/ojdbc-10.jar</systemPath>
              </dependency>-->
-<!--            <dependency>
-                <groupId>org.oracle</groupId>
-                <artifactId>ojdbc6</artifactId>
-                <version>10</version>
-            </dependency>-->
-
-            <!--swagger-->
             <!--            <dependency>
-                            <groupId>io.springfox</groupId>
-                            <artifactId>springfox-swagger2</artifactId>
-                            <version>${swagger.version}</version>
-                        </dependency>
-                        &lt;!&ndash;swagger ui&ndash;&gt;
-                        <dependency>
-                            <groupId>io.springfox</groupId>
-                            <artifactId>springfox-swagger-ui</artifactId>
-                            <version>${swagger.version}</version>
+                            <groupId>org.oracle</groupId>
+                            <artifactId>ojdbc6</artifactId>
+                            <version>10</version>
                         </dependency>-->
+
+            <!--swagger-->
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger2</artifactId>
+                <version>${swagger.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger-ui</artifactId>
+                <version>${swagger.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.github.xiaoymin</groupId>
                 <artifactId>knife4j-spring-boot-starter</artifactId>
@@ -280,13 +287,13 @@
                 <artifactId>poi-scratchpad</artifactId>
                 <version>3.17</version>
             </dependency>
-<!--            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>easyexcel</artifactId>
-                <version>2.2.6</version>
-            </dependency>-->
+            <!--            <dependency>
+                            <groupId>com.alibaba</groupId>
+                            <artifactId>easyexcel</artifactId>
+                            <version>2.2.6</version>
+                        </dependency>-->
             <!--集成EasyExcel -->
-<!-- 引入easyExcel的时候，排除easyExcel中自带的poi依赖-->
+            <!-- 引入easyExcel的时候，排除easyExcel中自带的poi依赖-->
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>easyexcel</artifactId>

service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/AsjController.java

+package com.founder.publicapi.controller.ZczxService;
+
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.founder.commonutils.model.newPublicEntity.MapRestResult;
+import com.founder.commonutils.model.zczxEntity.TbStAsj;
+import com.founder.publicapi.service.AsjService;
+import com.founder.servicebase.logs.OperLog;
+import com.founder.servicebase.logs.OperationType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author Godffy
+ * @create 2023-06-09 9:56
+ */
+@CrossOrigin
+@RestController
+@RequestMapping("/asj")
+@Api(tags = "案事件")
+public class AsjController extends ApiController {
+
+    /**
+     * 服务对象
+     */
+    @Resource
+    private AsjService asjService;
+
+    @PostMapping("detail")
+    @ApiOperation(value = "查询案事件详情信息")
+    @OperLog(message = "查询案事件详情信息", operation = OperationType.QUERY)
+    public MapRestResult detail(String asjbh) {
+        TbStAsj byId = asjService.getById(asjbh);
+        if (byId == null) {
+            return new MapRestResult().error("不存在该数据");
+        } else {
+            return new MapRestResult(byId);
+        }
+    }
+
+}

service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/AsjJqController.java

+package com.founder.publicapi.controller.ZczxService;
+
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.founder.commonutils.model.newPublicEntity.MapRestResult;
+import com.founder.commonutils.model.zczxEntity.TbStAsjJq;
+import com.founder.publicapi.service.AsjJqService;
+import com.founder.servicebase.logs.OperLog;
+import com.founder.servicebase.logs.OperationType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author Godffy
+ * @create 2023-06-09 9:56
+ */
+@CrossOrigin
+@RestController
+@RequestMapping("/asjjq")
+@Api(tags = "案事件警情")
+public class AsjJqController extends ApiController {
+
+    /**
+     * 服务对象
+     */
+    @Resource
+    private AsjJqService asjJqService;
+
+    @PostMapping("detail")
+    @ApiOperation(value = "查询案事件警情详情信息")
+    @OperLog(message = "查询案事件警情详情信息", operation = OperationType.QUERY)
+    public MapRestResult detail(String asjjqbh) {
+        TbStAsjJq byId = asjJqService.getById(asjjqbh);
+        if (byId == null) {
+            return new MapRestResult().error("不存在该数据");
+        } else {
+            return new MapRestResult(byId);
+        }
+    }
+
+}

service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/XcrwController.java

+package com.founder.publicapi.controller.ZczxService;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.founder.commonutils.model.PageSimpleVO;
+import com.founder.commonutils.model.newPublicEntity.MapRestResult;
+import com.founder.commonutils.model.newPublicEntity.SysUser;
+import com.founder.commonutils.model.zczxEntity.Xcrw;
+import com.founder.commonutils.model.zczxEntity.XcrwDto;
+import com.founder.commonutils.model.zczxEntity.XcrwFile;
+import com.founder.commonutils.model.zczxEntity.Zczx;
+import com.founder.commonutils.util.KeyUtil;
+import com.founder.publicapi.service.XcrwFileService;
+import com.founder.publicapi.service.XcrwService;
+import com.founder.publicapi.service.ZczxService;
+import com.founder.servicebase.logs.OperLog;
+import com.founder.servicebase.logs.OperationType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * @author Godffy
+ * @create 2023-06-09 16:29
+ */
+@CrossOrigin
+@RestController
+@RequestMapping("/xcrw")
+@Api(tags = "协查任务")
+public class XcrwController extends ApiController {
+
+    @Resource
+    private XcrwService xcrwService;
+
+    @Resource
+    private XcrwFileService xcrwFileService;
+
+    @Resource
+    private ZczxService zczxService;
+
+    @PostMapping("save")
+    @ApiOperation(value = "新增协查任务信息")
+    @OperLog(message = "新增协查任务信息", operation = OperationType.ADD)
+    @Transactional
+    public MapRestResult save(XcrwDto xcrwDto) {
+        Xcrw xcrw = new Xcrw();
+        BeanUtil.copyProperties(xcrwDto, xcrw);
+        String xcrwbh = KeyUtil.getUUIDKey("XC");
+        //设置主键
+        xcrw.setXcrwbh(xcrwbh);
+        xcrw.setXcrwkssj(new Date());
+        //当前登陆人的信息
+        ServletRequestAttributes requestAttributes =
+                (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = requestAttributes.getRequest();
+        SysUser user = (SysUser) request.getAttribute("user");
+        String trueName = user.getTrueName();
+        String policemanid = user.getPolicemanid();
+        String unitcode = user.getUnitcode();
+        String unitname = user.getUnitname();
+        xcrw.setXcrwcjrxm(trueName);//姓名
+        xcrw.setXcrwcjrjh(policemanid);//警号
+        xcrw.setXcrwcjrdwdm(unitcode);//创建人单位代码
+        xcrw.setXcrwcjrdwmc(unitname);//专项创建单位名称
+        xcrwService.save(xcrw);
+        /**
+         * 协查任务类型
+         * 1：技侦研判   对应侦查专项     是否发起技侦研判_判断标志
+         * 2：市局网合（网警）研判        是否发起市局网警网合_判断标志
+         * 3：市局网合（情报）研判        是否发起市局情报网合_判断标志
+         * 4：分局网合                  是否发起分局网合_判断标志
+         * 5：其他协查                  是否发起其他协查_判断标志
+         */
+        String zxbh = xcrw.getZxbh();//协查任务对应的专项编号
+        String xcrwlx = xcrw.getXcrwlx();//此次发起的协查任务类型
+        Zczx zczx = new Zczx();
+        UpdateWrapper<Zczx> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("ZXBH",zxbh);
+        if (StringUtils.isNotBlank(xcrwlx)&&"1".equals(xcrwlx)){
+            zczx.setSffqjzypPdbz("1");
+        }else if (StringUtils.isNotBlank(xcrwlx)&&"2".equals(xcrwlx)){
+            zczx.setSffqsjwjwhPdbz("1");
+        }else if (StringUtils.isNotBlank(xcrwlx)&&"3".equals(xcrwlx)){
+            zczx.setSffqsjqbwhPdbz("1");
+        }else if (StringUtils.isNotBlank(xcrwlx)&&"4".equals(xcrwlx)){
+            zczx.setSffqfjwhPdbz("1");
+        }else if (StringUtils.isNotBlank(xcrwlx)&&"5".equals(xcrwlx)){
+            zczx.setSffqqtxcPdbz("1");
+        }
+        zczxService.update(zczx,updateWrapper);//更新侦查专项状态
+        //如果同时传入了文件,则调用添加文件接口,FILE_TYPE(1：协查任务申请单)
+        if (xcrwDto.getFile() != null) {
+            XcrwFile xcrwFile = new XcrwFile();
+            xcrwFile.setXcrwbh(xcrwbh);
+            String xcf = KeyUtil.getUUIDKey("XCF");
+            xcrwFile.setId(xcf);
+            MultipartFile file = xcrwDto.getFile();
+            String originalFilename = file.getOriginalFilename();//文件全名(包含后缀)
+            long size = file.getSize();//文件大小
+            byte[] bytes = new byte[0];//文件字节
+            try {
+                bytes = file.getBytes();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            xcrwFile.setFileName(originalFilename);
+            xcrwFile.setFileSize(size);
+            xcrwFile.setFileContent(bytes);
+            xcrwFile.setFileEx(originalFilename.substring(originalFilename.lastIndexOf(".")).toLowerCase(Locale.ROOT));//设置文件后缀
+            xcrwFile.setFileType("1");//1：协查任务申请单
+            xcrwFileService.save(xcrwFile);
+        }
+        return new MapRestResult();
+    }
+
+    @PostMapping("listXcrwForPage")
+    @ApiOperation(value = "查询协查任务列表信息")
+    @OperLog(message = "查询协查任务列表信息", operation = OperationType.QUERY)
+    public MapRestResult listXcrwForPage(@RequestBody XcrwDto xcrwDto, HttpServletRequest request) {
+        Object user = request.getAttribute("user");
+
+        IPage page = new Page(xcrwDto.getPageNum(), xcrwDto.getPageSize());
+        QueryWrapper<Xcrw> qw = new QueryWrapper<>();
+        // 只查询有效的
+        qw.eq("XXSC_PDBZ", "0");
+        //按协查任务编号查
+        qw.eq(StringUtils.isNotBlank(xcrwDto.getZxbh()), "ZXBH", xcrwDto.getZxbh());
+        //按协查任务编号查
+        qw.eq(StringUtils.isNotBlank(xcrwDto.getXcrwBz()), "XCRWBH", xcrwDto.getXcrwbh());
+        //按案事件编号查
+        qw.eq(StringUtils.isNotBlank(xcrwDto.getAsjbh()), "ASJBH", xcrwDto.getAsjbh());
+        //按警情编号查
+        qw.eq(StringUtils.isNotBlank(xcrwDto.getJqbh()), "JQBH", xcrwDto.getJqbh());
+        //按要情编号查
+        qw.eq(StringUtils.isNotBlank(xcrwDto.getYqbh()), "YQBH", xcrwDto.getYqbh());
+        //按发起人警号(协查任务创建人警号)查
+        qw.eq(StringUtils.isNotBlank(xcrwDto.getXcrwcjrjh()), "XCRWCJRJH", xcrwDto.getXcrwcjrjh());
+        // 按创建时间范围(协查任务开始时间)查询
+        qw.ge(null != xcrwDto.getXcrwkssjKssj(), "XCRWKSSJ", xcrwDto.getXcrwkssjJssj());
+        qw.le(null != xcrwDto.getXcrwkssjKssj(), "XCRWKSSJ", xcrwDto.getXcrwkssjJssj());
+        //按接收单位查
+        qw.eq(StringUtils.isNotBlank(xcrwDto.getXcrwjsrdwdm()), "XCRWJSRDWDM", xcrwDto.getXcrwjsrdwdm());
+        //按发起单位查
+        qw.eq(StringUtils.isNotBlank(xcrwDto.getXcrwcjrdwdm()), "XCRWCJRDWDM", xcrwDto.getXcrwcjrdwdm());
+        //按审批状态查
+        qw.eq(StringUtils.isNotBlank(xcrwDto.getXcrwSpzt()), "XCRW_SPZT", xcrwDto.getXcrwSpzt());
+        //按超时状态查
+        qw.eq(StringUtils.isNotBlank(xcrwDto.getXcrwCszt()), "XCRW_CSZT", xcrwDto.getXcrwCszt());
+        //按协查任务类型查
+        //1：技侦研判
+        //2：市局网合（网警）研判
+        //3：市局网合（情报）研判
+        //4：分局网合
+        //5：其他协查
+        qw.eq(StringUtils.isNotBlank(xcrwDto.getXcrwlx()), "XCRWLX", xcrwDto.getXcrwlx());
+        qw.orderByDesc("XCRWKSSJ");//按创建时间(协查任务开始时间)做降序
+        IPage result = this.xcrwService.page(page, qw);
+        List<Xcrw> records = result.getRecords();
+        for (int i = 0; i < records.size(); i++) {
+            String id = records.get(i).getXcrwbh();
+            //1.协查任务申请单
+            QueryWrapper<XcrwFile> qw1 = new QueryWrapper<>();
+            qw1.eq("XCRWBH", id);
+            qw1.eq("XXSC_PDBZ", "0");
+            qw1.eq("FILE_TYPE", "1");
+//            queryWrapper.select(XcrwFile.class, info -> !info.getColumn().equals("FILE_CONTENT"));
+            List<XcrwFile> sqdList = xcrwFileService.list(qw1);
+
+            //2.协查任务反馈单
+            QueryWrapper<XcrwFile> qw2 = new QueryWrapper<>();
+            qw2.eq("XCRWBH", id);
+            qw2.eq("XXSC_PDBZ", "0");
+            qw2.eq("FILE_TYPE", "2");
+            List<XcrwFile> fkdList = xcrwFileService.list(qw2);
+            Xcrw xcrw = records.get(i);
+            xcrw.setXcrwSqd(sqdList);
+            xcrw.setXcrwFkd(fkdList);
+            records.set(i, xcrw);
+        }
+        PageSimpleVO pageSimpleVO = new PageSimpleVO<>(result.getCurrent(), result.getTotal(), result.getRecords());
+        return new MapRestResult(200, "查询成功!", result.getTotal(), pageSimpleVO);
+    }
+
+
+    /**
+     * 接收人才能反馈，但是接收人不一定反馈，可以进行流转，然后改变接收人信息
+     * 协查结果反馈：修改协查状态，上传反馈附件
+     *
+     * @param xcrwDto
+     * @return
+     */
+    @PostMapping("feedback")
+    @ApiOperation(value = "协查结果反馈")
+    @OperLog(message = "协查结果反馈", operation = OperationType.UPDATE)
+    @Transactional
+    public MapRestResult feedback(XcrwDto xcrwDto) {
+        String xcrwbh = xcrwDto.getXcrwbh();
+        Xcrw xcrw = this.xcrwService.getById(xcrwbh);
+        if (null == xcrw) {
+            return new MapRestResult().error("协查任务不存在");
+        }
+        //反馈判断标志为1则任务已反馈
+        if (StringUtils.isNotBlank(xcrw.getXcrwFkzt()) && "1".equals(xcrw.getXcrwFkzt())) {
+            return new MapRestResult().error("协查任务已反馈");
+        }
+        //退回判断标志为1则任务已退回
+        if (StringUtils.isNotBlank(xcrw.getXcrwThzt()) && "1".equals(xcrw.getXcrwThzt())) {
+            return new MapRestResult().error("协查任务已退回");
+        }
+
+        BeanUtil.copyProperties(xcrwDto, xcrw);
+        xcrw.setXcrwjssj(new Date());//协查任务反馈后就结束了
+        xcrw.setXcrwFkzt("1");//设置协查任务反馈判断标志为1，代表已反馈
+        //更新协查任务信息
+        this.xcrwService.updateById(xcrw);
+        //如果同时传入了文件,则调用添加文件接口，FILE_TYPE(2：协查任务反馈单)
+        if (xcrwDto.getFile() != null) {
+            XcrwFile xcrwFile = new XcrwFile();
+            xcrwFile.setXcrwbh(xcrwbh);
+            String xcf = KeyUtil.getUUIDKey("XCF");
+            xcrwFile.setId(xcf);
+            MultipartFile file = xcrwDto.getFile();
+            String originalFilename = file.getOriginalFilename();//文件全名(包含后缀)
+            long size = file.getSize();//文件大小
+            byte[] bytes = new byte[0];//文件字节
+            try {
+                bytes = file.getBytes();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            xcrwFile.setFileName(originalFilename);
+            xcrwFile.setFileSize(size);
+            xcrwFile.setFileContent(bytes);
+            xcrwFile.setFileEx(originalFilename.substring(originalFilename.lastIndexOf(".")).toLowerCase(Locale.ROOT));//设置文件后缀
+            xcrwFile.setFileType("2");
+            xcrwFileService.save(xcrwFile);
+        }
+        return new MapRestResult();
+    }
+
+    // 更改接收人，只有未反馈状态的任务可以流转
+    @PostMapping("resend")
+    @ApiOperation(value = "协查任务流转")
+    @OperLog(message = "协查任务流转", operation = OperationType.UPDATE)
+    public MapRestResult resend(@RequestBody XcrwDto xcrwDto) {
+        String xcrwbh = xcrwDto.getXcrwbh();
+        Xcrw xcrw = this.xcrwService.getById(xcrwbh);
+        if (null == xcrw) {
+            return new MapRestResult().error("协查任务不存在");
+        }
+        //反馈判断标志为1则任务已反馈
+        if (StringUtils.isNotBlank(xcrw.getXcrwFkzt()) && "1".equals(xcrw.getXcrwFkzt())) {
+            return new MapRestResult().error("协查任务已反馈");
+        }
+        //退回判断标志为1则任务已退回
+        if (StringUtils.isNotBlank(xcrw.getXcrwThzt()) && "1".equals(xcrw.getXcrwThzt())) {
+            return new MapRestResult().error("协查任务已退回");
+        }
+        BeanUtil.copyProperties(xcrwDto, xcrw);
+        //更新协查任务信息(这里主要为接收人信息)
+        this.xcrwService.updateById(xcrw);
+        return new MapRestResult();
+    }
+
+    //退回和流转的区别是能不能重新发,流转不用重新发,退回要重新发任务
+    //更改协查任务退回状态，
+    @PostMapping("sendBack")
+    @ApiOperation(value = "协查任务退回")
+    @OperLog(message = "协查任务退回", operation = OperationType.UPDATE)
+    public MapRestResult sendBack(@RequestBody XcrwDto xcrwDto) {
+        String xcrwbh = xcrwDto.getXcrwbh();
+        Xcrw xcrw = this.xcrwService.getById(xcrwbh);
+        if (null == xcrw) {
+            return new MapRestResult().error("协查任务不存在");
+        }
+        //反馈判断标志为1则任务已反馈
+        if (StringUtils.isNotBlank(xcrw.getXcrwFkzt()) && "1".equals(xcrw.getXcrwFkzt())) {
+            return new MapRestResult().error("协查任务已反馈");
+        }
+        //退回判断标志为1则任务已退回
+        if (StringUtils.isNotBlank(xcrw.getXcrwThzt()) && "1".equals(xcrw.getXcrwThzt())) {
+            return new MapRestResult().error("协查任务已退回");
+        }
+        BeanUtil.copyProperties(xcrwDto, xcrw);
+        xcrw.setXcrwjssj(new Date());//协查任务退回后就结束了
+        xcrw.setXcrwThzt("1");//设置协查任务退回判断标志为1，代表已退回
+        //更新协查任务信息
+        this.xcrwService.updateById(xcrw);
+        return new MapRestResult();
+    }
+
+}

service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/XcrwFileController.java

+package com.founder.publicapi.controller.ZczxService;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.founder.commonutils.model.newPublicEntity.MapRestResult;
+import com.founder.commonutils.model.zczxEntity.XcrwFile;
+import com.founder.commonutils.model.zczxEntity.XcrwFileDto;
+import com.founder.commonutils.util.ContentTypeUtil;
+import com.founder.publicapi.service.XcrwFileService;
+import io.swagger.annotations.Api;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+
+/**
+ * @author Godffy
+ * @create 2023-06-12 16:53
+ */
+@CrossOrigin
+@RestController
+@RequestMapping("/xcrwFile")
+@Api(tags = "协查任务文件")
+public class XcrwFileController {
+
+    @Resource
+    private XcrwFileService xcrwFileService;
+
+    @PostMapping("downloadXcrwFile")
+    public MapRestResult downloadServiceFile(@RequestBody XcrwFileDto xcrwFileDto, HttpServletResponse response) throws IOException {
+        if (StringUtils.isBlank(xcrwFileDto.getId())) {
+            return MapRestResult.build(500, "文件ID不能为空", null);
+        }
+        XcrwFile xcrwFile = xcrwFileService.getOne(new LambdaQueryWrapper<XcrwFile>().eq(XcrwFile::getId,
+                xcrwFileDto.getId()));
+        byte[] fileContent = xcrwFile.getFileContent();
+        String fileName = xcrwFile.getFileName();
+        String contentType = ContentTypeUtil.gettingContentType(fileContent);
+        response.setContentType(contentType);
+        response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8").trim());
+        OutputStream outputStream = response.getOutputStream();
+        outputStream.write(fileContent);
+        outputStream.flush();
+        outputStream.close();
+        return new MapRestResult();
+    }
+
+}

service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/YqController.java

+package com.founder.publicapi.controller.ZczxService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.founder.commonutils.model.newPublicEntity.MapRestResult;
+import com.founder.commonutils.model.zczxEntity.TbStYq;
+import com.founder.publicapi.service.YqService;
+import com.founder.servicebase.logs.OperLog;
+import com.founder.servicebase.logs.OperationType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author Godffy
+ * @create 2023-06-09 9:56
+ */
+@CrossOrigin
+@RestController
+@RequestMapping("/yq")
+@Api(tags = "要情")
+public class YqController extends ApiController {
+
+    /**
+     * 服务对象
+     */
+    @Resource
+    private YqService yqService;
+
+    @PostMapping("detail")
+    @ApiOperation(value = "查询案事件详情信息")
+    @OperLog(message = "查询案事件详情信息", operation = OperationType.QUERY)
+    public MapRestResult detail(String yqmc) {
+        QueryWrapper<TbStYq> qw = new QueryWrapper<>();
+        qw.eq(StringUtils.isNotBlank(yqmc), "title", yqmc);
+        TbStYq one = yqService.getOne(qw);
+        if (one == null) {
+            return new MapRestResult().error("不存在该数据");
+        } else {
+            return new MapRestResult(one);
+        }
+    }
+}

service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxController.java

+package com.founder.publicapi.controller.ZczxService;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.founder.commonutils.model.PageSimpleVO;
+import com.founder.commonutils.model.newPublicEntity.MapRestResult;
+import com.founder.commonutils.model.newPublicEntity.SysUser;
+import com.founder.commonutils.model.zczxEntity.Zczx;
+import com.founder.commonutils.model.zczxEntity.ZczxDto;
+import com.founder.commonutils.model.zczxEntity.ZczxRole;
+import com.founder.commonutils.util.KeyUtil;
+import com.founder.publicapi.service.ZczxRoleService;
+import com.founder.publicapi.service.ZczxService;
+import com.founder.servicebase.logs.OperLog;
+import com.founder.servicebase.logs.OperationType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+
+/**
+ * @author Godffy
+ * @create 2023-06-05 17:33
+ */
+@CrossOrigin
+@RestController
+@RequestMapping("/zczx")
+@Api(tags = "侦查专项")
+public class ZczxController extends ApiController {
+
+    @Resource
+    private ZczxService zczxService;
+
+    @Resource
+    private ZczxRoleService zczxRoleService;
+
+    /**
+     * 创建侦查专项时，把当前用户的机构代码存到侦查专项角色表(TB_WH_ZCZX_ROLE)
+     *
+     * @param zczxDto
+     * @return
+     */
+    @PostMapping("save")
+    @ApiOperation(value = "新增侦查专项信息")
+    @OperLog(message = "新增侦查专项信息", operation = OperationType.ADD)
+    @Transactional
+    public MapRestResult save(@RequestBody ZczxDto zczxDto) {
+        Zczx zczx = new Zczx();
+        BeanUtil.copyProperties(zczxDto, zczx);
+        String zxbh = KeyUtil.getUUIDKey("ZC");
+        zczx.setZxbh(zxbh);//专项编号
+        zczx.setZxcjsj(new Date());//创建时间
+        //当前登陆人的信息
+        ServletRequestAttributes requestAttributes =
+                (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = requestAttributes.getRequest();
+        SysUser user = (SysUser) request.getAttribute("user");
+        String trueName = user.getTrueName();
+        String policemanid = user.getPolicemanid();
+        String unitcode = user.getUnitcode();
+        String unitname = user.getUnitname();
+        zczx.setZxcjr(trueName);//姓名
+        zczx.setZxcjrjh(policemanid);//警号
+        zczx.setZxcjdwdm(unitcode);//创建人单位代码
+        zczx.setZxcjdwmc(unitname);//专项创建单位名称
+        //侦查专项编号，在警情和案件更新的情况下，是否变动？
+        zczxService.save(zczx);
+
+        ZczxRole zczxRole = new ZczxRole();
+        String id = KeyUtil.getUUIDKey("ZXR");
+        zczxRole.setId(id);//设置主键
+        zczxRole.setZxbh(zxbh);//关联专项编号
+        zczxRole.setUnitcode(unitcode);//创建的单位代码
+        zczxRole.setUnitname(unitname);//创建的单位名称
+        zczxRoleService.save(zczxRole);
+        return new MapRestResult();
+    }
+
+
+    /**
+     * 分页查询侦查专项(tb_wh_zczx)，联警情表(tb_xw_asj_110jq),案件表(tb_st_asj),要情表
+     * 若有案件编号，连接案件编号拿到案件名称、时间(案件时间有时钟校准)
+     * 若有警情编号，连接案件编号拿到警情名称、时间
+     * 若有要情编号，连接案件编号拿到要情名称、时间
+     * 警情会升级为案件
+     *
+     * @param zczxDto
+     * @return
+     */
+    @PostMapping("listZczxForPage")
+    @ApiOperation(value = "查询侦查专项列表信息")
+    @OperLog(message = "查询侦查专项列表信息", operation = OperationType.QUERY)
+    public MapRestResult listZczxForPage(@RequestBody ZczxDto zczxDto) {
+        IPage page = new Page(zczxDto.getPageNum(), zczxDto.getPageSize());
+        IPage<Zczx> result = this.zczxService.listZczxForPage(page, zczxDto);
+        PageSimpleVO pageSimpleVO = new PageSimpleVO<>(result.getCurrent(), result.getTotal(), result.getRecords());
+        return new MapRestResult(200, "查询成功!", result.getTotal(), pageSimpleVO);
+
+
+//        QueryWrapper<Zczx> qw = new QueryWrapper<>();
+//        // 按侦查专项编号查询
+//        qw.eq(StringUtils.isNotBlank(zczxDto.getZxbh()), "ZXBH", zczxDto.getZxbh());
+//        // 按侦查专项名称查询
+//        qw.eq(StringUtils.isNotBlank(zczxDto.getZxmc()), "ZXMC", zczxDto.getZxmc());
+//        // 按案件编号查询
+//        qw.eq(StringUtils.isNotBlank(zczxDto.getAsjbh()), "ASJBH", zczxDto.getAsjbh());
+//        // 按侦查专项创建单位代码查询
+//        qw.eq(StringUtils.isNotBlank(zczxDto.getZxcjdwdm()), "ZXCJDWDM", zczxDto.getZxcjdwdm());
+//        // 按警情编号查询
+//        qw.eq(StringUtils.isNotBlank(zczxDto.getJqbh()), "JQBH", zczxDto.getJqbh());
+//        // 按创建人警号查询
+//        qw.eq(StringUtils.isNotBlank(zczxDto.getZxcjrjh()), "ZXCJRJH", zczxDto.getZxcjrjh());
+//        // 按要情编号查询
+//        qw.eq(StringUtils.isNotBlank(zczxDto.getYqbh()), "YQBH", zczxDto.getYqbh());
+//        // 按侦查专项创建时间查询
+//        qw.ge(null != zczxDto.getZxcjsj(), "ZXCJSJ", zczxDto.getZxcjsj());
+//        qw.le(null != zczxDto.getZxcjsj(), "ZXCJSJ", zczxDto.getZxcjsj());
+//        // 按侦查专项创建时间查询
+//        qw.ge(null != zczxDto.getZxcjsj(), "ZXCJSJ", zczxDto.getZxcjsj());
+//        qw.le(null != zczxDto.getZxcjsj(), "ZXCJSJ", zczxDto.getZxcjsj());
+
+
+    }
+
+
+}

service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxRoleController.java

+package com.founder.publicapi.controller.ZczxService;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.founder.commonutils.model.newPublicEntity.MapRestResult;
+import com.founder.commonutils.model.newPublicEntity.SysUser;
+import com.founder.commonutils.model.zczxEntity.ZczxRole;
+import com.founder.commonutils.model.zczxEntity.ZczxRoleDto;
+import com.founder.commonutils.util.KeyUtil;
+import com.founder.publicapi.service.ZczxRoleService;
+import com.founder.servicebase.logs.OperLog;
+import com.founder.servicebase.logs.OperationType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author Godffy
+ * @create 2023-06-16 10:06
+ */
+@CrossOrigin
+@RestController
+@RequestMapping("/zczxRole")
+@Api(tags = "侦查专项角色")
+public class ZczxRoleController {
+
+    @Resource
+    private ZczxRoleService zczxRoleService;
+
+    /**
+     * 1、侦查专项列表选择了角色就插入数据，参与状态变 “1”
+     * 2、侦查专项列表点击收藏，插入数据，收藏状态变“1“
+     * 3、新建侦查专项的时候，要将新建人的单位代码、单位名称传入该表，分页读取侦查专项列表要关联该表。
+     * 4、现有逻辑是若单位级别为分局，则分局以下的人都能看到，如果后面要改成精准查，就再加一个按钮和字段控制，只能精准匹配单位代码
+     * 5、点击分享按钮，将分享的指定单位代码插入到该表
+     * 6、“全镇街的”、“我辖区的”、“分享单位”，都是查该表的unitcode单位代码
+     * ps:
+     * 分组1_我参与的：警号（policemanid）、角色ID（roleId）、角色名字（roleName）、侦查专项参与状态（zczxCyzt）为一组查询
+     * 分组2_我收藏的：警号、侦查专项收藏状态为一组查询
+     * 分组3_我创建的：侦查专项表的警号为一组查询
+     * 分组4_全镇街的、我辖区的、分享：单位代码、单位名称为一组查询
+     *
+     * @param zczxRoleDto
+     * @return
+     */
+    @PostMapping("save")
+    @ApiOperation(value = "新增侦查专项角色信息")
+    @OperLog(message = "新增侦查专项角色信息", operation = OperationType.ADD)
+    @Transactional
+    public MapRestResult save(@RequestBody ZczxRoleDto zczxRoleDto) {
+        //当前登陆人的信息
+        ServletRequestAttributes requestAttributes =
+                (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = requestAttributes.getRequest();
+        SysUser user = (SysUser) request.getAttribute("user");
+        String policemanid = user.getPolicemanid();
+
+        ZczxRole zczxRole = new ZczxRole();
+        BeanUtil.copyProperties(zczxRoleDto, zczxRole);
+        String id = KeyUtil.getUUIDKey("ZXR");
+        //设置主键
+        zczxRole.setId(id);
+        //专项编号不能为空
+        if (StringUtils.isBlank(zczxRole.getZxbh())) {
+            return new MapRestResult().error("专项编号不能为空");
+        }
+        this.zczxRoleService.save(zczxRole);
+        return new MapRestResult();
+    }
+
+//    @PostMapping("selectOne")
+//    @ApiOperation(value = "查询专项角色信息")
+//    @OperLog(message = "查询专项角色信息", operation = OperationType.QUERY)
+//    public MapRestResult selectOne(@RequestBody ZczxRoleDto zczxRoleDto){
+//        QueryWrapper<ZczxRole> qw = new QueryWrapper<>();
+//        //专项编号
+//        qw.eq(StringUtils.isNotBlank(zczxRoleDto.getZxbh()),"zxbh",zczxRoleDto.getZxbh());
+//        //警号
+//        qw.eq(StringUtils.isNotBlank(zczxRoleDto.getPolicemanid()),"policemanid",zczxRoleDto.getPolicemanid());
+//        //参与状态
+//        qw.eq(StringUtils.isNotBlank(zczxRoleDto.getZczxCyzt()),"zczx_cyzt",zczxRoleDto.getZczxCyzt());
+//        ZczxRole one = this.zczxRoleService.getOne(qw);
+//        return new MapRestResult(200, "查询成功!", one);
+//    }
+
+
+
+
+}

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

+package com.founder.publicapi.mapper.mysqlMapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.founder.commonutils.model.zczxEntity.TbStAsjJq;
+
+/**
+ * @author Godffy
+ * @create 2023-06-06 14:39
+ */
+public interface AsjJqMapper extends BaseMapper<TbStAsjJq> {
+}

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

+package com.founder.publicapi.mapper.mysqlMapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.founder.commonutils.model.zczxEntity.TbStAsj;
+
+/**
+ * @author Godffy
+ * @create 2023-06-06 14:39
+ */
+public interface AsjMapper extends BaseMapper<TbStAsj> {
+}

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

+package com.founder.publicapi.mapper.mysqlMapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.founder.commonutils.model.zczxEntity.XcrwFile;
+
+/**
+ * @author Godffy
+ * @create 2023-06-12 09:48
+ */
+public interface XcrwFileMapper extends BaseMapper<XcrwFile> {
+}

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

+package com.founder.publicapi.mapper.mysqlMapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.founder.commonutils.model.zczxEntity.Xcrw;
+
+/**
+ * @author Godffy
+ * @create 2023-06-09 16:48
+ */
+public interface XcrwMapper extends BaseMapper<Xcrw> {
+}

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

+package com.founder.publicapi.mapper.mysqlMapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.founder.commonutils.model.zczxEntity.TbStYq;
+
+/**
+ * @author Godffy
+ * @create 2023-06-06 14:39
+ */
+public interface YqMapper extends BaseMapper<TbStYq> {
+}

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

+package com.founder.publicapi.mapper.mysqlMapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.founder.commonutils.model.zczxEntity.Zczx;
+import com.founder.commonutils.model.zczxEntity.ZczxDto;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author Godffy
+ * @create 2023-06-06 14:39
+ */
+public interface ZczxMapper extends BaseMapper<Zczx> {
+    //正常分页查询
+    IPage<Zczx> listZczxForPage(IPage<ZczxDto> page,@Param("zczxDto") ZczxDto zczxDto);
+
+    //我参与的
+    IPage<Zczx> listZczxForPageByCyzt(IPage<ZczxDto> page,@Param("zczxDto") ZczxDto zczxDto);
+
+    //我收藏的
+    IPage<Zczx> listZczxForPageBySczt(IPage<ZczxDto> page,@Param("zczxDto") ZczxDto zczxDto);
+
+    //根据机构查询
+    IPage<Zczx> listZczxForPageByCode(IPage<ZczxDto> page,@Param("zczxDto") ZczxDto zczxDto);
+}

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

+package com.founder.publicapi.mapper.mysqlMapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.founder.commonutils.model.zczxEntity.ZczxRole;
+
+/**
+ * @author Godffy
+ * @create 2023-06-16 10:33
+ */
+public interface ZczxRoleMapper extends BaseMapper<ZczxRole> {
+
+}

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/XcrwFileMapper.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.XcrwFileMapper">
+
+</mapper>

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/XcrwMapper.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.XcrwMapper">
+
+</mapper>

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ZczxMapper.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.ZczxMapper">
+
+    <select id="listZczxForPage" resultType="com.founder.commonutils.model.zczxEntity.Zczx"
+            parameterType="com.founder.commonutils.model.zczxEntity.ZczxDto">
+        select z.zxbh,
+        z.zxmc,
+        z.zxlysm,
+        z.zxkssj,
+        z.zxjssj,
+        z.zxcjsj,
+        z.zxcjdwdm,
+        z.zxcjdwmc,
+        z.zxcjr,
+        z.zxcjrjh,
+        z.sfzb_pdbz,
+        z.sftz_pdbz,
+        z.sfcba_pdbz,
+        z.sffqsjqbwh_pdbz,
+        z.sffqsjwjwh_pdbz,
+        z.sffqfjwh_pdbz,
+        z.sffqqtxc_pdbz,
+        z.gxsj,
+        z.xxsc_pdbz,
+        z.sfxj_pdbz,
+        z.sjqbwhbh,
+        z.sjwjwhbh,
+        z.sffqjzyp_pdbz,
+        z.jzypbh,
+        z.fjwhbh,
+        z.qtxcbh,
+        z.jqbh,
+        z.asjbh,
+        q.bjnr as jqJyqk,
+        j.ajmc,
+        j.jyaq as asjJyqk,
+        j.asjfssj_asjfskssj,
+        y.infoid as yqbh,
+        y.title as yqmc,
+        y.content as yqJyqk
+        from tb_wh_zczx z
+        left join tb_xw_asj_110jq q on z.jqbh = q.jjdbh
+        left join tb_st_asj j on z.asjbh = j.asjbh
+        left join tb_st_yq y on z.yqmc = y.title
+        where
+        1=1
+        <if test="zczxDto.zxbh!=null and zczxDto.zxbh!=''">
+            AND z.zxbh = #{zczxDto.zxbh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.zxmc!=null and zczxDto.zxmc!=''">
+            AND z.zxmc = #{zczxDto.zxmc , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.asjbh!=null and zczxDto.asjbh!=''">
+            AND z.asjbh = #{zczxDto.asjbh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.jqbh!=null and zczxDto.jqbh!=''">
+            AND z.jqbh = #{zczxDto.jqbh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.yqbh!=null and zczxDto.yqbh!=''">
+            AND z.yqbh = #{zczxDto.yqbh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.zxcjdwdm!=null and zczxDto.zxcjdwdm!=''">
+            AND z.zxcjdwdm = #{zczxDto.zxcjdwdm , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.zxcjdwdm!=null and zczxDto.zxcjdwdm!=''">
+            AND z.zxcjrjh = #{zczxDto.zxcjrjh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sftzPdbz!=null and zczxDto.sftzPdbz!=''">
+            AND z.sftz_pdbz = #{zczxDto.sftzPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sfzbPdbz!=null and zczxDto.sfzbPdbz!=''">
+            AND z.sfzb_pdbz = #{zczxDto.sfzbPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sfxjPdbz!=null and zczxDto.sfxjPdbz!=''">
+            AND z.sfxj_pdbz = #{zczxDto.sfxjPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sfcbaPdbz!=null and zczxDto.sfcbaPdbz!=''">
+            AND z.sfcba_pdbz = #{zczxDto.sfcbaPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqqtxcPdbz!=null and zczxDto.sffqqtxcPdbz!=''">
+            AND z.sffqqtxc_pdbz = #{zczxDto.sffqqtxcPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqsjwjwhPdbz!=null and zczxDto.sffqsjwjwhPdbz!=''">
+            AND z.sffqsjwjwh_pdbz = #{zczxDto.sffqsjwjwhPdbz, jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqsjqbwhPdbz!=null and zczxDto.sffqsjqbwhPdbz!=''">
+            AND z.sffqsjqbwh_pdbz = #{zczxDto.sffqsjqbwhPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqfjwhPdbz!=null and zczxDto.sffqfjwhPdbz!=''">
+            AND z.sffqfjwh_pdbz = #{zczxDto.sffqfjwhPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqjzypPdbz!=null and zczxDto.sffqjzypPdbz!=''">
+            AND z.sffqjzyp_pdbz = #{zczxDto.sffqjzypPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.yqmc!=null and zczxDto.yqmc!=''">
+            AND z.yqmc = #{zczxDto.yqmc , jdbcType=VARCHAR }
+        </if>
+        <choose>
+            <when test="zczxDto.zxcjsjKssj != null and zczxDto.zxcjsjJssj !=null">
+                AND z.zxcjsj between #{zczxDto.zxcjsjKssj} and #{zczxDto.zxcjsjJssj}
+            </when>
+            <when test="zczxDto.zxcjsjKssj != null and zczxDto.zxcjsjJssj ==null">
+                AND z.zxcjsj &gt;= #{zczxDto.zxcjsjKssj}
+            </when>
+            <when test="zczxDto.zxcjsjKssj == null and zczxDto.zxcjsjJssj !=null">
+                AND z.zxcjsj &lt;= #{zczxDto.zxcjsjJssj}
+            </when>
+        </choose>
+        <choose>
+            <when test="zczxDto.zxkssjKssj != null and zczxDto.zxkssjJssj !=null">
+                AND z.zxkssj between #{zczxDto.zxkssjKssj} and #{zczxDto.zxkssjJssj}
+            </when>
+            <when test="zczxDto.zxkssjKssj != null and zczxDto.zxkssjJssj ==null">
+                AND z.zxkssj &gt;= #{zczxDto.zxkssjKssj}
+            </when>
+            <when test="zczxDto.zxkssjKssj == null and zczxDto.zxkssjJssj !=null">
+                AND z.zxkssj &lt;= #{zczxDto.zxkssjJssj}
+            </when>
+        </choose>
+        <choose>
+            <when test="zczxDto.asjfssjAsjfskssjKssj != null and zczxDto.asjfssjAsjfskssjJssj !=null">
+                AND j.asjfssj_asjfskssj between #{zczxDto.asjfssjAsjfskssjKssj} and #{zczxDto.asjfssjAsjfskssjJssj}
+            </when>
+            <when test="zczxDto.asjfssjAsjfskssjKssj != null and zczxDto.asjfssjAsjfskssjJssj ==null">
+                AND j.asjfssj_asjfskssj &gt;= #{zczxDto.asjfssjAsjfskssjKssj}
+            </when>
+            <when test="zczxDto.asjfssjAsjfskssjKssj == null and zczxDto.asjfssjAsjfskssjJssj !=null">
+                AND j.asjfssj_asjfskssj &lt;= #{zczxDto.asjfssjAsjfskssjJssj}
+            </when>
+        </choose>
+    </select>
+
+    <select id="listZczxForPageByCyzt" resultType="com.founder.commonutils.model.zczxEntity.Zczx"
+            parameterType="com.founder.commonutils.model.zczxEntity.ZczxDto">
+        select z.zxbh,
+        z.zxmc,
+        z.zxlysm,
+        z.zxkssj,
+        z.zxjssj,
+        z.zxcjsj,
+        z.zxcjdwdm,
+        z.zxcjdwmc,
+        z.zxcjr,
+        z.zxcjrjh,
+        z.sfzb_pdbz,
+        z.sftz_pdbz,
+        z.sfcba_pdbz,
+        z.sffqsjqbwh_pdbz,
+        z.sffqsjwjwh_pdbz,
+        z.sffqfjwh_pdbz,
+        z.sffqqtxc_pdbz,
+        z.gxsj,
+        z.xxsc_pdbz,
+        z.sfxj_pdbz,
+        z.sjqbwhbh,
+        z.sjwjwhbh,
+        z.sffqjzyp_pdbz,
+        z.jzypbh,
+        z.fjwhbh,
+        z.qtxcbh,
+        z.jqbh,
+        z.asjbh,
+        q.bjnr as jqJyqk,
+        j.ajmc,
+        j.jyaq as asjJyqk,
+        j.asjfssj_asjfskssj,
+        y.infoid as yqbh,
+        y.title as yqmc,
+        y.content as yqJyqk,
+        r.role_id,
+        r.role_name,
+        r.zczx_cyzt,
+        r.zczx_sczt
+        from tb_wh_zczx z
+        left join tb_xw_asj_110jq q on z.jqbh = q.jjdbh
+        left join tb_st_asj j on z.asjbh = j.asjbh
+        left join tb_st_yq y on z.yqmc = y.title
+        left join tb_wh_zczx_role r on z.zxbh = r.zxbh
+        where
+        1=1
+        AND r.zczx_cyzt = '1'
+        <if test="zczxDto.zxdlrjh!=null and zczxDto.zxdlrjh!=''">
+            AND r.policemanid = #{zczxDto.zxdlrjh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.zxbh!=null and zczxDto.zxbh!=''">
+            AND z.zxbh = #{zczxDto.zxbh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.zxmc!=null and zczxDto.zxmc!=''">
+            AND z.zxmc = #{zczxDto.zxmc , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.asjbh!=null and zczxDto.asjbh!=''">
+            AND z.asjbh = #{zczxDto.asjbh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.jqbh!=null and zczxDto.jqbh!=''">
+            AND z.jqbh = #{zczxDto.jqbh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.yqbh!=null and zczxDto.yqbh!=''">
+            AND z.yqbh = #{zczxDto.yqbh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.zxcjdwdm!=null and zczxDto.zxcjdwdm!=''">
+            AND z.zxcjdwdm = #{zczxDto.zxcjdwdm , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.zxcjdwdm!=null and zczxDto.zxcjdwdm!=''">
+            AND z.zxcjrjh = #{zczxDto.zxcjrjh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sftzPdbz!=null and zczxDto.sftzPdbz!=''">
+            AND z.sftz_pdbz = #{zczxDto.sftzPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sfzbPdbz!=null and zczxDto.sfzbPdbz!=''">
+            AND z.sfzb_pdbz = #{zczxDto.sfzbPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sfxjPdbz!=null and zczxDto.sfxjPdbz!=''">
+            AND z.sfxj_pdbz = #{zczxDto.sfxjPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sfcbaPdbz!=null and zczxDto.sfcbaPdbz!=''">
+            AND z.sfcba_pdbz = #{zczxDto.sfcbaPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqqtxcPdbz!=null and zczxDto.sffqqtxcPdbz!=''">
+            AND z.sffqqtxc_pdbz = #{zczxDto.sffqqtxcPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqsjwjwhPdbz!=null and zczxDto.sffqsjwjwhPdbz!=''">
+            AND z.sffqsjwjwh_pdbz = #{zczxDto.sffqsjwjwhPdbz, jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqsjqbwhPdbz!=null and zczxDto.sffqsjqbwhPdbz!=''">
+            AND z.sffqsjqbwh_pdbz = #{zczxDto.sffqsjqbwhPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqfjwhPdbz!=null and zczxDto.sffqfjwhPdbz!=''">
+            AND z.sffqfjwh_pdbz = #{zczxDto.sffqfjwhPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqjzypPdbz!=null and zczxDto.sffqjzypPdbz!=''">
+            AND z.sffqjzyp_pdbz = #{zczxDto.sffqjzypPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.yqmc!=null and zczxDto.yqmc!=''">
+            AND z.yqmc = #{zczxDto.yqmc , jdbcType=VARCHAR }
+        </if>
+        <choose>
+            <when test="zczxDto.zxcjsjKssj != null and zczxDto.zxcjsjJssj !=null">
+                AND z.zxcjsj between #{zczxDto.zxcjsjKssj} and #{zczxDto.zxcjsjJssj}
+            </when>
+            <when test="zczxDto.zxcjsjKssj != null and zczxDto.zxcjsjJssj ==null">
+                AND z.zxcjsj &gt;= #{zczxDto.zxcjsjKssj}
+            </when>
+            <when test="zczxDto.zxcjsjKssj == null and zczxDto.zxcjsjJssj !=null">
+                AND z.zxcjsj &lt;= #{zczxDto.zxcjsjJssj}
+            </when>
+        </choose>
+        <choose>
+            <when test="zczxDto.zxkssjKssj != null and zczxDto.zxkssjJssj !=null">
+                AND z.zxkssj between #{zczxDto.zxkssjKssj} and #{zczxDto.zxkssjJssj}
+            </when>
+            <when test="zczxDto.zxkssjKssj != null and zczxDto.zxkssjJssj ==null">
+                AND z.zxkssj &gt;= #{zczxDto.zxkssjKssj}
+            </when>
+            <when test="zczxDto.zxkssjKssj == null and zczxDto.zxkssjJssj !=null">
+                AND z.zxkssj &lt;= #{zczxDto.zxkssjJssj}
+            </when>
+        </choose>
+        <choose>
+            <when test="zczxDto.asjfssjAsjfskssjKssj != null and zczxDto.asjfssjAsjfskssjJssj !=null">
+                AND j.asjfssj_asjfskssj between #{zczxDto.asjfssjAsjfskssjKssj} and #{zczxDto.asjfssjAsjfskssjJssj}
+            </when>
+            <when test="zczxDto.asjfssjAsjfskssjKssj != null and zczxDto.asjfssjAsjfskssjJssj ==null">
+                AND j.asjfssj_asjfskssj &gt;= #{zczxDto.asjfssjAsjfskssjKssj}
+            </when>
+            <when test="zczxDto.asjfssjAsjfskssjKssj == null and zczxDto.asjfssjAsjfskssjJssj !=null">
+                AND j.asjfssj_asjfskssj &lt;= #{zczxDto.asjfssjAsjfskssjJssj}
+            </when>
+        </choose>
+    </select>
+
+    <select id="listZczxForPageBySczt" resultType="com.founder.commonutils.model.zczxEntity.Zczx"
+            parameterType="com.founder.commonutils.model.zczxEntity.ZczxDto">
+        select z.zxbh,
+        z.zxmc,
+        z.zxlysm,
+        z.zxkssj,
+        z.zxjssj,
+        z.zxcjsj,
+        z.zxcjdwdm,
+        z.zxcjdwmc,
+        z.zxcjr,
+        z.zxcjrjh,
+        z.sfzb_pdbz,
+        z.sftz_pdbz,
+        z.sfcba_pdbz,
+        z.sffqsjqbwh_pdbz,
+        z.sffqsjwjwh_pdbz,
+        z.sffqfjwh_pdbz,
+        z.sffqqtxc_pdbz,
+        z.gxsj,
+        z.xxsc_pdbz,
+        z.sfxj_pdbz,
+        z.sjqbwhbh,
+        z.sjwjwhbh,
+        z.sffqjzyp_pdbz,
+        z.jzypbh,
+        z.fjwhbh,
+        z.qtxcbh,
+        z.jqbh,
+        z.asjbh,
+        q.bjnr as jqJyqk,
+        j.ajmc,
+        j.jyaq as asjJyqk,
+        j.asjfssj_asjfskssj,
+        y.infoid as yqbh,
+        y.title as yqmc,
+        y.content as yqJyqk,
+        r.role_id,
+        r.role_name,
+        r.zczx_cyzt,
+        r.zczx_sczt
+        from tb_wh_zczx z
+        left join tb_xw_asj_110jq q on z.jqbh = q.jjdbh
+        left join tb_st_asj j on z.asjbh = j.asjbh
+        left join tb_st_yq y on z.yqmc = y.title
+        left join tb_wh_zczx_role r on z.zxbh = r.zxbh
+        where
+        1=1
+        AND r.zczx_sczt = '1'
+        <if test="zczxDto.zxdlrjh!=null and zczxDto.zxdlrjh!=''">
+            AND r.policemanid = #{zczxDto.zxdlrjh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.zxbh!=null and zczxDto.zxbh!=''">
+            AND z.zxbh = #{zczxDto.zxbh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.zxmc!=null and zczxDto.zxmc!=''">
+            AND z.zxmc = #{zczxDto.zxmc , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.asjbh!=null and zczxDto.asjbh!=''">
+            AND z.asjbh = #{zczxDto.asjbh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.jqbh!=null and zczxDto.jqbh!=''">
+            AND z.jqbh = #{zczxDto.jqbh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.yqbh!=null and zczxDto.yqbh!=''">
+            AND z.yqbh = #{zczxDto.yqbh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.zxcjdwdm!=null and zczxDto.zxcjdwdm!=''">
+            AND z.zxcjdwdm = #{zczxDto.zxcjdwdm , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.zxcjdwdm!=null and zczxDto.zxcjdwdm!=''">
+            AND z.zxcjrjh = #{zczxDto.zxcjrjh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sftzPdbz!=null and zczxDto.sftzPdbz!=''">
+            AND z.sftz_pdbz = #{zczxDto.sftzPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sfzbPdbz!=null and zczxDto.sfzbPdbz!=''">
+            AND z.sfzb_pdbz = #{zczxDto.sfzbPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sfxjPdbz!=null and zczxDto.sfxjPdbz!=''">
+            AND z.sfxj_pdbz = #{zczxDto.sfxjPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sfcbaPdbz!=null and zczxDto.sfcbaPdbz!=''">
+            AND z.sfcba_pdbz = #{zczxDto.sfcbaPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqqtxcPdbz!=null and zczxDto.sffqqtxcPdbz!=''">
+            AND z.sffqqtxc_pdbz = #{zczxDto.sffqqtxcPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqsjwjwhPdbz!=null and zczxDto.sffqsjwjwhPdbz!=''">
+            AND z.sffqsjwjwh_pdbz = #{zczxDto.sffqsjwjwhPdbz, jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqsjqbwhPdbz!=null and zczxDto.sffqsjqbwhPdbz!=''">
+            AND z.sffqsjqbwh_pdbz = #{zczxDto.sffqsjqbwhPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqfjwhPdbz!=null and zczxDto.sffqfjwhPdbz!=''">
+            AND z.sffqfjwh_pdbz = #{zczxDto.sffqfjwhPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqjzypPdbz!=null and zczxDto.sffqjzypPdbz!=''">
+            AND z.sffqjzyp_pdbz = #{zczxDto.sffqjzypPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.yqmc!=null and zczxDto.yqmc!=''">
+            AND z.yqmc = #{zczxDto.yqmc , jdbcType=VARCHAR }
+        </if>
+        <choose>
+            <when test="zczxDto.zxcjsjKssj != null and zczxDto.zxcjsjJssj !=null">
+                AND z.zxcjsj between #{zczxDto.zxcjsjKssj} and #{zczxDto.zxcjsjJssj}
+            </when>
+            <when test="zczxDto.zxcjsjKssj != null and zczxDto.zxcjsjJssj ==null">
+                AND z.zxcjsj &gt;= #{zczxDto.zxcjsjKssj}
+            </when>
+            <when test="zczxDto.zxcjsjKssj == null and zczxDto.zxcjsjJssj !=null">
+                AND z.zxcjsj &lt;= #{zczxDto.zxcjsjJssj}
+            </when>
+        </choose>
+        <choose>
+            <when test="zczxDto.zxkssjKssj != null and zczxDto.zxkssjJssj !=null">
+                AND z.zxkssj between #{zczxDto.zxkssjKssj} and #{zczxDto.zxkssjJssj}
+            </when>
+            <when test="zczxDto.zxkssjKssj != null and zczxDto.zxkssjJssj ==null">
+                AND z.zxkssj &gt;= #{zczxDto.zxkssjKssj}
+            </when>
+            <when test="zczxDto.zxkssjKssj == null and zczxDto.zxkssjJssj !=null">
+                AND z.zxkssj &lt;= #{zczxDto.zxkssjJssj}
+            </when>
+        </choose>
+        <choose>
+            <when test="zczxDto.asjfssjAsjfskssjKssj != null and zczxDto.asjfssjAsjfskssjJssj !=null">
+                AND j.asjfssj_asjfskssj between #{zczxDto.asjfssjAsjfskssjKssj} and #{zczxDto.asjfssjAsjfskssjJssj}
+            </when>
+            <when test="zczxDto.asjfssjAsjfskssjKssj != null and zczxDto.asjfssjAsjfskssjJssj ==null">
+                AND j.asjfssj_asjfskssj &gt;= #{zczxDto.asjfssjAsjfskssjKssj}
+            </when>
+            <when test="zczxDto.asjfssjAsjfskssjKssj == null and zczxDto.asjfssjAsjfskssjJssj !=null">
+                AND j.asjfssj_asjfskssj &lt;= #{zczxDto.asjfssjAsjfskssjJssj}
+            </when>
+        </choose>
+    </select>
+
+    <select id="listZczxForPageByCode" resultType="com.founder.commonutils.model.zczxEntity.Zczx"
+            parameterType="com.founder.commonutils.model.zczxEntity.ZczxDto">
+        select z.zxbh,
+        z.zxmc,
+        z.zxlysm,
+        z.zxkssj,
+        z.zxjssj,
+        z.zxcjsj,
+        z.zxcjdwdm,
+        z.zxcjdwmc,
+        z.zxcjr,
+        z.zxcjrjh,
+        z.sfzb_pdbz,
+        z.sftz_pdbz,
+        z.sfcba_pdbz,
+        z.sffqsjqbwh_pdbz,
+        z.sffqsjwjwh_pdbz,
+        z.sffqfjwh_pdbz,
+        z.sffqqtxc_pdbz,
+        z.gxsj,
+        z.xxsc_pdbz,
+        z.sfxj_pdbz,
+        z.sjqbwhbh,
+        z.sjwjwhbh,
+        z.sffqjzyp_pdbz,
+        z.jzypbh,
+        z.fjwhbh,
+        z.qtxcbh,
+        z.jqbh,
+        z.asjbh,
+        q.bjnr as jqJyqk,
+        j.ajmc,
+        j.jyaq as asjJyqk,
+        j.asjfssj_asjfskssj,
+        y.infoid as yqbh,
+        y.title as yqmc,
+        y.content as yqJyqk
+        from tb_wh_zczx z
+        left join tb_xw_asj_110jq q on z.jqbh = q.jjdbh
+        left join tb_st_asj j on z.asjbh = j.asjbh
+        left join tb_st_yq y on z.yqmc = y.title
+        left join tb_wh_zczx_role r on z.zxbh = r.zxbh
+        where
+        1=1
+        <if test="zczxDto.cxlx!=null and zczxDto.cxlx=='2'.toString()">
+            AND r.unitcode like #{zczxDto.unitcode , jdbcType=VARCHAR } ||'%'
+        </if>
+        <if test="zczxDto.cxlx!=null and zczxDto.cxlx=='3'.toString()">
+            AND r.unitcode = #{zczxDto.unitcode , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.cxlx!=null and zczxDto.cxlx=='6'.toString()">
+            AND r.zczx_fxzt = '1'
+        </if>
+        <if test="zczxDto.cxlx!=null and zczxDto.cxlx=='7'.toString()">
+            AND r.zczx_fxzt = '1'
+            AND r.policemanid = #{zczxDto.zxdlrjh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.zxbh!=null and zczxDto.zxbh!=''">
+            AND z.zxbh = #{zczxDto.zxbh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.zxmc!=null and zczxDto.zxmc!=''">
+            AND z.zxmc = #{zczxDto.zxmc , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.asjbh!=null and zczxDto.asjbh!=''">
+            AND z.asjbh = #{zczxDto.asjbh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.jqbh!=null and zczxDto.jqbh!=''">
+            AND z.jqbh = #{zczxDto.jqbh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.yqbh!=null and zczxDto.yqbh!=''">
+            AND z.yqbh = #{zczxDto.yqbh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.zxcjdwdm!=null and zczxDto.zxcjdwdm!=''">
+            AND z.zxcjdwdm = #{zczxDto.zxcjdwdm , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.zxcjdwdm!=null and zczxDto.zxcjdwdm!=''">
+            AND z.zxcjrjh = #{zczxDto.zxcjrjh , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sftzPdbz!=null and zczxDto.sftzPdbz!=''">
+            AND z.sftz_pdbz = #{zczxDto.sftzPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sfzbPdbz!=null and zczxDto.sfzbPdbz!=''">
+            AND z.sfzb_pdbz = #{zczxDto.sfzbPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sfxjPdbz!=null and zczxDto.sfxjPdbz!=''">
+            AND z.sfxj_pdbz = #{zczxDto.sfxjPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sfcbaPdbz!=null and zczxDto.sfcbaPdbz!=''">
+            AND z.sfcba_pdbz = #{zczxDto.sfcbaPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqqtxcPdbz!=null and zczxDto.sffqqtxcPdbz!=''">
+            AND z.sffqqtxc_pdbz = #{zczxDto.sffqqtxcPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqsjwjwhPdbz!=null and zczxDto.sffqsjwjwhPdbz!=''">
+            AND z.sffqsjwjwh_pdbz = #{zczxDto.sffqsjwjwhPdbz, jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqsjqbwhPdbz!=null and zczxDto.sffqsjqbwhPdbz!=''">
+            AND z.sffqsjqbwh_pdbz = #{zczxDto.sffqsjqbwhPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqfjwhPdbz!=null and zczxDto.sffqfjwhPdbz!=''">
+            AND z.sffqfjwh_pdbz = #{zczxDto.sffqfjwhPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.sffqjzypPdbz!=null and zczxDto.sffqjzypPdbz!=''">
+            AND z.sffqjzyp_pdbz = #{zczxDto.sffqjzypPdbz , jdbcType=VARCHAR }
+        </if>
+        <if test="zczxDto.yqmc!=null and zczxDto.yqmc!=''">
+            AND z.yqmc = #{zczxDto.yqmc , jdbcType=VARCHAR }
+        </if>
+        <choose>
+            <when test="zczxDto.zxcjsjKssj != null and zczxDto.zxcjsjJssj !=null">
+                AND z.zxcjsj between #{zczxDto.zxcjsjKssj} and #{zczxDto.zxcjsjJssj}
+            </when>
+            <when test="zczxDto.zxcjsjKssj != null and zczxDto.zxcjsjJssj ==null">
+                AND z.zxcjsj &gt;= #{zczxDto.zxcjsjKssj}
+            </when>
+            <when test="zczxDto.zxcjsjKssj == null and zczxDto.zxcjsjJssj !=null">
+                AND z.zxcjsj &lt;= #{zczxDto.zxcjsjJssj}
+            </when>
+        </choose>
+        <choose>
+            <when test="zczxDto.zxkssjKssj != null and zczxDto.zxkssjJssj !=null">
+                AND z.zxkssj between #{zczxDto.zxkssjKssj} and #{zczxDto.zxkssjJssj}
+            </when>
+            <when test="zczxDto.zxkssjKssj != null and zczxDto.zxkssjJssj ==null">
+                AND z.zxkssj &gt;= #{zczxDto.zxkssjKssj}
+            </when>
+            <when test="zczxDto.zxkssjKssj == null and zczxDto.zxkssjJssj !=null">
+                AND z.zxkssj &lt;= #{zczxDto.zxkssjJssj}
+            </when>
+        </choose>
+        <choose>
+            <when test="zczxDto.asjfssjAsjfskssjKssj != null and zczxDto.asjfssjAsjfskssjJssj !=null">
+                AND j.asjfssj_asjfskssj between #{zczxDto.asjfssjAsjfskssjKssj} and #{zczxDto.asjfssjAsjfskssjJssj}
+            </when>
+            <when test="zczxDto.asjfssjAsjfskssjKssj != null and zczxDto.asjfssjAsjfskssjJssj ==null">
+                AND j.asjfssj_asjfskssj &gt;= #{zczxDto.asjfssjAsjfskssjKssj}
+            </when>
+            <when test="zczxDto.asjfssjAsjfskssjKssj == null and zczxDto.asjfssjAsjfskssjJssj !=null">
+                AND j.asjfssj_asjfskssj &lt;= #{zczxDto.asjfssjAsjfskssjJssj}
+            </when>
+        </choose>
+    </select>
+
+
+</mapper>

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ZczxRoleMapper.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.ZczxRoleMapper">
+
+</mapper>

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

+package com.founder.publicapi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.founder.commonutils.model.zczxEntity.TbStAsjJq;
+
+/**
+ * @author Godffy
+ * @create 2023-06-09 9:59
+ */
+public interface AsjJqService extends IService<TbStAsjJq> {
+}

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

+package com.founder.publicapi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.founder.commonutils.model.zczxEntity.TbStAsj;
+
+/**
+ * @author Godffy
+ * @create 2023-06-09 9:59
+ */
+public interface AsjService extends IService<TbStAsj> {
+}

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

+package com.founder.publicapi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.founder.commonutils.model.zczxEntity.XcrwFile;
+
+/**
+ * @author Godffy
+ * @create 2023-06-12 09:48
+ */
+public interface XcrwFileService extends IService<XcrwFile> {
+
+
+}

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

+package com.founder.publicapi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.founder.commonutils.model.zczxEntity.Xcrw;
+
+/**
+ * @author Godffy
+ * @create 2023-06-09 16:48
+ */
+public interface XcrwService extends IService<Xcrw> {
+
+
+}

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

+package com.founder.publicapi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.founder.commonutils.model.zczxEntity.TbStYq;
+
+/**
+ * @author Godffy
+ * @create 2023-06-09 9:59
+ */
+public interface YqService extends IService<TbStYq> {
+}

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

+package com.founder.publicapi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.founder.commonutils.model.zczxEntity.ZczxRole;
+
+/**
+ * @author Godffy
+ * @create 2023-06-16 10:26
+ */
+public interface ZczxRoleService extends IService<ZczxRole> {
+}

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

+package com.founder.publicapi.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.founder.commonutils.model.zczxEntity.Zczx;
+import com.founder.commonutils.model.zczxEntity.ZczxDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author Godffy
+ * @create 2023-06-06 10:01
+ */
+public interface ZczxService extends IService<Zczx> {
+
+    IPage<Zczx> listZczxForPage(IPage<ZczxDto> page,@Param("zczxDto") ZczxDto zczxDto);
+
+}

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

+package com.founder.publicapi.service.serviceimpl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.founder.commonutils.model.zczxEntity.TbStAsjJq;
+import com.founder.publicapi.mapper.mysqlMapper.AsjJqMapper;
+import com.founder.publicapi.service.AsjJqService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Godffy
+ * @create 2023-06-06 14:36
+ */
+@Service
+public class AsjJqServiceImpl extends ServiceImpl<AsjJqMapper, TbStAsjJq> implements AsjJqService {
+
+}

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

+package com.founder.publicapi.service.serviceimpl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.founder.commonutils.model.zczxEntity.TbStAsj;
+import com.founder.publicapi.mapper.mysqlMapper.AsjMapper;
+import com.founder.publicapi.service.AsjService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Godffy
+ * @create 2023-06-06 14:36
+ */
+@Service
+public class AsjServiceImpl extends ServiceImpl<AsjMapper, TbStAsj> implements AsjService {
+
+}

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

+package com.founder.publicapi.service.serviceimpl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.founder.commonutils.model.zczxEntity.XcrwFile;
+import com.founder.publicapi.mapper.mysqlMapper.XcrwFileMapper;
+import com.founder.publicapi.service.XcrwFileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Godffy
+ * @create 2023-06-12 09:48
+ */
+@Service
+public class XcrwFileServiceImpl extends ServiceImpl<XcrwFileMapper, XcrwFile> implements XcrwFileService {
+
+    @Autowired
+    private XcrwFileMapper xcrwFileMapper;
+
+
+}

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

+package com.founder.publicapi.service.serviceimpl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.founder.commonutils.model.zczxEntity.Xcrw;
+import com.founder.publicapi.mapper.mysqlMapper.XcrwMapper;
+import com.founder.publicapi.service.XcrwService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Godffy
+ * @create 2023-06-09 16:48
+ */
+@Service
+public class XcrwServiceImpl extends ServiceImpl<XcrwMapper, Xcrw> implements XcrwService {
+
+    @Autowired
+    private XcrwMapper xcrwMapper;
+
+
+}

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

+package com.founder.publicapi.service.serviceimpl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.founder.commonutils.model.zczxEntity.TbStYq;
+import com.founder.publicapi.mapper.mysqlMapper.YqMapper;
+import com.founder.publicapi.service.YqService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Godffy
+ * @create 2023-06-06 14:36
+ */
+@Service
+public class YqServiceImpl extends ServiceImpl<YqMapper, TbStYq> implements YqService {
+
+}

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

+package com.founder.publicapi.service.serviceimpl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.founder.commonutils.model.zczxEntity.ZczxRole;
+import com.founder.publicapi.mapper.mysqlMapper.ZczxRoleMapper;
+import com.founder.publicapi.service.ZczxRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Godffy
+ * @create 2023-06-16 10:32
+ */
+@Service
+public class ZczxRoleServiceImpl extends ServiceImpl<ZczxRoleMapper, ZczxRole> implements ZczxRoleService {
+
+    @Autowired
+    private ZczxRoleMapper zczxRoleMapper;
+
+}

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

+package com.founder.publicapi.service.serviceimpl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.founder.commonutils.model.newPublicEntity.SysUser;
+import com.founder.commonutils.model.zczxEntity.Zczx;
+import com.founder.commonutils.model.zczxEntity.ZczxDto;
+import com.founder.commonutils.model.zczxEntity.ZczxRole;
+import com.founder.publicapi.mapper.mysqlMapper.ZczxMapper;
+import com.founder.publicapi.mapper.mysqlMapper.ZczxRoleMapper;
+import com.founder.publicapi.service.ZczxService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @author Godffy
+ * @create 2023-06-06 14:36
+ */
+@Service
+public class ZczxServiceImpl extends ServiceImpl<ZczxMapper, Zczx> implements ZczxService {
+
+    @Autowired
+    private ZczxMapper zczxMapper;
+
+    @Autowired
+    private ZczxRoleMapper zczxRoleMapper;
+
+    @Override
+    public IPage<Zczx> listZczxForPage(IPage<ZczxDto> page, ZczxDto zczxDto) {
+        //当前登陆人的信息
+        ServletRequestAttributes requestAttributes =
+                (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = requestAttributes.getRequest();
+        SysUser user = (SysUser) request.getAttribute("user");
+        String policemanid = user.getPolicemanid();
+        String unitcode = user.getUnitcode();//机构代码
+        /**
+         * 分组1_我参与的：警号（policemanid）、角色ID（roleId）、角色名字（roleName）、侦查专项参与状态（zczxCyzt）为一组查询
+         * 分组2_我收藏的：警号、侦查专项收藏状态为一组查询
+         * 分组3_我创建的：侦查专项表的警号为一组查询
+         * 分组4_全镇街的、我辖区的、分享：单位代码、单位名称为一组查询
+         */
+        /**
+         * 查询类型（cxlx）
+         * 1：我参与的
+         * 2：全镇街的（查出来的机构代码中,若当前登陆账号的机构属于其中或其中以下，把该机构代码及以下层级的侦查专项查出来）
+         * 3：我辖区的（查出来的机构代码中，若等于等钱登陆账号的机构，把该机构代码匹上的侦查专项查出来）
+         * 4：我创建的
+         * 5：我收藏的
+         * 6：其他分享的（查出来的机构代码中，排除当前自己登陆账号的机构，把其他机构匹配得上的侦查专项查出来）
+         */
+        //我参与的,必传登录人警号(zxdlrjh)、侦查专项_参与状态(zczxCyzt)
+        if (StringUtils.isNotBlank(zczxDto.getCxlx()) && "1".equals(zczxDto.getCxlx()) && StringUtils.isNotBlank(policemanid)) {
+            zczxDto.setZxdlrjh(policemanid);//设置查询的登录人警号
+            zczxDto.setZczxCyzt("1");
+            IPage<Zczx> result = this.zczxMapper.listZczxForPageByCyzt(page, zczxDto);
+            //参与的数据查出来后要遍历查询收藏状态
+            List<Zczx> records = result.getRecords();
+            for (int i = 0; i < records.size(); i++) {
+                Zczx zczx = records.get(i);
+                String zxbh = zczx.getZxbh();
+                //收藏状态
+                QueryWrapper<ZczxRole> qw = new QueryWrapper<>();
+                qw.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
+                qw.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
+                qw.eq("zczx_sczt", "1");
+                ZczxRole sczt = zczxRoleMapper.selectOne(qw);
+                if (sczt != null) {
+                    zczx.setZczxSczt(sczt.getZczxSczt());
+                }
+                records.set(i, zczx);
+            }
+            result.setRecords(records);
+            return result;
+        }
+        //我收藏的,必传登录人警号(zxdlrjh)、侦查专项_收藏状态(zczxSczt)
+        if (StringUtils.isNotBlank(zczxDto.getCxlx()) && "5".equals(zczxDto.getCxlx()) && StringUtils.isNotBlank(policemanid)) {
+            zczxDto.setZxdlrjh(policemanid);//设置查询的登录人警号
+            zczxDto.setZczxSczt("1");
+            IPage<Zczx> zczxIPage = this.zczxMapper.listZczxForPageBySczt(page, zczxDto);
+            //收藏的数据查出来后要遍历拿到当前登陆用户看到的侦查专项绑定的角色
+            List<Zczx> records = zczxIPage.getRecords();
+            for (int i = 0; i < records.size(); i++) {
+                Zczx zczx = records.get(i);
+                String zxbh = zczx.getZxbh();
+                QueryWrapper<ZczxRole> qw = new QueryWrapper<>();
+                //专项编号
+                qw.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
+                //警号
+                qw.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
+                //参与状态
+                qw.eq("zczx_cyzt", "1");
+                ZczxRole zczxRole = zczxRoleMapper.selectOne(qw);
+                if (zczxRole != null) {
+                    zczx.setRoleId(zczxRole.getRoleId());
+                    zczx.setRoleName(zczxRole.getRoleName());
+                    records.set(i, zczx);
+                }
+            }
+            zczxIPage.setRecords(records);
+            return zczxIPage;
+        }
+        //我创建的,必传警号,查侦查专项表(tb_wh_zczx),然后关联参与、收藏状态
+        if (StringUtils.isNotBlank(zczxDto.getCxlx()) && "4".equals(zczxDto.getCxlx()) && StringUtils.isNotBlank(policemanid)) {
+            zczxDto.setZxcjrjh(policemanid);
+            IPage<Zczx> result = this.zczxMapper.listZczxForPage(page, zczxDto);
+            //遍历参与状态、收藏状态
+            List<Zczx> records = result.getRecords();
+            for (int i = 0; i < records.size(); i++) {
+                Zczx zczx = records.get(i);
+                String zxbh = zczx.getZxbh();
+                //参与状态
+                QueryWrapper<ZczxRole> qw = new QueryWrapper<>();
+                qw.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
+                qw.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
+                qw.eq("zczx_cyzt", "1");
+                ZczxRole cyzt = zczxRoleMapper.selectOne(qw);
+                if (cyzt != null) {
+                    zczx.setZczxCyzt(cyzt.getZczxCyzt());
+                    zczx.setRoleId(cyzt.getRoleId());
+                    zczx.setRoleName(cyzt.getRoleName());
+                }
+                //收藏状态
+                QueryWrapper<ZczxRole> qw2 = new QueryWrapper<>();
+                qw2.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
+                qw2.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
+                qw2.eq("zczx_sczt", "1");
+                ZczxRole sczt = zczxRoleMapper.selectOne(qw2);
+                if (sczt != null) {
+                    zczx.setZczxSczt(sczt.getZczxSczt());
+                }
+                records.set(i, zczx);
+            }
+            result.setRecords(records);
+            return result;
+        }
+        /**
+         * 全镇街的,登录人的单位代码,截前6位就是分局级别
+         * 我辖区的，登录人的单位代码精准查
+         */
+        if (StringUtils.isNotBlank(zczxDto.getCxlx()) && "2".equals(zczxDto.getCxlx()) || StringUtils.isNotBlank(zczxDto.getCxlx()) && "3".equals(zczxDto.getCxlx())) {
+            String s = unitcode;
+            //全镇街的
+            if ("2".equals(zczxDto.getCxlx())) {
+                s = unitcode.substring(0, 6);
+                zczxDto.setUnitcode(s);
+            }
+            //我辖区的
+            if ("3".equals(zczxDto.getCxlx())) {
+                zczxDto.setUnitcode(s);
+            }
+            IPage<Zczx> result = this.zczxMapper.listZczxForPageByCode(page, zczxDto);
+            List<Zczx> records = result.getRecords();
+            for (int i = 0; i < records.size(); i++) {
+                Zczx zczx = records.get(i);
+                String zxbh = zczx.getZxbh();
+                //参与状态
+                QueryWrapper<ZczxRole> qw = new QueryWrapper<>();
+                qw.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
+                qw.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
+                qw.eq("zczx_cyzt", "1");
+                ZczxRole cyzt = zczxRoleMapper.selectOne(qw);
+                if (cyzt != null) {
+                    zczx.setZczxCyzt(cyzt.getZczxCyzt());
+                    zczx.setRoleId(cyzt.getRoleId());
+                    zczx.setRoleName(cyzt.getRoleName());
+                }
+                //收藏状态
+                QueryWrapper<ZczxRole> qw2 = new QueryWrapper<>();
+                qw2.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
+                qw2.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
+                qw2.eq("zczx_sczt", "1");
+                ZczxRole sczt = zczxRoleMapper.selectOne(qw2);
+                if (sczt != null) {
+                    zczx.setZczxSczt(sczt.getZczxSczt());
+                }
+                records.set(i, zczx);
+            }
+            result.setRecords(records);
+            return result;
+        }
+        /**
+         * 分享
+         * 1：某侦查专项分享给指定分局（侦查专项编号、侦查专项分享状态zczx_fxzt、机构代码、机构名称）
+         * 2：某侦查专项分享给指定某个人（侦查专项编号、侦查专项分享状态zczx_fxzt、警号）
+         */
+        if (StringUtils.isNotBlank(zczxDto.getCxlx()) && "6".equals(zczxDto.getCxlx())) {
+            //机构代码前6位是分局单位
+            String s = "";
+            s = unitcode.substring(0, 6);
+            zczxDto.setUnitcode(s);
+            IPage<Zczx> result = this.zczxMapper.listZczxForPageByCode(page, zczxDto);
+            List<Zczx> records = result.getRecords();
+            for (int i = 0; i < records.size(); i++) {
+                Zczx zczx = records.get(i);
+                String zxbh = zczx.getZxbh();
+                //参与状态
+                QueryWrapper<ZczxRole> qw = new QueryWrapper<>();
+                qw.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
+                qw.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
+                qw.eq("zczx_cyzt", "1");
+                ZczxRole cyzt = zczxRoleMapper.selectOne(qw);
+                if (cyzt != null) {
+                    zczx.setZczxCyzt(cyzt.getZczxCyzt());
+                    zczx.setRoleId(cyzt.getRoleId());
+                    zczx.setRoleName(cyzt.getRoleName());
+                }
+                //收藏状态
+                QueryWrapper<ZczxRole> qw2 = new QueryWrapper<>();
+                qw2.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
+                qw2.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
+                qw2.eq("zczx_sczt", "1");
+                ZczxRole sczt = zczxRoleMapper.selectOne(qw2);
+                if (sczt != null) {
+                    zczx.setZczxSczt(sczt.getZczxSczt());
+                }
+                records.set(i, zczx);
+            }
+            result.setRecords(records);
+            return result;
+        }
+        //分享至本人的
+        if (StringUtils.isNotBlank(zczxDto.getCxlx()) && "7".equals(zczxDto.getCxlx()) && StringUtils.isNotBlank(policemanid)) {
+            zczxDto.setZxdlrjh(policemanid);
+            IPage<Zczx> result = this.zczxMapper.listZczxForPageByCode(page, zczxDto);
+            List<Zczx> records = result.getRecords();
+            for (int i = 0; i < records.size(); i++) {
+                Zczx zczx = records.get(i);
+                String zxbh = zczx.getZxbh();
+                //参与状态
+                QueryWrapper<ZczxRole> qw = new QueryWrapper<>();
+                qw.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
+                qw.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
+                qw.eq("zczx_cyzt", "1");
+                ZczxRole cyzt = zczxRoleMapper.selectOne(qw);
+                if (cyzt != null) {
+                    zczx.setZczxCyzt(cyzt.getZczxCyzt());
+                    zczx.setRoleId(cyzt.getRoleId());
+                    zczx.setRoleName(cyzt.getRoleName());
+                }
+                //收藏状态
+                QueryWrapper<ZczxRole> qw2 = new QueryWrapper<>();
+                qw2.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
+                qw2.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
+                qw2.eq("zczx_sczt", "1");
+                ZczxRole sczt = zczxRoleMapper.selectOne(qw2);
+                if (sczt != null) {
+                    zczx.setZczxSczt(sczt.getZczxSczt());
+                }
+                records.set(i, zczx);
+            }
+            result.setRecords(records);
+            return result;
+        }
+        return null;
+//        //默认查询获取分页数据
+//        IPage<Zczx> result = this.zczxMapper.listZczxForPage(page, zczxDto);
+//        //数据查出来后要遍历拿到当前登陆用户看到的侦查专项绑定的角色
+//        List<Zczx> records = result.getRecords();
+//        for (int i = 0; i < records.size(); i++) {
+//            Zczx zczx = records.get(i);
+//            String zxbh = zczx.getZxbh();
+//            QueryWrapper<ZczxRole> qw = new QueryWrapper<>();
+//            //专项编号
+//            qw.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
+//            //警号
+//            qw.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
+//            //参与状态
+//            qw.eq("zczx_cyzt", "1");
+//            ZczxRole zczxRole = zczxRoleMapper.selectOne(qw);
+//            if (zczxRole != null) {
+//                zczx.setRoleId(zczxRole.getRoleId());
+//                zczx.setRoleName(zczxRole.getRoleName());
+//                records.set(i, zczx);
+//            }
+//        }
+//        result.setRecords(records);
+//        return result;
+    }
+
+}

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

@@ -8,26 +8,41 @@ logging.level.root=INFO
 #mybatis???
 #mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
-#mysql?????????
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.xzxtdb.url=ENC(T0NmBjW9iRM92xTRkj5iTWDkIMeqdHcsi2nsP6Ro6bYDNwGVDGDCqtpZrxg9SYL3RlpDyIvbS5R2uXxn702du4YNbolcvEbEWL+QCeJN7mwldnIHfF1xr7e/2TuD1QnlMg/Hhi9xBGymzDb0T2wdoT954YtUwhIa8eJQ5E6QAGk=)
-#spring.datasource.xzxtdb.username=ENC(x4Dk5STviTUvoo3r+p7cFQ==)
-#spring.datasource.xzxtdb.password=ENC(tVUXCj15Zc7cT5Jpz5LRKg==)
-spring.datasource.xzxtdb.url=ENC(Y1dXm7lJCGbPffW6Pbg/Uid1UK2Z1Tu2TNdp9AgqT/iXb4hNRriak+glPXYD6BnO4fQwN9Sj/zguByboO4FagHEQRN0tE57RI6rJEUeTt2JHb1rc2BG1wE9QPK96E5o9K/1TSAjnD/Rr2eAxy11tFLL2fQP35EOX)
-spring.datasource.xzxtdb.username=ENC(e7qsvm7EnrdHG04YnaTMsw==)
-spring.datasource.xzxtdb.password=ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
+spring.datasource.xzxtdb.driver-class-name=oracle.jdbc.driver.OracleDriver
+spring.datasource.xzxtdb.url=ENC(Nb+P9CS/i1D+5Tb2AtSDTu5AMH+Lzvr3xpmOz9p8Et5HTbWFHzqo/tSt0kydLARJIlvLqCRuwPE=)
+spring.datasource.xzxtdb.username=ENC(yITtMpDU9iFa7spyahMKPQ==)
+spring.datasource.xzxtdb.password=ENC(fVPAdBUhJ4IEnVCVkM5BbA==)
 spring.datasource.xzxtdb.type=com.alibaba.druid.pool.DruidDataSource
 
-#oracle?????????(?????)
-spring.datasource.oracledb.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.oracledb.url=ENC(T0NmBjW9iRM92xTRkj5iTWDkIMeqdHcsi2nsP6Ro6bYDNwGVDGDCqtpZrxg9SYL3RlpDyIvbS5R2uXxn702du4YNbolcvEbEWL+QCeJN7mwldnIHfF1xr7e/2TuD1QnlMg/Hhi9xBGymzDb0T2wdoT954YtUwhIa8eJQ5E6QAGk=)
-#spring.datasource.oracledb.username=ENC(x4Dk5STviTUvoo3r+p7cFQ==)
-#spring.datasource.oracledb.password=ENC(tVUXCj15Zc7cT5Jpz5LRKg==)
-spring.datasource.oracledb.url=ENC(Y1dXm7lJCGbPffW6Pbg/Uid1UK2Z1Tu2TNdp9AgqT/iXb4hNRriak+glPXYD6BnO4fQwN9Sj/zguByboO4FagHEQRN0tE57RI6rJEUeTt2JHb1rc2BG1wE9QPK96E5o9K/1TSAjnD/Rr2eAxy11tFLL2fQP35EOX)
-spring.datasource.oracledb.username=ENC(e7qsvm7EnrdHG04YnaTMsw==)
-spring.datasource.oracledb.password=ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
+spring.datasource.oracledb.driver-class-name=oracle.jdbc.driver.OracleDriver
+spring.datasource.oracledb.url=ENC(Nb+P9CS/i1D+5Tb2AtSDTu5AMH+Lzvr3xpmOz9p8Et5HTbWFHzqo/tSt0kydLARJIlvLqCRuwPE=)
+spring.datasource.oracledb.username=ENC(yITtMpDU9iFa7spyahMKPQ==)
+spring.datasource.oracledb.password=ENC(fVPAdBUhJ4IEnVCVkM5BbA==)
 spring.datasource.oracledb.type=com.alibaba.druid.pool.DruidDataSource
 
+#spring.datasource.oracledb.driver-class-name=oracle.jdbc.driver.OracleDriver
+#spring.datasource.oracledb.url=ENC(Nb+P9CS/i1D+5Tb2AtSDTu5AMH+Lzvr3xpmOz9p8Et5HTbWFHzqo/tSt0kydLARJIlvLqCRuwPE=)
+#spring.datasource.oracledb.username=ENC(yITtMpDU9iFa7spyahMKPQ==)
+#spring.datasource.oracledb.password=ENC(fVPAdBUhJ4IEnVCVkM5BbA==)
+#spring.datasource.oracledb.type=com.alibaba.druid.pool.DruidDataSource
+
+#mysql?????????
+#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+##spring.datasource.xzxtdb.url=ENC(T0NmBjW9iRM92xTRkj5iTWDkIMeqdHcsi2nsP6Ro6bYDNwGVDGDCqtpZrxg9SYL3RlpDyIvbS5R2uXxn702du4YNbolcvEbEWL+QCeJN7mwldnIHfF1xr7e/2TuD1QnlMg/Hhi9xBGymzDb0T2wdoT954YtUwhIa8eJQ5E6QAGk=)
+##spring.datasource.xzxtdb.username=ENC(x4Dk5STviTUvoo3r+p7cFQ==)
+##spring.datasource.xzxtdb.password=ENC(tVUXCj15Zc7cT5Jpz5LRKg==)
+#spring.datasource.xzxtdb.url=ENC(Y1dXm7lJCGbPffW6Pbg/Uid1UK2Z1Tu2TNdp9AgqT/iXb4hNRriak+glPXYD6BnO4fQwN9Sj/zguByboO4FagHEQRN0tE57RI6rJEUeTt2JHb1rc2BG1wE9QPK96E5o9K/1TSAjnD/Rr2eAxy11tFLL2fQP35EOX)
+#spring.datasource.xzxtdb.username=ENC(e7qsvm7EnrdHG04YnaTMsw==)
+#spring.datasource.xzxtdb.password=ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
+#spring.datasource.xzxtdb.type=com.alibaba.druid.pool.DruidDataSource
+
+#oracle?????????(?????)
+#spring.datasource.oracledb.driver-class-name=com.mysql.cj.jdbc.Driver
+#spring.datasource.oracledb.url=ENC(Y1dXm7lJCGbPffW6Pbg/Uid1UK2Z1Tu2TNdp9AgqT/iXb4hNRriak+glPXYD6BnO4fQwN9Sj/zguByboO4FagHEQRN0tE57RI6rJEUeTt2JHb1rc2BG1wE9QPK96E5o9K/1TSAjnD/Rr2eAxy11tFLL2fQP35EOX)
+#spring.datasource.oracledb.username=ENC(e7qsvm7EnrdHG04YnaTMsw==)
+#spring.datasource.oracledb.password=ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
+#spring.datasource.oracledb.type=com.alibaba.druid.pool.DruidDataSource
+
 #redis
 spring.redis.host=47.92.225.109
 spring.redis.port=3001
@@ -102,7 +117,7 @@ management.health.mail.enabled=false
 #\u516C\u5F00\u6240\u6709\u7AEF\u70B9web\u63A5\u53E3
 management.endpoints.web.exposure.include=*
 #\u670D\u52A1\u7AEFadmin-server\u5730\u5740\uFF0C\u4EE5\u53CA\u767B\u5F55\u8D26\u53F7\u3001\u5BC6\u7801
-spring.boot.admin.client.url=http://47.92.48.137:10010
+spring.boot.admin.client.url=http://192.168.121.1:10010
 spring.boot.admin.client.username=admin
 spring.boot.admin.client.password=admin
 #spring.boot.admin.monitor.default-timeout=30000
@@ -112,13 +127,14 @@ management.endpoint.logfile.enabled=true
 management.endpoint.logfile.external-file= /data2/skglpt/publicapi1003.log
 
 #\u662F\u5426\u5F00\u542Fpowerjob
-powerjob.worker.enabled=true
+powerjob.worker.enabled=false
 # akka \u5DE5\u4F5C\u7AEF\u53E3\uFF0C\u53EF\u9009\uFF0C\u9ED8\u8BA4 27778
 powerjob.worker.akka-port=27778
 # \u63A5\u5165\u5E94\u7528\u540D\u79F0\uFF0C\u7528\u4E8E\u5206\u7EC4\u9694\u79BB\uFF0C\u63A8\u8350\u586B\u5199 \u672C Java \u9879\u76EE\u540D\u79F0
 powerjob.worker.app-name=skyp_publicapi
 # \u8C03\u5EA6\u670D\u52A1\u5668\u5730\u5740\uFF0CIP:Port \u6216 \u57DF\u540D\uFF0C\u591A\u503C\u9017\u53F7\u5206\u9694
-powerjob.worker.server-address=127.0.0.1:7700,47.92.48.137:7700
+#powerjob.worker.server-address=127.0.0.1:7700,47.92.48.137:7700
+powerjob.worker.server-address=127.0.0.1:7700
 # \u901A\u8BAF\u534F\u8BAE\uFF0C4.3.0 \u5F00\u59CB\u652F\u6301 HTTP \u548C AKKA \u4E24\u79CD\u534F\u8BAE
 powerjob.worker.protocol=akka
 # \u6301\u4E45\u5316\u65B9\u5F0F\uFF0C\u53EF\u9009\uFF0C\u9ED8\u8BA4 disk

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

@@ -8,6 +8,7 @@ logging.level.root=INFO
 #mybatis???
 #mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
+
 #mysql?????????
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.xzxtdb.url=ENC(Y1dXm7lJCGbPffW6Pbg/Uid1UK2Z1Tu2TNdp9AgqT/iXb4hNRriak+glPXYD6BnO4fQwN9Sj/zguByboO4FagHEQRN0tE57RI6rJEUeTt2JHb1rc2BG1wE9QPK96E5o9K/1TSAjnD/Rr2eAxy11tFLL2fQP35EOX)