Skip to content

M
map-parent
Commit 74f6aaa8 by Guojunfeng
Options

网合平台代码更新

parent f5db33fc
Showing with 1570 additions and 192 deletions
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SysDictitemDto.java 0 → 100644
package com.founder.commonutils.model.newPublicEntity;
import com.founder.commonutils.model.BaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 系统字典信息(SysDictitem)表实体类
*
* @author jlt
* @since 2022-03-01 09:33:25
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SysDictitemDto extends BaseDto {
@ApiModelProperty(value = "主键id")
private String id;
@ApiModelProperty(value = "单位代码")
private String code;
@ApiModelProperty(value = "名字")
private String name;
@ApiModelProperty(value = "标识类型")
private String groupid;
@ApiModelProperty(value = "等级")
private String levelid;
@ApiModelProperty(value = "拼接")
private String spell;
@ApiModelProperty(value = "未知")
private String wbzx;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入时间")
private Date lrsj;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新时间")
private Date gxsj;
private String simple;
@ApiModelProperty(value = "录入人单位代码")
private String lrdwdm;
@ApiModelProperty(value = "录入人单位名称")
private String lrdwmc;
@ApiModelProperty(value = "标识名")
private String groupname;
@ApiModelProperty(value = "是否删除")
private Integer scbz;
@ApiModelProperty(value = "应用场景1")
private String yycj1;
@ApiModelProperty(value = "应用场景2")
private String yycj2;
@ApiModelProperty(value = "应用场景3")
private String yycj3;
@ApiModelProperty(value = "应用场景4")
private String yycj4;
@ApiModelProperty(value = "pid")
private String pid;
@ApiModelProperty(value = "是否父级")
private String isparent;
@ApiModelProperty(value = "应用场景7")
private String yycj7;
@ApiModelProperty(value = "应用场景5")
private String yycj5;
@ApiModelProperty(value = "应用场景6")
private String yycj6;
@ApiModelProperty(value = "描述")
private String description;
@ApiModelProperty(value = "编码")
private String endcode;
@ApiModelProperty(value = "起始码")
private String startcode;
@ApiModelProperty(value = "应用场景8")
private String yycj8;
@ApiModelProperty(value = "判断标准")
private String sfqybmpdbz;
@ApiModelProperty(value = "单位名称编码")
private String dmmcbm;
@ApiModelProperty(value = "更新单位代码")
private String gxdwdm;
@ApiModelProperty(value = "更新单位名称")
private String gxdwmc;
@ApiModelProperty(value = "部省业务联动服务公安部下发 0:否 1:是")
private String gabxf;
@ApiModelProperty(value = "应用场景9")
private String yycj9;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Approve.java
......@@ -5,6 +5,7 @@ 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 com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -74,6 +75,7 @@ public class Approve extends Model<Approve> {
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date rksj;
@ApiModelProperty(value = "更新人")
......@@ -90,6 +92,7 @@ public class Approve extends Model<Approve> {
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date gxsj;
@ApiModelProperty(value = "总审核节点（表明此审核业务的总共审核节点数）")
......@@ -135,6 +138,7 @@ public class Approve extends Model<Approve> {
@ApiModelProperty(value = "审批时间（记录下啥时候审批的）")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(exist = false)
private Date auditTime;
......
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ApproveDetail.java
......@@ -4,6 +4,7 @@ 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 com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -33,8 +34,12 @@ public class ApproveDetail extends Model<ApproveDetail> {
@ApiModelProperty(value = "审批人姓名")
private String auditUserName;
@ApiModelProperty(value = "审批人联系电话")
private String auditUserLxdh;
@ApiModelProperty(value = "审批时间（记录下啥时候审批的）")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditTime;
@ApiModelProperty(value = "审批意见（审批人的审批意见）")
......@@ -67,6 +72,7 @@ public class ApproveDetail extends Model<ApproveDetail> {
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date rksj;
@ApiModelProperty(value = "更新人")
......@@ -83,6 +89,7 @@ public class ApproveDetail extends Model<ApproveDetail> {
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date gxsj;
@ApiModelProperty(value = "当前所在节点（表示当前审核在总审核流程中所处的级别）")
......
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ApproveDetailDto.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;
......@@ -32,6 +33,7 @@ public class ApproveDetailDto extends BaseDto {
@ApiModelProperty(value = "审批时间（记录下啥时候审批的）")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditTime;
@ApiModelProperty(value = "审批意见（审批人的审批意见）")
......@@ -64,6 +66,7 @@ public class ApproveDetailDto extends BaseDto {
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date rksj;
@ApiModelProperty(value = "更新人")
......@@ -80,6 +83,7 @@ public class ApproveDetailDto extends BaseDto {
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date gxsj;
@ApiModelProperty(value = "总审核节点（表明此审核业务的总共审核节点数）")
......
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ApproveDto.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;
......@@ -61,6 +62,7 @@ public class ApproveDto extends BaseDto {
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private String rksj;
@ApiModelProperty(value = "更新人")
......@@ -77,6 +79,7 @@ public class ApproveDto extends BaseDto {
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private String gxsj;
@ApiModelProperty(value = "总审核节点（表明此审核业务的总共审核节点数）")
......@@ -105,6 +108,9 @@ public class ApproveDto extends BaseDto {
@ApiModelProperty(value = "协查任务名称")
private String xcrwmc;
@ApiModelProperty(value = "协查任务编号")
private String xcrwbh;
@ApiModelProperty(value = "审批意见（审批人的审批意见）")
private String auditOpinion;
......@@ -123,4 +129,7 @@ public class ApproveDto extends BaseDto {
@ApiModelProperty(value = "目标接收人账号")
private String targetJsrzh;
@ApiModelProperty(value = "备注")
private String bz;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Clue.java 0 → 100644
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 com.fasterxml.jackson.annotation.JsonFormat;
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-08-25 9:23
*/
@Data
@TableName("tb_wh_clue")
@ApiModel(value = "网合线索表(tb_wh_clue)实体类",description = "")
public class Clue extends Model<Clue> {
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "主键")
private String id;
@ApiModelProperty(value = "专项编号")
private String zxbh;
@ApiModelProperty(value = "线索值")
private String xsz;
/**
* 线索类型：
* 1：QQ号码
* 2：微信ID
* 3：手机号码
* 4：IMEI
* 5：IMSI
* 6：身份证号
* 7：车牌号码
*/
@ApiModelProperty(value = "线索类型")
private String xslx;
@ApiModelProperty(value = "备注")
private String bz;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入人警号")
private String lrrjh;
@ApiModelProperty(value = "录入人单位代码")
private String lrrdwdm;
@ApiModelProperty(value = "录入人单位名称")
private String lrrdwmc;
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date rksj;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新人警号")
private String gxrjh;
@ApiModelProperty(value = "更新人单位代码")
private String gxrdwdm;
@ApiModelProperty(value = "更新人单位名称")
private String gxrdwmc;
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date gxsj;
/**
* 转化：该表均为可疑线索,点击转化按钮后,可疑人员插入嫌疑人员表（tb_xw_zbfzxyr）中
* 0：未转化
* 1：已转化
*/
@ApiModelProperty(value = "是否转化_判断标志")
private String sfzhPdbz;
@ApiModelProperty(value = "信息删除_判断标志")
private String xxscPdbz;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ClueDto.java 0 → 100644
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-08-25 9:23
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class ClueDto extends BaseDto {
@ApiModelProperty(value = "主键")
private String id;
@ApiModelProperty(value = "专项编号")
private String zxbh;
@ApiModelProperty(value = "线索值")
private String xsz;
/**
* 1：QQ号码
* 2：微信ID
* 3：手机号码
* 4：IMEI
* 5：IMSI :
* 6：身份证号
*/
@ApiModelProperty(value = "线索类型")
private String xslx;
@ApiModelProperty(value = "备注")
private String bz;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入人警号")
private String lrrjh;
@ApiModelProperty(value = "录入人单位代码")
private String lrrdwdm;
@ApiModelProperty(value = "录入人单位名称")
private String lrrdwmc;
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date rksj;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新人警号")
private String gxrjh;
@ApiModelProperty(value = "更新人单位代码")
private String gxrdwdm;
@ApiModelProperty(value = "更新人单位名称")
private String gxrdwmc;
@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 sfzhPdbz;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/MainTaskDto.java
......@@ -129,5 +129,13 @@ public class MainTaskDto extends BaseDto {
@ApiModelProperty(value = "任务接收人账号")
private String jsrzh;
/**
* 是否可以移交_判断标志
* 0：不可以移交
* 1：可以移交
*/
@ApiModelProperty(value = "是否可以移交_判断标志")
private String sfkyyjPdbz;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/SendMessageEntity.java 0 → 100644
package com.founder.commonutils.model.zczxEntity;
import lombok.Data;
@Data
public class SendMessageEntity {
private String id;
private String content;
private String phone;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/SubTask.java
......@@ -140,6 +140,10 @@ public class SubTask extends Model<SubTask> {
@ApiModelProperty(value = "案件状态")
private String ajzt;
@ApiModelProperty(value = "案件状态翻译")
@TableField(exist = false)
private String ajztStr;
@ApiModelProperty(value = "案件编号")
private String ajbh;
......@@ -287,6 +291,10 @@ public class SubTask extends Model<SubTask> {
@ApiModelProperty(value = "反馈标志")
private String fkbz;
@ApiModelProperty(value = "反馈标志翻译")
@TableField(exist = false)
private String fkbzStr;
/**
* 超时标志
* 0：未超时
......@@ -295,6 +303,10 @@ public class SubTask extends Model<SubTask> {
@ApiModelProperty(value = "超时标志")
private String csbz;
@ApiModelProperty(value = "超时标志翻译")
@TableField(exist = false)
private String csbzStr;
/**
* 流转标志
* 0：未流转
......@@ -303,6 +315,10 @@ public class SubTask extends Model<SubTask> {
@ApiModelProperty(value = "流转标志")
private String lzbz;
@ApiModelProperty(value = "流转标志翻译")
@TableField(exist = false)
private String lzbzStr;
/**
* 移交标志
* 0：未移交
......@@ -311,6 +327,10 @@ public class SubTask extends Model<SubTask> {
@ApiModelProperty(value = "移交标志")
private String yjbz;
@ApiModelProperty(value = "移交标志翻译")
@TableField(exist = false)
private String yjbzStr;
@ApiModelProperty(value = "移交人警号")
private String yjrjh;
......@@ -337,6 +357,10 @@ public class SubTask extends Model<SubTask> {
@ApiModelProperty(value = "退回标志")
private String thbz;
@ApiModelProperty(value = "退回标志翻译")
@TableField(exist = false)
private String thbzStr;
@ApiModelProperty(value = "退回缘由")
private String thMessage;
......@@ -359,6 +383,22 @@ public class SubTask extends Model<SubTask> {
@ApiModelProperty(value = "评价等级")
private String pjdj;
@ApiModelProperty(value = "评价等级翻译")
@TableField(exist = false)
private String pjdjStr;
/**
* 是否可以移交_判断标志
* 0：不可以移交
* 1：可以移交
*/
@ApiModelProperty(value = "是否可以移交_判断标志")
private String sfkyyjPdbz;
@ApiModelProperty(value = "是否可以移交_判断标志翻译")
@TableField(exist = false)
private String sfkyyjPdbzStr;
@ApiModelProperty(value = "评价时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
......
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/SubTaskDto.java
......@@ -379,6 +379,14 @@ public class SubTaskDto extends BaseDto {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date zrwfkjssj;
/**
* 是否可以移交_判断标志
* 0：不可以移交
* 1：可以移交
*/
@ApiModelProperty(value = "是否可以移交_判断标志")
private String sfkyyjPdbz;
//审批相关字段开始-------------------------------------------
@ApiModelProperty(value = "总审核节点（表明此审核业务的总共审核节点数）")
......
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/TbStAsj.java
......@@ -24,10 +24,45 @@ public class TbStAsj extends Model<TbStAsj> {
@ApiModelProperty(value = "案事件编号")
private String asjbh;
@ApiModelProperty(value = "接警编号")
private String jjbh;
@ApiModelProperty(value = "案件名称")
@TableField(value = "ajmc")
private String ajmc;
@ApiModelProperty(value = "侦查阶段代码")
@TableField(value = "zcjddm")
private String zcjddm;
@ApiModelProperty(value = "受理单位_公安机关名称")
@TableField(value = "sldw_gajgmc")
private String sldwGajgmc;
@ApiModelProperty(value = "受理单位_公安机关机构代码")
@TableField(value = "sldw_gajgjgdm")
private String sldwGajgjgdm;
@ApiModelProperty(value = "信息操作单位_公安机关名称")
@TableField(value = "xxczdw_gajgjgdm")
private String xxczdwGajgjgdm;
@ApiModelProperty(value = "信息操作单位_公安机关机构代码")
@TableField(value = "xxczdw_gajgmc")
private String xxczdwGajgmc;
@ApiModelProperty(value = "立案单位_公安机关名称")
@TableField(value = "ladw_gajgmc")
private String ladwGajgmc;
@ApiModelProperty(value = "立案单位_公安机关机构代码")
@TableField(value = "ladw_gajgjgdm")
private String ladwGajgjgdm;
@ApiModelProperty(value = "侦查阶段代码翻译")
@TableField(exist = false)
private String zcjddmStr;
@ApiModelProperty(value = "案事件发生时间_案事件发生开始时间")
@TableField(value = "asjfssj_asjfskssj")
private Date asjfssjAsjfskssj;
......@@ -47,4 +82,24 @@ public class TbStAsj extends Model<TbStAsj> {
@TableField(value = "xxsc_pdbz")
private String xxscPdbz;
@ApiModelProperty(value = "笔录数")
@TableField(exist = false)
private int bls;
@ApiModelProperty(value = "现勘数")
@TableField(exist = false)
private int xks;
@ApiModelProperty(value = "时间校准数")
@TableField(exist = false)
private int sjjzs;
@ApiModelProperty(value = "损失手机数")
@TableField(exist = false)
private int sssjs;
@ApiModelProperty(value = "损失车辆数")
@TableField(exist = false)
private int sscls;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/TbStAsjJq.java
......@@ -26,4 +26,12 @@ public class TbStAsjJq extends Model<TbStAsjJq> {
@TableField(value = "bjnr")
private String jqJyqk;
@ApiModelProperty(value = "管辖单位名称")
@TableField(value = "gxdwmc")
private String gxdwmc;
@ApiModelProperty(value = "管辖单位代码")
@TableField(value = "gxdwdm")
private String gxdwdm;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Xcrw.java
......@@ -5,6 +5,7 @@ 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 com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -50,10 +51,12 @@ public class Xcrw extends Model<Xcrw> {
@ApiModelProperty(value = "协查任务开始时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date xcrwkssj;
@ApiModelProperty(value = "协查任务结束时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date xcrwjssj;
@ApiModelProperty(value = "协查任务创建人警号")
......@@ -91,10 +94,12 @@ public class Xcrw extends Model<Xcrw> {
@ApiModelProperty(value = "协查任务流转时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date xcrwlzsj;
@ApiModelProperty(value = "协查任务反馈时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date xcrwfksj;
@ApiModelProperty(value = "协查任务_审批状态")
......@@ -212,6 +217,10 @@ public class Xcrw extends Model<Xcrw> {
@TableField(exist = false)
private String auditUserName;
@ApiModelProperty(value = "审批人联系电话")
@TableField(exist = false)
private String auditUserLxdh;
@ApiModelProperty(value = "审批时间")
@TableField(exist = false)
private String auditTime;
......
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/XcrwDto.java
......@@ -105,10 +105,12 @@ public class XcrwDto extends BaseDto {
@ApiModelProperty(value = "协查任务流转时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date xcrwlzsj;
@ApiModelProperty(value = "协查任务反馈时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date xcrwfksj;
@ApiModelProperty(value = "协查任务_审批状态")
......@@ -230,6 +232,9 @@ public class XcrwDto extends BaseDto {
@ApiModelProperty(value = "审批人姓名（表示当前审批节点应该让谁来审批）")
private String auditUserName;
@ApiModelProperty(value = "审批人联系电话")
private String auditUserLxdh;
/**
* 审核人类型（表示当前节点审核时审核人的类型）
* 1：特指某人
......
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/XjCount.java 0 → 100644
package com.founder.commonutils.model.zczxEntity;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* @author Godffy
* @create 2023-08-22 15:51
*/
@Data
@ApiModel(value = "刑技返回数", description = "勘验信息queryXckcInfo、现场指纹getXcZwbzList、指纹比中getZwbzList、DNA比中getDnabzList" +
"有数据返回则侦查专项是否刑技标志为'1'")
public class XjCount {
private int counts;
private String types;
}
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.annotation.*;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -33,14 +31,17 @@ public class Zczx extends Model<Zczx> {
@ApiModelProperty(value = "侦查专项开始时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date zxkssj;
@ApiModelProperty(value = "侦查专项结束时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date zxjssj;
@ApiModelProperty(value = "侦查专项创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date zxcjsj;
@ApiModelProperty(value = "侦查专项创建单位代码")
......@@ -108,6 +109,7 @@ public class Zczx extends Model<Zczx> {
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date gxsj;
@ApiModelProperty(value = "信息删除_判断标志")
......@@ -137,12 +139,40 @@ public class Zczx extends Model<Zczx> {
@ApiModelProperty(value = "提醒状态")
private String txzt;
/**
* 0：未完成
* 1：已完成
*/
@ApiModelProperty(value = "是否完成判断标志")
private String sfwcPdbz;
@ApiModelProperty(value = "完成时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date wcsj;
/**
* 侦查专项状态
* 0：在侦
* 1：侦查终结（手动终结，可以重启）
* 2：侦查中止（手动中止，可以重启）
* 3：到期结束（三个月有效期，可以重启）
*/
@ApiModelProperty(value = "侦查专项状态")
private String zczxState;
@ApiModelProperty(value = "重启时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date cqsj;
@ApiModelProperty(value = "侦查专项角色表主键编号")
@TableField(exist = false)
private String roleNo;
@ApiModelProperty(value = "案事件发生时间_案事件发生开始时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(exist = false)
private Date asjfssjAsjfskssj;
......@@ -173,4 +203,6 @@ public class Zczx extends Model<Zczx> {
@TableField(exist = false)
private String auditStatus;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxDto.java
......@@ -233,4 +233,14 @@ public class ZczxDto extends BaseDto {
@ApiModelProperty(value = "审核人类型（表示当前节点审核时审核人的类型）")
private String auditUserType;
/**
* 侦查专项状态
* 0：在侦
* 1：侦查终结（手动终结，可以重启）
* 2：侦查中止（手动中止，可以重启）
* 3：到期结束（三个月有效期，可以重启）
*/
@ApiModelProperty(value = "侦查专项状态")
private String zczxState;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxLog.java
......@@ -4,6 +4,7 @@ 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 com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -38,6 +39,7 @@ public class ZczxLog extends Model<ZczxLog> {
@ApiModelProperty(value = "创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date createtime;
@ApiModelProperty(value = "用户操作")
......@@ -52,4 +54,11 @@ public class ZczxLog extends Model<ZczxLog> {
@ApiModelProperty(value = "单位名称")
private String unitname;
/**
* 0：普通日志
* 1：执法办案过程（侦查中止、侦查终结、侦查重启）
*/
@ApiModelProperty(value = "日志类型")
private String logType;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxLogDto.java
......@@ -39,4 +39,11 @@ public class ZczxLogDto extends BaseDto {
@ApiModelProperty(value = "单位名称")
private String unitname;
/**
* 0：普通日志
* 1：执法办案过程（侦查中止、侦查终结、侦查重启）
*/
@ApiModelProperty(value = "日志类型")
private String logType;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ZczxRole.java
......@@ -2,6 +2,7 @@ package com.founder.commonutils.model.zczxEntity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -28,6 +29,10 @@ public class ZczxRole extends Model<ZczxRole> {
@ApiModelProperty(value = "警号")
private String policemanid;
@ApiModelProperty(value = "姓名")
@TableField(exist = false)
private String truename;
/**
* 1：侦查员
* 2：图侦员
......@@ -71,6 +76,7 @@ public class ZczxRole extends Model<ZczxRole> {
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date rksj;
@ApiModelProperty(value = "更新人")
......@@ -87,6 +93,7 @@ public class ZczxRole extends Model<ZczxRole> {
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date gxsj;
@ApiModelProperty(value = "信息删除判断标志")
......
common/common_utils/src/main/java/com/founder/commonutils/util/Base64Util.java
......@@ -75,8 +75,8 @@ public class Base64Util {
// System.out.println(addZeroForNum(substring, 12));//补全12位
// System.out.println(Base64Util.encode("dk123456"));
System.out.println(Base64Util.decode("aHkxNTI0MjM="));
System.out.println(Base64Util.encode("陈建昌"));
// System.out.println(Base64Util.decode("d2ExMjM0NTY="));
// System.out.println(Base64Util.encode("123456"));
// System.out.println(Base64Util.decode("YmoxNTAxNDc="));
......
common/common_utils/src/main/java/com/founder/commonutils/util/JasyptEncryptorUtils.java
......@@ -51,10 +51,25 @@ public class JasyptEncryptorUtils {
// String test1 = "jdbc:oracle:thin:@68.174.25.89:1521:XZXT";
// encode(test1);
String test1 = "XzxtPwdAly#00";
// String test1 = "XZXT";
// encode(test1);
String test1 = "xingjing_333";
encode(test1);
// decode("Nb+P9CS/i1D+5Tb2AtSDTu5AMH+Lzvr3xpmOz9p8Et5HTbWFHzqo/tSt0kydLARJIlvLqCRuwPE=");
// 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/service_base/src/main/java/com/founder/servicebase/config/MybatisMySqlDxptDbConfig.java 0 → 100644
package com.founder.servicebase.config;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import org.apache.ibatis.plugin.Interceptor;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionTemplate;
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
@MapperScan(basePackages = {"com.founder.*.mapper.dxptMapper"},
sqlSessionTemplateRef = "dxptSqlTemplate")
public class MybatisMySqlDxptDbConfig {
@Bean(name = "dxptDatasource")
@ConfigurationProperties(prefix = "spring.datasource.dxpt")
public DruidDataSource druidDxptDatasource()
{
return DruidDataSourceBuilder.create().build();
}
@Bean(name = "dxptSqlFactory")
// @Primary
public SqlSessionFactory sqlSessionFactory(@Qualifier("dxptDatasource") DruidDataSource dataSource)
throws Exception
{
MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
factoryBean.setDataSource(dataSource);
MybatisConfiguration configuration = new MybatisConfiguration();
factoryBean.setConfiguration(configuration);
ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
factoryBean.setMapperLocations(resolver.getResources("classpath*:com/founder/*/mapper/dxptMapper/xml/*.xml"));
// 加入SQL 语句执行拦截器和mybatiscplus分页插件
factoryBean.setPlugins(new Interceptor[]{new MybatisSqlLoggerInterceptor(),new EduConfig().paginationInterceptor()});
return factoryBean.getObject();
}
@Bean(name = "dxptSqlTemplate")
// @Primary
public SqlSessionTemplate sqlSessionTemplate(@Qualifier("dxptSqlFactory")
SqlSessionFactory sqlSessionFactory)
{
return new SqlSessionTemplate(sqlSessionFactory);
}
}
common/service_base/src/main/java/com/founder/servicebase/controller/SysDictitemController.java
package com.founder.servicebase.controller;
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.newPublicEntity.SysDictitem;
import com.founder.commonutils.model.newPublicEntity.SysDictitemDto;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.servicebase.service.SysDictitemService;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* @author Godffy
......@@ -22,6 +29,30 @@ public class SysDictitemController extends ApiController {
@Resource
private SysDictitemService sysDictitemService;
//查询公共账号字典
@PostMapping("findGgzhUnit")
@ApiOperation(value = "查询网合公共账号字典")
@OperLog(message = "查询网合公共账号字典", operation = OperationType.QUERY)
public MapRestResult findGgzhUnit(@RequestBody SysDictitemDto dictitemDto) {
String groupid = dictitemDto.getGroupid();
if (groupid.equals("WH_GGZH_UNIT") || groupid.equals("WH_ZHGGZH_UNIT")) {
QueryWrapper<SysDictitem> qw = new QueryWrapper<>();
qw.eq("scbz", "0");//只查询有效的
//WH_GGZH_UNIT:网合公共账号 WH_ZHGGZH_UNIT：网合指挥公共账号
qw.eq("groupid", groupid);
String code = dictitemDto.getCode();
// if (StringUtils.isNotBlank(code) && code.length() == 12) {
// code = code.substring(0, 6);
// qw.likeRight("code",code);
// }
if (StringUtils.isNotBlank(code)) {
qw.likeRight("code",code);
}
List<SysDictitem> list = this.sysDictitemService.list(qw);
return new MapRestResult(200, "查询成功!", list.size(), list);
}
return new MapRestResult(201, "请输入正确的groupid：网合公共账号【WH_GGZH_UNIT】或网合指挥公共账号【WH_ZHGGZH_UNIT】", null);
}
}
service/publicapi/pom.xml
......@@ -66,5 +66,10 @@
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.32</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/controller/DgServiceController/PowerJobController.java
package com.founder.publicapi.controller.DgServiceController;
import com.founder.publicapi.service.PowerJobService;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import tech.powerjob.worker.core.processor.ProcessResult;
import tech.powerjob.worker.core.processor.TaskContext;
import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
import javax.annotation.Resource;
@RestController
@Api(tags = "定时测试")
@Api(tags = "定时任务类")
@RequestMapping("/powerJob")
public class PowerJobController implements BasicProcessor {
@Resource
private PowerJobService powerJobService;
@Override
public ProcessResult process(TaskContext context) {
System.out.println("定时测试----------------------------------------相关业务");
......
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ApproveController.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.*;
import com.founder.commonutils.model.zczxEntity.Approve;
import com.founder.commonutils.model.zczxEntity.ApproveDetail;
import com.founder.commonutils.model.zczxEntity.ApproveDto;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.service.ApproveDetailService;
import com.founder.publicapi.service.ApproveService;
import com.founder.publicapi.service.SubTaskService;
import com.founder.publicapi.service.ZczxRoleService;
import com.founder.publicapi.service.*;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.servicebase.service.SysUserService;
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;
......@@ -47,6 +43,9 @@ public class ApproveController extends ApiController {
private ApproveDetailService approveDetailService;
@Resource
private ZczxService zczxService;
@Resource
private ZczxRoleService zczxRoleService;
@Resource
......@@ -141,110 +140,9 @@ public class ApproveController extends ApiController {
@PostMapping("sp")
@ApiOperation(value = "审批")
@OperLog(message = "审批", operation = OperationType.UPDATE)
@Transactional
public MapRestResult sp(@RequestBody ApproveDto approveDto){
String targetJsrzh = approveDto.getTargetJsrzh();//前端传入目标接收人账号(移交、退回使用字段)
SysUser targetUser = null;
if (StringUtils.isNotBlank(targetJsrzh)){
//查一下用户表的信息
QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
sysUserQueryWrapper.eq("username", targetJsrzh);
sysUserQueryWrapper.eq("scbz", "0");
targetUser = this.sysUserService.getOne(sysUserQueryWrapper);
if (targetUser == null) {
return new MapRestResult(201, "目标接收人账号不存在",null);
}
}
//当前登陆人的信息
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();
//前端传审批申请单id(id),业务编号(flowNo)和审批业务类型(auditType)对应审批主表记录和审批明细表节点
Approve approve = new Approve();//审批主表
// BeanUtil.copyProperties(approveDto, approve);
approve.setId(approveDto.getId());//主键
approve.setAuditStatus(approveDto.getAuditStatus());//审批状态
// approve.setAuditOpinion(approveDto.getAuditOpinion());//审批意见
// approve.setAuditRemark(approveDto.getAuditRemark());//审批备注
approve.setGxr(trueName);
approve.setGxrjh(policemanid);
approve.setGxrdwdm(unitcode);
approve.setGxrdwmc(unitname);
//更新审批主表信息2
approveService.updateById(approve);
ApproveDetail approveDetail = new ApproveDetail();//审批明细
approveDetail.setGxr(trueName);
approveDetail.setGxrjh(policemanid);
approveDetail.setGxrdwdm(unitcode);
approveDetail.setGxrdwmc(unitname);
//因为目前只有一个审批节点，所以两张表的auditStatus是相同的
approveDetail.setAuditTime(new Date());
approveDetail.setAuditOpinion(approveDto.getAuditOpinion());//审批意见
approveDetail.setAuditRemark(approveDto.getAuditRemark());//审批备注
approveDetail.setAuditStatus(approveDto.getAuditStatus());//审批状态
UpdateWrapper<ApproveDetail> updateWrapper = new UpdateWrapper<>();
//假设有多个审批节点，审批明细表中的audit_id 和 audit_user_id 对应一个节点,审批节点由不同的审批人进行审批
updateWrapper.eq("audit_user_id", policemanid);//审批人警号
updateWrapper.eq("audit_id", approveDto.getId());//审批主键id
approveDetailService.update(approveDetail, updateWrapper);
String auditType = approveDto.getAuditType();//审批类型
String auditStatus = approveDto.getAuditStatus();//审批状态
//如果审批类型是“侦查专项取消分享审批” 且 审批状态是“审批通过”,去侦查专项角色表(tb_wh_zczx_role)把对应的分享数据删掉
if (StringUtils.isNotBlank(auditType) && auditType.equals("9") && StringUtils.isNotBlank(auditStatus) && auditStatus.equals("2")) {
// UpdateWrapper<ZczxRole> zczxRoleUpdateWrapper = new UpdateWrapper<>();
// zczxRoleUpdateWrapper.eq("id", approveDto.getFlowNo());//审批编号(连接具体业务表的数据主键)
// ZczxRole zczxRole = new ZczxRole();
// zczxRole.setXxscPdbz("1");
// zczxRoleService.update(zczxRole, zczxRoleUpdateWrapper);
//物理删除,避免太多冗余数据
String flowNo = approveDto.getFlowNo();//审批编号(连接具体业务表的数据主键)
zczxRoleService.removeById(flowNo);
}
//如果审批类型时"移交" 且 审批状态是 "审批通过",去子任务表(tb_wh_subtask)把接收人等字段覆盖掉
if (StringUtils.isNotBlank(auditType) && auditType.equals("7") && StringUtils.isNotBlank(auditStatus) && auditStatus.equals("2")) {
UpdateWrapper<SubTask> subTaskUpdateWrapper = new UpdateWrapper<>();
subTaskUpdateWrapper.eq("id", approveDto.getFlowNo());//审批编号(连接具体业务表的数据主键)
SubTask subTask = new SubTask();
subTask.setJsrzh(targetJsrzh);//设置接收人账号
subTask.setJsrdwmc(targetUser.getUnitname());//接收人单位名称
subTask.setJsrdwdm(targetUser.getUnitcode());//接收人单位代码
subTask.setJsrjh(targetUser.getPolicemanid());//接收人警号
subTask.setJsrxm(targetUser.getTrueName());//接收人姓名
subTask.setJsrlxdh(targetUser.getTelephone());//接收人联系电话
subTask.setJsrsfzh(targetUser.getIdentitycard());//接收人证件号码
subTask.setYjbz("1");//移交标志设置为1,只能移交1次
subTask.setYjsj(new Date());
this.subTaskService.update(subTask,subTaskUpdateWrapper);
}
//退回
if (StringUtils.isNotBlank(auditType) && auditType.equals("8") && StringUtils.isNotBlank(auditStatus) && auditStatus.equals("2")) {
UpdateWrapper<SubTask> subTaskUpdateWrapper = new UpdateWrapper<>();
subTaskUpdateWrapper.eq("id", approveDto.getFlowNo());//审批编号(连接具体业务表的数据主键)
SubTask subTask = new SubTask();
subTask.setJsrzh(targetJsrzh);//设置接收人账号
subTask.setJsrdwmc(targetUser.getUnitname());//接收人单位名称
subTask.setJsrdwdm(targetUser.getUnitcode());//接收人单位代码
subTask.setJsrjh(targetUser.getPolicemanid());//接收人警号
subTask.setJsrxm(targetUser.getTrueName());//接收人姓名
subTask.setJsrlxdh(targetUser.getTelephone());//接收人联系电话
subTask.setJsrsfzh(targetUser.getIdentitycard());//接收人证件号码
this.subTaskService.update(subTask,subTaskUpdateWrapper);
}
return new MapRestResult();
@Transactional(rollbackFor = Exception.class)
public MapRestResult sp(@RequestBody ApproveDto approveDto) {
return this.approveService.sp(approveDto);
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/MainTaskController.java
......@@ -127,6 +127,7 @@ public class MainTaskController extends ApiController {
subTask.setLrrdwdm(unitcode);//创建人单位代码
subTask.setLrrdwmc(unitname);//专项创建单位名称
subTask.setRksj(new Date());//创建时间
subTask.setSfkyyjPdbz(mainTaskDto.getSfkyyjPdbz());//子任务是否可以移交 0：不可以移交 1：可以移交
//将子任务的数据插入表中
this.subTaskService.save(subTask);
list.set(i, subTask);//返回正确数据
......
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/SendMessageController.java 0 → 100644
package com.founder.publicapi.controller.ZczxService;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.publicapi.service.SendMessageService;
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.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* @author Godffy
* @create 2023-08-23 15:32
*/
@CrossOrigin
@RestController
@Api(tags = "短信平台")
public class SendMessageController {
@Resource
private SendMessageService sendMessageService;
@GetMapping("/sendMessage")
@ApiOperation(value = "发送短信")
@OperLog(message = "发送短信", operation = OperationType.ADD)
public MapRestResult sendMessage(String phone, String content) {
boolean b = sendMessageService.sendOneMessage(phone, content);
if (b) {
return new MapRestResult(200, "成功!", null);
}
return new MapRestResult(201, "失败!", null);
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/SubTaskController.java
......@@ -118,12 +118,16 @@ public class SubTaskController extends ApiController {
QueryWrapper<SubTask> sqw = new QueryWrapper<>();
sqw.eq("id", subTaskDto.getId());
sqw.eq("xxsc_pdbz", "0");
sqw.eq("yjbz", "1");//已移交
// sqw.eq("yjbz", "1");//已移交
SubTask subTask = this.subTaskService.getOne(sqw);
if (subTask != null) {
String yjbz = subTask.getYjbz();
String sfkyyjPdbz = subTask.getSfkyyjPdbz();
if (StringUtils.isNotBlank(sfkyyjPdbz) && sfkyyjPdbz.equals("0")) {
return new MapRestResult(201, "该子任务不可以移交", null);
}
if (StringUtils.isNotBlank(yjbz) && yjbz.equals("1")) {
return new MapRestResult(201, "子任务已移交过,无法移交!", null);
}
QueryWrapper<Approve> qw = new QueryWrapper<>();
qw.eq("flow_no", subTaskDto.getId());//子任务编号
qw.eq("audit_type", "7");
......
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/XcrwController.java
......@@ -60,6 +60,19 @@ public class XcrwController extends ApiController {
@OperLog(message = "新增协查任务信息", operation = OperationType.ADD)
@Transactional
public MapRestResult save(XcrwDto xcrwDto) {
if (StringUtils.isBlank(xcrwDto.getZxbh())) {
return new MapRestResult(201, "专项编号不能为空", null);
}
//发之前先看看侦查专项是不是已经完成了,完成了不让发.
Zczx byId = this.zczxService.getById(xcrwDto.getZxbh());
if (byId == null) {
return new MapRestResult(201, "该协查任务对应的侦查专项不存在", null);
}
String zczxState = byId.getZczxState();
if (!zczxState.equals("0")) {
return new MapRestResult(201, "侦查专项非处于在侦状态,不能操作！", null);
}
Xcrw xcrw = new Xcrw();
BeanUtil.copyProperties(xcrwDto, xcrw);
String xcrwbh = KeyUtil.getUUIDKey("XC");
......@@ -127,6 +140,8 @@ public class XcrwController extends ApiController {
xcrw.setXcrwjsrxm(xcrwDto.getXcrwjsrxm());//接收人姓名
xcrw.setXcrwjsrdwmc(xcrwDto.getXcrwjsrdwmc());//接收人单位名称
} else if (StringUtils.isNotBlank(xcrwlx) && "5".equals(xcrwlx)) {
//其他协查：发给其他分局（除了市局和自己）的机构
zczx.setSffqqtxcPdbz("1");//其他协查
xcrw.setXcrwjsrzh(xcrwDto.getXcrwjsrzh());//前端指定接收账号
xcrw.setXcrwjsrdwdm(xcrwDto.getXcrwjsrzh());//接收人单位代码
......@@ -186,6 +201,7 @@ public class XcrwController extends ApiController {
approveDetail.setAuditId(approveId);//关联审批主表
approveDetail.setAuditUserId(xcrwDto.getAuditUserId());//审批人id（表示当前审批节点应该让谁来审批）
approveDetail.setAuditUserName(xcrwDto.getAuditUserName());//审批人姓名
approveDetail.setAuditUserLxdh(xcrwDto.getAuditUserLxdh());//审批人联系电话
approveDetail.setAuditUserType(xcrwDto.getAuditUserType());//审批人类型,传1：特指某人
approveDetail.setAuditStatus("1");//审批人的审核结果，待审状态
approveDetail.setRksj(new Date());//入库时间
......@@ -278,6 +294,10 @@ public class XcrwController extends ApiController {
//协查任务反馈,如果在公共账号,登记个人信息,由前端传过来,反馈人、更新人信息用该值
//重点：把该条子任务的接收人账号更新为当前反馈的这个人的用户名
xcrw.setXcrwjsrzh(xcrwDto.getUsername());//用户名
xcrw.setXcrwjsrxm(xcrwDto.getTrueName());//姓名
xcrw.setXcrwjsrjh(xcrwDto.getPolicemanid());//姓名
xcrw.setXcrwjsrdwdm(xcrwDto.getUnitcode());//单位代码
xcrw.setXcrwjsrdwmc(xcrwDto.getUnitname());//单位名称
xcrw.setXcrwfkrxm(xcrwDto.getTrueName());//姓名
xcrw.setXcrwfkrjh(xcrwDto.getPolicemanid());//姓名
xcrw.setXcrwfkrdwdm(xcrwDto.getUnitcode());//单位代码
......@@ -370,6 +390,15 @@ public class XcrwController extends ApiController {
return new MapRestResult().error("协查任务已退回");
}
BeanUtil.copyProperties(xcrwDto, xcrw);
//协查任务反馈,如果在公共账号,登记个人信息,由前端传过来
//重点：把该条子任务的接收人账号更新为当前反馈的这个人的用户名
xcrw.setXcrwjsrzh(xcrwDto.getUsername());//用户名
xcrw.setXcrwjsrxm(xcrwDto.getTrueName());//姓名
xcrw.setXcrwjsrjh(xcrwDto.getPolicemanid());//姓名
xcrw.setXcrwjsrdwdm(xcrwDto.getUnitcode());//单位代码
xcrw.setXcrwjsrdwmc(xcrwDto.getUnitname());//单位名称
xcrw.setXcrwjssj(new Date());//协查任务退回后就结束了
xcrw.setXcrwThzt("1");//设置协查任务退回判断标志为1，代表已退回
//更新协查任务信息
......
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/XyrController.java 0 → 100644
package com.founder.publicapi.controller.ZczxService;
import com.baomidou.mybatisplus.extension.api.ApiController;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author Godffy
* @create 2023-08-25 15:08
*/
@CrossOrigin
@RestController
@RequestMapping("/xyr")
@Api(tags = "抓捕犯罪嫌疑人(tb_xw_zbfzxyr)")
public class XyrController extends ApiController {
}
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxController.java
......@@ -57,6 +57,9 @@ public class ZczxController extends ApiController {
@Resource
private TbXwZbfzxyrService tbXwZbfzxyrService;
@Resource
private PowerJobService powerJobService;
/**
* 创建侦查专项时，把当前用户的机构代码存到侦查专项角色表(TB_WH_ZCZX_ROLE)
*
......@@ -95,25 +98,35 @@ public class ZczxController extends ApiController {
tbStAsjQueryWrapper.eq("asjbh", asjbh);
tbStAsjQueryWrapper.eq("xxsc_pdbz", "0");
TbStAsj asj = this.tbStAsjService.getOne(tbStAsjQueryWrapper);
String tzPdbzDg = asj.getTzPdbzDg();//是否图侦
if (StringUtils.isNotBlank(tzPdbzDg) && tzPdbzDg.equals("1")) {
zczx.setSftzPdbz("1");//图侦状态设为"1"
if (asj != null) {
String tzPdbzDg = asj.getTzPdbzDg();//是否图侦
if (StringUtils.isNotBlank(tzPdbzDg) && tzPdbzDg.equals("1")) {
zczx.setSftzPdbz("1");//图侦状态设为"1"
}
}
//关联刑技（勘验信息queryXckcInfo、现场指纹getXcZwbzList、指纹比中getZwbzList、DNA比中getDnabzList）
List<XjCount> xjCounts = this.powerJobService.selectSfxjByAsjbh(asjbh);
int counts = 0;//刑技能关联出来的数量
for (int i = 0; i < xjCounts.size(); i++) {
XjCount xjCount = xjCounts.get(i);
counts = counts + xjCount.getCounts();
}
if (counts > 0) {//如果上面4个条件,只要有数据返回,则认为有刑技数据
zczx.setSfxjPdbz("1");//刑技状态设为"1"
}
//关联刑技
//关联抓捕
QueryWrapper<TbXwZbfzxyr> tbXwZbfzxyrQueryWrapper = new QueryWrapper<>();
tbXwZbfzxyrQueryWrapper.eq("asjbh", asjbh);
tbXwZbfzxyrQueryWrapper.eq("xxsc_pdbz", "0");
TbXwZbfzxyr zbfzxyr = this.tbXwZbfzxyrService.getOne(tbXwZbfzxyrQueryWrapper);
String zhfzxyrFzxyrdaztdm = zbfzxyr.getZhfzxyrFzxyrdaztdm();//到案状态
if (StringUtils.isNotBlank(zhfzxyrFzxyrdaztdm) && zhfzxyrFzxyrdaztdm.equals("1")) {
zczx.setSfzbPdbz("1");//抓捕状态设为"1"
if (zbfzxyr != null) {
String zhfzxyrFzxyrdaztdm = zbfzxyr.getZhfzxyrFzxyrdaztdm();//到案状态
if (StringUtils.isNotBlank(zhfzxyrFzxyrdaztdm) && zhfzxyrFzxyrdaztdm.equals("1")) {
zczx.setSfzbPdbz("1");//抓捕状态设为"1"
}
}
//关联串并
QueryWrapper<TbYwXszCbaj> tbYwXszCbajQueryWrapper = new QueryWrapper<>();
tbYwXszCbajQueryWrapper.eq("asjbh", asjbh);
......@@ -446,5 +459,97 @@ public class ZczxController extends ApiController {
return new MapRestResult<>();
}
/**
* 手动完成侦查专项(完成后不可以继续提起申请,不可以变更参与角色)
* 侦查专项状态
* 0：在侦（默认值）
* 1：侦查终结（手动终结，可以重启）
* 2：侦查中止（手动中止，可以重启）
* 3：到期结束（三个月有效期，可以重启）
* @param zczxDto
* @return
*/
@PostMapping("complete")
@ApiOperation(value = "手动完成侦查专项")
@OperLog(message = "手动完成侦查专项", operation = OperationType.UPDATE)
@Transactional
public MapRestResult complete(@RequestBody ZczxDto zczxDto) {
String zxbh = zczxDto.getZxbh();
if (StringUtils.isBlank(zxbh)) {
return new MapRestResult(201, "专项编号不能为空", null);
}
Zczx zczx = new Zczx();
zczx.setZxbh(zxbh);
zczx.setZczxState(zczxDto.getZczxState());
// zczx.setSfwcPdbz("1");//已完成
zczx.setWcsj(new Date());
this.zczxService.updateById(zczx);
return new MapRestResult<>();
}
//重启侦查专项,提交重启侦查专项申请单,给一级领导审批
@PostMapping("restartZczx")
@ApiOperation(value = "提交侦查专项取消完成申请单")
@OperLog(message = "提交侦查专项取消完成申请单", operation = OperationType.ADD)
@Transactional
public MapRestResult restartZczx(@RequestBody ApproveDto approveDto) {
//看一下数据库是否已经有这条数据。如果取消分享的审批数据已经发送给领导，控制一下不能重复发送
//审批状态：1 待审批
//审批类型：10 侦查专项取消完成
QueryWrapper<Approve> qw = new QueryWrapper<>();
qw.eq(StringUtils.isNotBlank(approveDto.getFlowNo()), "flow_no", approveDto.getFlowNo());
qw.eq("audit_type", "10");
qw.eq("audit_status", "1");
Approve one = approveService.getOne(qw);
if (one != null) {
return new MapRestResult(201, "该侦查专项的重启侦查专项申请单已处于待审批状态，不能重复提交！", null);
}
//当前登陆人的信息
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();
Approve approve = new Approve();
String approveNo = KeyUtil.getUUIDKey("A");
approve.setId(approveNo);//审批主表主键
approve.setFlowNo(approveDto.getFlowNo());//连接专项角色表主键
approve.setAuditType("10");//审批类型,10：侦查专项取消完成审批
approve.setLrr(trueName);
approve.setLrrjh(policemanid);
approve.setLrrdwdm(unitcode);
approve.setLrrdwmc(unitname);
approve.setRksj(new Date());
approve.setTotalPoint(approveDto.getTotalPoint());//总审核节点（表明此审核业务的总共审核节点数）
approve.setNowPoint(approveDto.getNowPoint());//当前所在审核节点（表明此审核业务当前所处的节点）
approve.setZxbh(approveDto.getZxbh());//专项编号
approve.setZxmc(approveDto.getZxmc());//专项名称
approve.setAuditName(approveDto.getAuditName());//分享申请单名称
approve.setBz(approveDto.getBz());//取消完成缘由
//存审批主表信息
approveService.save(approve);
ApproveDetail approveDetail = new ApproveDetail();
String approveDetailNo = KeyUtil.getUUIDKey("AD");
approveDetail.setId(approveDetailNo);//审批明细表主键
approveDetail.setAuditId(approveNo);//连接审批主表主键
approveDetail.setAuditUserId(approveDto.getAuditUserId());//由谁审批
approveDetail.setAuditUserName(approveDto.getAuditUserName());//审批人名字
approveDetail.setLrr(trueName);
approveDetail.setLrrjh(policemanid);
approveDetail.setLrrdwdm(unitcode);
approveDetail.setLrrdwmc(unitname);
approveDetail.setRksj(new Date());
approveDetail.setNowPoint(approveDto.getNowPoint());//当前所在审核节点（表明此审核业务当前所处的节点）
approveDetail.setAuditUserType(approveDto.getAuditUserType());//目前为特指某人
approveDetailService.save(approveDetail);
return new MapRestResult();
}
}
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxLogController.java
......@@ -23,6 +23,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
/**
* @author Godffy
......@@ -73,30 +74,48 @@ public class ZczxLogController extends ApiController {
}
QueryWrapper<ZczxLog> qw = new QueryWrapper<>();
//专项编号
qw.eq("zxbh",zczxLogDto.getZxbh());
qw.eq("zxbh", zczxLogDto.getZxbh());
//用户名（警号或单位代码）
qw.eq(StringUtils.isNotBlank(zczxLogDto.getUserid()),"userid",zczxLogDto.getUserid());
qw.eq(StringUtils.isNotBlank(zczxLogDto.getUserid()), "userid", zczxLogDto.getUserid());
//请求类型
qw.eq(StringUtils.isNotBlank(zczxLogDto.getOperation()),"operation",zczxLogDto.getOperation());
qw.eq(StringUtils.isNotBlank(zczxLogDto.getOperation()), "operation", zczxLogDto.getOperation());
//ip
qw.like(StringUtils.isNotBlank(zczxLogDto.getIp()),"ip",zczxLogDto.getIp());
qw.like(StringUtils.isNotBlank(zczxLogDto.getIp()), "ip", zczxLogDto.getIp());
// 按操作时间范围查询
qw.ge(null != zczxLogDto.getBeginTime(), "createtime", zczxLogDto.getBeginTime());
qw.le(null != zczxLogDto.getEndTime(), "createtime", zczxLogDto.getEndTime());
//按操作内容模糊查询
qw.like(StringUtils.isNotBlank(zczxLogDto.getMessage()),"message",zczxLogDto.getMessage());
qw.like(StringUtils.isNotBlank(zczxLogDto.getMessage()), "message", zczxLogDto.getMessage());
//姓名
qw.like(StringUtils.isNotBlank(zczxLogDto.getTruename()),"truename",zczxLogDto.getTruename());
qw.like(StringUtils.isNotBlank(zczxLogDto.getTruename()), "truename", zczxLogDto.getTruename());
//单位代码
qw.like(StringUtils.isNotBlank(zczxLogDto.getUnitcode()),"unitcode",zczxLogDto.getUnitcode());
qw.like(StringUtils.isNotBlank(zczxLogDto.getUnitcode()), "unitcode", zczxLogDto.getUnitcode());
//单位名称
qw.like(StringUtils.isNotBlank(zczxLogDto.getUnitname()),"unitname",zczxLogDto.getUnitname());
qw.like(StringUtils.isNotBlank(zczxLogDto.getUnitname()), "unitname", zczxLogDto.getUnitname());
qw.orderByDesc("createtime");//按操作时间降序
IPage page = new Page(zczxLogDto.getPageNum(), zczxLogDto.getPageSize());
IPage<ZczxLog> result = this.zczxLogService.page(page,qw);
IPage<ZczxLog> result = this.zczxLogService.page(page, qw);
PageSimpleVO pageSimpleVO = new PageSimpleVO<>(result.getCurrent(), result.getTotal(), result.getRecords());
return new MapRestResult(200, "分页查询成功!", pageSimpleVO.getTotal(), pageSimpleVO);
}
//查询该侦查专项的执法办案过程
@GetMapping("selectZczxProcessByZxbh")
@ApiOperation(value = "查询该侦查专项的执法办案过程")
public MapRestResult selectZczxProcessByZxbh(@RequestParam("zxbh") String zxbh) {
//专项编号不能为空
if (StringUtils.isBlank(zxbh)) {
return new MapRestResult<>(201, "专项编号不能为空", null);
}
QueryWrapper<ZczxLog> qw = new QueryWrapper<>();
//专项编号
qw.eq("zxbh", zxbh);
//日志类型 0：普通日志 1：执法办案过程（侦查中止、侦查终结、侦查重启）
qw.eq( "log_type", "1");
qw.orderByAsc("createtime");
List<ZczxLog> list = this.zczxLogService.list(qw);
return new MapRestResult(200, "查询该侦查专项的执法办案过程", list.size(), list);
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxRoleController.java
......@@ -7,10 +7,12 @@ 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.ZczxRole;
import com.founder.commonutils.model.zczxEntity.ZczxRoleDto;
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;
......@@ -40,6 +42,9 @@ public class ZczxRoleController {
@Resource
private ZczxRoleService zczxRoleService;
@Resource
private ZczxService zczxService;
/**
* 侦查专项角色表：TB_WH_ZCZX_ROLE
* 1、侦查专项列表选择了角色就插入数据，参与状态变 “1”
......@@ -62,6 +67,35 @@ public class ZczxRoleController {
@OperLog(message = "新增侦查专项角色信息", operation = OperationType.ADD)
@Transactional
public MapRestResult save(@RequestBody ZczxRoleDto zczxRoleDto) {
if (StringUtils.isBlank(zczxRoleDto.getZxbh())) {
return new MapRestResult(201, "专项编号不能为空", null);
}
if (StringUtils.isBlank(zczxRoleDto.getPolicemanid())) {
return new MapRestResult(201, "警号不能为空", null);
}
//发之前先看看侦查专项是不是已经完成了,完成了不让操作.
Zczx byId = this.zczxService.getById(zczxRoleDto.getZxbh());
if (byId == null) {
return new MapRestResult(201, "该协查任务对应的侦查专项不存在", null);
}
String zczxState = byId.getZczxState();
if (!zczxState.equals("0")) {
return new MapRestResult(201, "侦查专项非处于在侦状态,不能操作！", null);
}
String zczxCyzt = zczxRoleDto.getZczxCyzt();
if (zczxCyzt.equals("1")){
//如果插入的是参与角色,先看一下角色表里该民警有没有参与数据
QueryWrapper<ZczxRole> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("zxbh",zczxRoleDto.getZxbh());
queryWrapper.eq("zczx_cyzt", "1");
queryWrapper.eq("policemanid", zczxRoleDto.getPolicemanid());
List<ZczxRole> list = this.zczxRoleService.list(queryWrapper);
if (list.size()>0){
return new MapRestResult(201, "该用户已参与角色,不能重复参与", null);
}
}
//当前登陆人的信息
ServletRequestAttributes requestAttributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
......@@ -82,10 +116,6 @@ public class ZczxRoleController {
zczxRole.setLrrjh(policemanid);//警号
zczxRole.setLrrdwdm(unitcode);//创建人单位代码
zczxRole.setLrrdwmc(unitname);//专项创建单位名称
//专项编号不能为空
if (StringUtils.isBlank(zczxRole.getZxbh())) {
return new MapRestResult().error("专项编号不能为空");
}
this.zczxRoleService.save(zczxRole);
return new MapRestResult();
}
......@@ -109,6 +139,19 @@ public class ZczxRoleController {
@OperLog(message = "更新侦查专项角色信息", operation = OperationType.ADD)
@Transactional
public MapRestResult update(@RequestBody ZczxRoleDto zczxRoleDto) {
if (StringUtils.isBlank(zczxRoleDto.getZxbh())) {
return new MapRestResult(201, "专项编号不能为空", null);
}
//发之前先看看侦查专项是不是已经完成了,完成了不让操作.
Zczx byId = this.zczxService.getById(zczxRoleDto.getZxbh());
if (byId == null) {
return new MapRestResult(201, "该协查任务对应的侦查专项不存在", null);
}
String sfwcPdbz = byId.getSfwcPdbz();
if (sfwcPdbz.equals("1")) {
return new MapRestResult(201, "侦查专项已完成,不能操作！", null);
}
ZczxRole zczxRole = this.zczxRoleService.getById(zczxRoleDto.getId());
if (null == zczxRole) {
return new MapRestResult().error("该角色主键不存在");
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/dxptMapper/SendMessageMapper.java 0 → 100644
package com.founder.publicapi.mapper.dxptMapper;
import com.founder.commonutils.model.zczxEntity.SendMessageEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface SendMessageMapper {
int sendMessage(SendMessageEntity message);
Integer test(SendMessageEntity message);
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/dxptMapper/xml/SendMessageMapper.xml 0 → 100644
<?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.dxptMapper.SendMessageMapper">
<insert id="sendMessage" parameterType="com.founder.commonutils.model.zczxEntity.SendMessageEntity">
insert into massi.sms_outbox values (
#{id, jdbcType=VARCHAR},
'',
#{phone,jdbcType=VARCHAR},
#{content, jdbcType=VARCHAR},
'1',
'8',
'2',
now(),
'P000000000008002'
)
</insert>
<insert id="test" parameterType="com.founder.commonutils.model.zczxEntity.SendMessageEntity">
insert into dz_message values (
#{id, jdbcType=VARCHAR},
#{phone,jdbcType=VARCHAR},
#{content, jdbcType=VARCHAR},
'1',
'8',
'2',
now(),
'P000000000008002'
)
</insert>
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/ClueMapper.java 0 → 100644
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.zczxEntity.Clue;
/**
* @author Godffy
* @create 2023-08-25 9:27
*/
public interface ClueMapper extends BaseMapper<Clue> {
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/PowerJobMapper.java 0 → 100644
package com.founder.publicapi.mapper.mysqlMapper;
import com.founder.commonutils.model.zczxEntity.XjCount;
import java.util.List;
/**
* @author Godffy
* @create 2023-08-22 15:55
*/
public interface PowerJobMapper {
List<XjCount> selectSfxjByAsjbh(String asjbh);
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/ScxxzjbhMapper.java 0 → 100644
package com.founder.publicapi.mapper.mysqlMapper;
import org.apache.ibatis.annotations.Mapper;
import java.util.HashMap;
@Mapper
public interface ScxxzjbhMapper {
//生成信息主键编号
String xxzjbhFnVal(HashMap statMap);
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/TbStAsjMapper.java
......@@ -2,10 +2,33 @@ package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.zczxEntity.TbStAsj;
import org.springframework.web.bind.annotation.RequestParam;
/**
* @author Godffy
* @create 2023-08-22 9:20
*/
public interface TbStAsjMapper extends BaseMapper<TbStAsj> {
int relateBl(@RequestParam("asjbh") String asjbh,@RequestParam("jjbh") String jjbh);
int relateXk(@RequestParam("asjbh") String asjbh);
int relateSjjz(@RequestParam("asjbh") String asjbh);
int relateSssj(@RequestParam("asjbh") String asjbh);
int relateSscl(@RequestParam("asjbh") String asjbh);
/**
* 关联一下笔录TB_XW_FLWS_BL（关联字段：asjbh 或 jjbh）
* 关联一下现勘 xk_xcjbxx、XK_AJXX（关联字段：ajbh、scbz）
* 关联一下时间校准 TB_XW_ASJSJJZ（SFJBJZTJ 0：不具备校准条件 1：已校准 没数据则：未校准）
* 关联一下损失手机 tb_xw_ssydtxsb（有数据则存在损失手机）
* 关联一下损失车辆 tb_xw_ssddfjdc（有数据则存在损失车辆）
* 翻译一下字典
*
* @param asjbh
* @return
*/
TbStAsj selectRelateAsj(@RequestParam("asjbh") String asjbh);
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/XyrMapper.java 0 → 100644
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.zczxEntity.TbXwZbfzxyr;
/**
* @author Godffy
* @create 2023-08-25 15:10
*/
public interface XyrMapper extends BaseMapper<TbXwZbfzxyr> {
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/ZczxMapper.java
......@@ -22,4 +22,7 @@ public interface ZczxMapper extends BaseMapper<Zczx> {
//根据机构查询
IPage<Zczx> listZczxForPageByCode(IPage<ZczxDto> page,@Param("zczxDto") ZczxDto zczxDto);
//取消完成
int restartZczx(@Param("zxbh") String zxbh);
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ApproveMapper.xml
......@@ -19,6 +19,7 @@
when wa.audit_type = '7' then '移交审批'
when wa.audit_type = '8' then '退回审批'
when wa.audit_type = '9' then '侦查专项取消分享审批'
when wa.audit_type = '10' then '重启侦查专项审批'
end as auditTypeStr,
wa.audit_status,
case
......@@ -50,6 +51,9 @@
<if test="approveDto.auditUserId!= null and approveDto.auditUserId!=''">
AND ad.audit_user_id= #{approveDto.auditUserId , jdbcType=VARCHAR }
</if>
<if test="approveDto.zxbh!= null and approveDto.zxbh!=''">
AND wa.zxbh= #{approveDto.zxbh , jdbcType=VARCHAR }
</if>
<if test="approveDto.flowNo!= null and approveDto.flowNo!=''">
AND wa.flow_no= #{approveDto.flowNo , jdbcType=VARCHAR }
</if>
......@@ -59,6 +63,9 @@
<if test="approveDto.xcrwmc!= null and approveDto.xcrwmc!=''">
AND wa.xcrwmc= #{approveDto.xcrwmc , jdbcType=VARCHAR }
</if>
<if test="approveDto.xcrwbh!= null and approveDto.xcrwbh!=''">
AND wa.xcrwbh= #{approveDto.xcrwbh , jdbcType=VARCHAR }
</if>
<if test="approveDto.id!= null and approveDto.id!=''">
AND wa.id= #{approveDto.id , jdbcType=VARCHAR }
</if>
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ClueMapper.xml 0 → 100644
<?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.ClueMapper">
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/PowerJobMapper.xml 0 → 100644
<?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.PowerJobMapper">
<select id="selectSfxjByAsjbh" resultType="com.founder.commonutils.model.zczxEntity.XjCount">
select * from (
select '勘验信息' as types,
count(*) counts
from xk_xcjbxx bx,
XK_AJXX xk
where 1 = 1
and bx.ajid = xk.ID
and xk.AJBH = #{asjbh}
union all
select '现场指纹' as types,
count(*) counts
from tb_xw_zwbz
where xxsc_pdbz = '0'
and (asjbh = #{asjbh} or xckybh in (
select asj.xckybh
from tb_st_asj asj
where asj.asjbh = #{asjbh}
and asj.xxsc_pdbz = '0'))
union all
select '指纹比中' as types,
count(*) counts
from tb_xsjszy_zw_zwbz
where XXSC_PDBZ = '0'
and (ASJBH = #{asjbh} OR BDY_JYQK in (
select xckybh
from tb_st_asj
where asjbh = #{asjbh}
and xxsc_pdbz = '0'))
union all
SELECT 'DNA比中' as types,
count(*) counts
FROM tb_xsjszy_dna_rabz
WHERE 1 = 1
and xxsc_pdbz = '0'
and (jzajbh = #{asjbh} OR
bzaj_xkbh in
(select xckybh from tb_st_asj where asjbh = #{asjbh} and xxsc_pdbz = '0'))
)
</select>
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SczjbhMapper.xml 0 → 100644
<?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.ScxxzjbhMapper">
<!--生成主键编号-->
<select id="xxzjbhFnVal" parameterType="java.util.HashMap" resultType="java.lang.String">
SELECT FN_XXCJ_NGZBHZH(#{ unitcode},#{tableName},#{ lrsj},'') from dual
</select>
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SubTaskMapper.xml
......@@ -48,6 +48,10 @@
s.ql_id,
s.ajmc,
s.ajzt,
case
when s.ajzt = '1' then '已立案'
when s.ajzt = '2' then '已破案'
end as ajztStr,
s.ajbh,
s.mqhddq,
s.mqhdqx,
......@@ -92,10 +96,30 @@
s.gxrdwmc,
s.gxsj,
s.fkbz,
case
when s.fkbz = '0' then '未反馈'
when s.fkbz = '1' then '已反馈'
end as fkbzStr,
s.csbz,
case
when s.csbz = '0' then '未超时'
when s.csbz = '1' then '已超时'
end as csbzStr,
s.lzbz,
case
when s.lzbz = '0' then '未流转'
when s.lzbz = '1' then '已流转'
end as lzbzStr,
s.yjbz,
case
when s.yjbz = '0' then '未移交'
when s.yjbz = '1' then '已移交'
end as yjbzStr,
s.thbz,
case
when s.thbz = '0' then '未退回'
when s.thbz = '1' then '已退回'
end as thbzStr,
s.evaluation,
s.fkcs,
s.fksj,
......@@ -104,6 +128,15 @@
s.pjsj,
s.pjbz,
s.pjdj,
case
when s.pjdj = '0' then '不及格'
when s.pjdj = '1' then '及格'
end as pjdjStr,
s.sfkyyj_pdbz,
case
when s.sfkyyj_pdbz = '0' then '不可以移交'
when s.sfkyyj_pdbz = '1' then '可以移交'
end as sfkyyjPdbzStr,
s.main_id,
s.th_message,
m.task_name,
......@@ -154,6 +187,9 @@
<if test="subTaskDto.pjbz != '' and subTaskDto.pjbz != null">
and s.pjbz = #{subTaskDto.pjbz, jdbcType=VARCHAR}
</if>
<if test="subTaskDto.sfkyyjPdbz != '' and subTaskDto.sfkyyjPdbz != null">
and s.sfkyyj_pdbz = #{subTaskDto.sfkyyjPdbz, jdbcType=VARCHAR}
</if>
<choose>
<when test="subTaskDto.beginTime != null and subTaskDto.endTime !=null">
AND s.rksj between #{subTaskDto.beginTime} and #{subTaskDto.endTime}
......@@ -176,6 +212,7 @@
AND s.fksj &lt;= #{subTaskDto.zrwfkjssj}
</when>
</choose>
order by rksj desc
</select>
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbStAsjMapper.xml
......@@ -2,4 +2,52 @@
<!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.TbStAsjMapper">
<select id="relateBl" resultType="java.lang.Integer">
select count(*)
from TB_XW_FLWS_BL
where asjbh = #{asjbh}
or jjbh = #{jjbh}
</select>
<select id="relateXk" resultType="java.lang.Integer">
SELECT count(*)
FROM xk_xcjbxx bx,
XK_AJXX xk
where 1 = 1
and bx.ajid = xk.ID
and ajbh = #{asjbh}
and scbz = '0'
</select>
<select id="relateSjjz" resultType="java.lang.Integer">
select count(*)
from TB_XW_ASJSJJZ
where asjbh = #{asjbh}
and sfjbjztj = '1'
</select>
<select id="relateSssj" resultType="java.lang.Integer">
select count(*)
from tb_xw_ssydtxsb
where asjbh = #{asjbh}
</select>
<select id="relateSscl" resultType="java.lang.Integer">
select count(*)
from tb_xw_ssddfjdc
where asjbh = #{asjbh}
</select>
<select id="selectRelateAsj" resultType="com.founder.commonutils.model.zczxEntity.TbStAsj">
select asjbh,
jjbh,
ajmc,
zcjddm,
(select name from SYS_DICTITEM where groupid='CODE_ZCJDDM' AND code = t.zcjddm) as zcjddmStr,
(select count(*) from TB_XW_FLWS_BL where asjbh = t.asjbh or jjbh = t.jjbh) as bls,
(SELECT count(*) FROM xk_xcjbxx bx, XK_AJXX xk where bx.ajid = xk.ID and ajbh = t.asjbh and scbz = '0') as xks,
(select count(*) from TB_XW_ASJSJJZ where asjbh = t.asjbh and sfjbjztj = '1') as sjjzs,
(select count(*) from tb_xw_ssydtxsb where asjbh = t.asjbh) as sssjs,
(select count(*) from tb_xw_ssddfjdc where asjbh = t.asjbh) as sscls,
asjfssj_asjfskssj,
jyaq as asjJyqk,
tz_pdbz_dg,
xxsc_pdbz
from tb_st_asj t where asjbh = #{asjbh}
</select>
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/XcrwMapper.xml
......@@ -72,6 +72,7 @@
end as auditStatusStr,
ad.audit_user_id,
ad.audit_user_name,
ad.audit_user_lxdh,
ad.audit_time,
ad.audit_opinion,
ad.audit_remark
......@@ -85,6 +86,9 @@
<if test="xcrwDto.xcrwjsrzh!=null and xcrwDto.xcrwjsrzh!=''">
AND x.xcrwjsrzh = #{xcrwDto.xcrwjsrzh , jdbcType=VARCHAR }
</if>
<if test="xcrwDto.xcrwThzt!=null and xcrwDto.xcrwThzt!=''">
AND x.xcrw_thzt = #{xcrwDto.xcrwThzt , jdbcType=VARCHAR }
</if>
<!-- <choose>-->
<!-- <when test="xcrwDto.xcrwjsrzh!=null and xcrwDto.xcrwjsrzh!='' and xcrwDto.xcrwjsrzh.length() == 12">-->
<!-- AND x.xcrwjsrzh like SUBSTR(#{xcrwDto.xcrwjsrzh , jdbcType=VARCHAR },1,6) || '%'-->
......@@ -99,6 +103,9 @@
<if test="xcrwDto.xcrwbh!=null and xcrwDto.xcrwbh!=''">
AND x.xcrwbh = #{xcrwDto.xcrwbh , jdbcType=VARCHAR }
</if>
<if test="xcrwDto.xcrwFkzt!=null and xcrwDto.xcrwFkzt!=''">
AND x.xcrw_fkzt = #{xcrwDto.xcrwFkzt , jdbcType=VARCHAR }
</if>
<if test="xcrwDto.asjbh!=null and xcrwDto.asjbh!=''">
AND x.asjbh = #{xcrwDto.asjbh , jdbcType=VARCHAR }
</if>
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/XyrMapper.xml 0 → 100644
<?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.XyrMapper">
</mapper>
\ No newline at end of file
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">
<update id="restartZczx" parameterType="String">
update tb_wh_zczx set
zczx_state = '0',
wcsj = null,
cqsj = sysdate
where
<if test="zxbh != null and zxbh != ''">
zxbh=#{zxbh}
</if>
</update>
<select id="listZczxForPage" resultType="com.founder.commonutils.model.zczxEntity.Zczx"
parameterType="com.founder.commonutils.model.zczxEntity.ZczxDto">
......@@ -33,6 +43,10 @@
z.jqbh,
z.asjbh,
z.txzt,
z.sfwc_pdbz,
z.wcsj,
z.zczx_state,
z.cqsj,
q.bjnr as jqJyqk,
j.ajmc,
j.jyaq as asjJyqk,
......@@ -165,6 +179,10 @@
z.jqbh,
z.asjbh,
z.txzt,
z.sfwc_pdbz,
z.wcsj,
z.zczx_state,
z.cqsj,
q.bjnr as jqJyqk,
j.ajmc,
j.jyaq as asjJyqk,
......@@ -308,6 +326,10 @@
z.jqbh,
z.asjbh,
z.txzt,
z.sfwc_pdbz,
z.wcsj,
z.zczx_state,
z.cqsj,
q.bjnr as jqJyqk,
j.ajmc,
j.jyaq as asjJyqk,
......@@ -451,6 +473,10 @@
z.jqbh,
z.asjbh,
z.txzt,
z.sfwc_pdbz,
z.wcsj,
z.zczx_state,
z.cqsj,
q.bjnr as jqJyqk,
j.ajmc,
j.jyaq as asjJyqk,
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ZczxRoleMapper.xml
......@@ -25,9 +25,11 @@
r.gxsj,
a.id approveId,
a.audit_type,
a.audit_status
a.audit_status,
u.truename
from tb_wh_zczx_role r
left join tb_wh_approve a on r.id = a.flow_no
left join sys_users u on r.policemanid = u.policemanid
where
1=1
AND r.xxsc_pdbz = '0'
......
service/publicapi/src/main/java/com/founder/publicapi/service/ApproveService.java
......@@ -2,6 +2,7 @@ package com.founder.publicapi.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.zczxEntity.Approve;
import com.founder.commonutils.model.zczxEntity.ApproveDto;
......@@ -13,4 +14,6 @@ public interface ApproveService extends IService<Approve> {
IPage<Approve> listApproveForPage(IPage page, ApproveDto approveDto);
MapRestResult sp(ApproveDto approveDto);
}
service/publicapi/src/main/java/com/founder/publicapi/service/ClueService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.zczxEntity.Clue;
import com.founder.commonutils.model.zczxEntity.TbXwZbfzxyrDto;
/**
* @author Godffy
* @create 2023-08-25 9:20
*/
public interface ClueService extends IService<Clue> {
MapRestResult selectAllPotentialCase(TbXwZbfzxyrDto zbfzxyrDto);
}
service/publicapi/src/main/java/com/founder/publicapi/service/PowerJobService.java 0 → 100644
package com.founder.publicapi.service;
import com.founder.commonutils.model.zczxEntity.XjCount;
import java.util.List;
/**
* @author Godffy
* @create 2023-08-22 14:55
*/
public interface PowerJobService {
List<XjCount> selectSfxjByAsjbh(String asjbh);
}
service/publicapi/src/main/java/com/founder/publicapi/service/ScxxzjbhService.java 0 → 100644
package com.founder.publicapi.service;
public interface ScxxzjbhService {
//生成信息主键编号
String xxzjbhFnVal(String unitcode,String tableName);
}
service/publicapi/src/main/java/com/founder/publicapi/service/SendMessageService.java 0 → 100644
package com.founder.publicapi.service;
public interface SendMessageService {
public boolean sendOneMessage(String phone, String content);
}
service/publicapi/src/main/java/com/founder/publicapi/service/XyrService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.zczxEntity.TbXwZbfzxyr;
/**
* @author Godffy
* @create 2023-08-25 15:09
*/
public interface XyrService extends IService<TbXwZbfzxyr> {
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ClueServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.zczxEntity.Clue;
import com.founder.commonutils.model.zczxEntity.TbStAsj;
import com.founder.commonutils.model.zczxEntity.TbXwZbfzxyr;
import com.founder.commonutils.model.zczxEntity.TbXwZbfzxyrDto;
import com.founder.publicapi.mapper.mysqlMapper.ClueMapper;
import com.founder.publicapi.mapper.mysqlMapper.TbStAsjMapper;
import com.founder.publicapi.mapper.mysqlMapper.TbXwZbfzxyrMapper;
import com.founder.publicapi.service.ClueService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
/**
* @author Godffy
* @create 2023-08-25 9:25
*/
@Service
public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements ClueService {
@Autowired
private TbXwZbfzxyrMapper tbXwZbfzxyrMapper;
@Autowired
private TbStAsjMapper tbStAsjMapper;
@Override
public MapRestResult selectAllPotentialCase(TbXwZbfzxyrDto zbfzxyrDto) {
QueryWrapper<TbXwZbfzxyr> qw = new QueryWrapper<>();
qw.eq("asjbh", zbfzxyrDto.getAsjbh());
qw.eq("xxsc_pdbz", "0");
List<TbXwZbfzxyr> xyrList = this.tbXwZbfzxyrMapper.selectList(qw);//把犯罪嫌疑人列表查出来
if (xyrList.size()>0){
List<String> zjhms = new ArrayList<>();
//拿到涉及的证件号码后再重新去查涉及到哪些案件
for (int i = 0; i < xyrList.size(); i++) {
TbXwZbfzxyr zbfzxyr = xyrList.get(i);
String zhfzxyrCyzjZjhm = zbfzxyr.getZhfzxyrCyzjZjhm();
if (StringUtils.isNotBlank(zhfzxyrCyzjZjhm) && !zhfzxyrCyzjZjhm.equals("不详")) {
zjhms.add(zhfzxyrCyzjZjhm);
}
}
QueryWrapper<TbXwZbfzxyr> qw2 = new QueryWrapper<>();
qw2.select("ASJBH");
qw2.in("zhfzxyr_cyzj_zjhm", zjhms);
qw2.eq("xxsc_pdbz", "0");
List<TbXwZbfzxyr> asjbhList = this.tbXwZbfzxyrMapper.selectList(qw2);
//把案事件编号拿出来
List<String> asjbhs = new ArrayList<>();
for (int i = 0; i < asjbhList.size(); i++) {
String asjbh = asjbhList.get(i).getAsjbh();
asjbhs.add(asjbh);
}
HashSet<String> set = new HashSet<>(asjbhs);//去重
List<TbStAsj> tbStAsjs = new ArrayList<>();
for (String asjbh : set) {
TbStAsj asj = this.tbStAsjMapper.selectRelateAsj(asjbh);
tbStAsjs.add(asj);
}
return new MapRestResult(200, "查询成功!", tbStAsjs.size(), tbStAsjs);
}
return new MapRestResult(201, "该案件没有关联嫌疑人", null);
}
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/PowerJobServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.founder.commonutils.model.zczxEntity.XjCount;
import com.founder.publicapi.mapper.mysqlMapper.PowerJobMapper;
import com.founder.publicapi.service.PowerJobService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author Godffy
* @create 2023-08-22 14:55
*/
@Service
public class PowerJobServiceImpl implements PowerJobService {
@Autowired
private PowerJobMapper powerJobMapper;
@Override
public List<XjCount> selectSfxjByAsjbh(String asjbh) {
List<XjCount> xjCounts = this.powerJobMapper.selectSfxjByAsjbh(asjbh);
return xjCounts;
}
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ScxxzjbhServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.founder.publicapi.mapper.mysqlMapper.ScxxzjbhMapper;
import com.founder.publicapi.service.ScxxzjbhService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
@Service
public class ScxxzjbhServiceImpl implements ScxxzjbhService {
@Autowired
private ScxxzjbhMapper scxxzjbhMapper;
@Override
public String xxzjbhFnVal(String unitcode, String tableName) {
SimpleDateFormat formatter = new SimpleDateFormat("yyyyMM");
HashMap statMap = new HashMap();
statMap.put("unitcode", unitcode);
statMap.put("tableName", tableName);
statMap.put("lrsj", formatter.format(new Date()));
return scxxzjbhMapper.xxzjbhFnVal(statMap);
}
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SendMessageServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.founder.commonutils.model.zczxEntity.SendMessageEntity;
import com.founder.publicapi.mapper.dxptMapper.SendMessageMapper;
import com.founder.publicapi.service.ScxxzjbhService;
import com.founder.publicapi.service.SendMessageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class SendMessageServiceImpl implements SendMessageService {
@Autowired
private SendMessageMapper sendMessageMapper;
@Autowired
private ScxxzjbhService scxxzjbhService;
@Override
public boolean sendOneMessage(String phone, String content) {
SendMessageEntity sendMessageEntity = new SendMessageEntity();
sendMessageEntity.setPhone(phone);
sendMessageEntity.setContent(content);
sendMessageEntity.setId("wh-"+ scxxzjbhService.xxzjbhFnVal("4419","massi"));
int i = sendMessageMapper.sendMessage(sendMessageEntity);
if (i > 0) {
return true;
}
return false;
}
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/XyrServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.zczxEntity.TbXwZbfzxyr;
import com.founder.publicapi.mapper.mysqlMapper.XyrMapper;
import com.founder.publicapi.service.XyrService;
import org.springframework.stereotype.Service;
/**
* @author Godffy
* @create 2023-08-25 15:09
*/
@Service
public class XyrServiceImpl extends ServiceImpl<XyrMapper, TbXwZbfzxyr> implements XyrService {
}
service/publicapi/src/main/resources/bootstrap-dev.properties
......@@ -9,9 +9,9 @@ logging.level.root=INFO
#mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
spring.datasource.xzxtdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.xzxtdb.url=ENC(H+O1lDz6YlXQrP8pdggssa9HwKrGdiUGn9eDVUxDu3Rgcb/LGGPTWIVh1Pgm+Oqrnp9Jb+1uQ2w=)
spring.datasource.xzxtdb.username=ENC(bbchOm/eD/SRuJWxX0CNCA==)
spring.datasource.xzxtdb.password=ENC(CbwVF+twcaq9ki9I8xZ2IIoYPcdZKD8Q)
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
......@@ -79,49 +79,49 @@ logUrl=http://39.99.155.173:8764/yhczrz/savaYhczrz
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
#admin服务监控添加描述（页面细节里的信息 描述、作者、版本）
#admin\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04B3\uFFFD\uFFFD\u03F8\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u03E2 \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u07E1\uFFFD\uFFFD\u6C7E\uFFFD\uFFFD
info.describe=SpringBoot_Founder_publicapi
info.author=founder
info.version=1.0.0
info.adderss=http://47.92.48.137:1004/#/login
spring.boot.admin.client.instance.prefer-ip=true
#启用端点，默认情况下，除shutdown以外的所有端点均已启用
#\uFFFD\uFFFD\uFFFD\u00F6\u02F5\u38EC\u012C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00A3\uFFFD\uFFFD\uFFFDshutdown\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0436\u02F5\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
management.endpoint.shutdown.enabled=true
#显示db、redis、rabbti连接情况等
#\uFFFD\uFFFD\u02BEdb\uFFFD\uFFFDredis\uFFFD\uFFFDrabbti\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
management.endpoint.health.show-details=always
#健康状态禁用指标
#\uFFFD\uFFFD\uFFFD\uFFFD\u05F4\u032C\uFFFD\uFFFD\uFFFD\uFFFD\u05B8\uFFFD\uFFFD
management.health.redis.enabled=false
management.health.mail.enabled=false
#公开所有端点web接口
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0436\u02F5\uFFFDweb\uFFFD\u04FF\uFFFD
management.endpoints.web.exposure.include=*
#服务端admin-server地址，以及登录账号、密码
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFDadmin-server\uFFFD\uFFFD\u05B7\uFFFD\uFFFD\uFFFD\u053C\uFFFD\uFFFD\uFFFD\u00BC\uFFFD\u02FA\u0161\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
spring.boot.admin.client.url=http://47.92.48.137:10010
spring.boot.admin.client.username=admin
spring.boot.admin.client.password=admin
#spring.boot.admin.monitor.default-timeout=30000
##可在线查看日志， 日志实时查看是client提供一个读取本地文件的接口，然后admin定时调用显示，达到实时展示的效果。
##\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u07F2\u9FF4\uFFFD\uFFFD\u05BE\uFFFD\uFFFD \uFFFD\uFFFD\u05BE\u02B5\u02B1\uFFFD\u9FF4\uFFFD\uFFFDclient\uFFFD\u1E69\u04BB\uFFFD\uFFFD\uFFFD\uFFFD\u0221\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u013C\uFFFD\uFFFD\u013D\u04FF\u06A3\uFFFD\u023B\uFFFD\uFFFDadmin\uFFFD\uFFFD\u02B1\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02BE\uFFFD\uFFFD\uFFFD\uFD7D\u02B5\u02B1\u0579\u02BE\uFFFD\uFFFD\u0427\uFFFD\uFFFD\uFFFD\uFFFD
management.endpoint.logfile.enabled=true
#生成日志的路径跟暴露给服务端的路径要一致---页面日志文件写本地生成日志文件的路径
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\u00B7\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00B6\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02F5\uFFFD\u00B7\uFFFD\uFFFD\u04AA\u04BB\uFFFD\uFFFD---\u04B3\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\u013C\uFFFD\u0434\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\u013C\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
management.endpoint.logfile.external-file= /data2/skglpt/publicapi1003.log
#是否开启powerjob
#\uFFFD\u01F7\uFFFD\uFFFD\uFFFDpowerjob
powerjob.worker.enabled=true
# akka 工作端口，可选，默认 27778
# akka \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02FF\u06A3\uFFFD\uFFFD\uFFFD\u0461\uFFFD\uFFFD\u012C\uFFFD\uFFFD 27778
powerjob.worker.akka-port=27778
# 接入应用名称，用于分组隔离，推荐填写 本 Java 项目名称
# \uFFFD\uFFFD\uFFFD\uFFFD\u04E6\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u01A3\uFFFD\uFFFD\uFFFD\uFFFD\u06B7\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uB8EC\uFFFD\u01BC\uFFFD\uFFFD\uFFFD\u0434 \uFFFD\uFFFD Java \uFFFD\uFFFD\u013F\uFFFD\uFFFD\uFFFD\uFFFD
powerjob.worker.app-name=taskdg
# 调度服务器地址，IP:Port 或 域名，多值逗号分隔
# \uFFFD\uFFFD\uFFFD\u0237\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05B7\uFFFD\uFFFDIP:Port \uFFFD\uFFFD \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05B5\uFFFD\uFFFD\uFFFD\u0177\u05B8\uFFFD
powerjob.worker.server-address=127.0.0.1:7700,47.92.48.137:7700
# 通讯协议，4.3.0 开始支持 HTTP 和 AKKA 两种协议
# \u0368\u0476\u042D\uFFFD\u98EC4.3.0 \uFFFD\uFFFD\u02BC\u05A7\uFFFD\uFFFD HTTP \uFFFD\uFFFD AKKA \uFFFD\uFFFD\uFFFD\uFFFD\u042D\uFFFD\uFFFD
powerjob.worker.protocol=akka
# 持久化方式，可选，默认 disk
# \uFFFD\u05BE\u00FB\uFFFD\uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD\u0461\uFFFD\uFFFD\u012C\uFFFD\uFFFD disk
powerjob.worker.store-strategy=disk
# 任务返回结果信息的最大长度，超过这个长度的信息会被截断，默认值 8192
# \uFFFD\uFFFD\uFFFD\uD99F\uDD7B\u063D\uFFFD\uFFFD\uFFFD\uFFFD\u03E2\uFFFD\uFFFD\uFFFD\uFFFD\uDB8E\uDD36\u0223\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0235\uFFFD\uFFFD\uFFFD\u03E2\uFFFD\u1C7B\uFFFD\u0636\u03E3\uFFFD\u012C\uFFFD\uFFFD\u05B5 8192
powerjob.worker.max-result-length=4096
# 单个任务追加的工作流上下文最大长度，超过这个长度的会被直接丢弃，默认值 8192
# \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05F7\uFFFD\u04F5\u0139\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uDB8E\uDD36\u0223\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0235\u013B\u1C7B\u05B1\uFFFD\u04F6\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u05B5 8192
powerjob.worker.max-appended-wf-context-length=4096
# 同时运行的轻量级任务数量上限
# \u036C\u02B1\uFFFD\uFFFD\uFFFD\u0435\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
powerjob.worker.max-lightweight-task-num=1024
# 同时运行的重量级任务数量上限
# \u036C\u02B1\uFFFD\uFFFD\uFFFD\u0435\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
powerjob.worker.max-heavy-task-num=64
\ No newline at end of file
service/publicapi/src/main/resources/bootstrap-prod.properties
......@@ -20,6 +20,13 @@ spring.datasource.oracledb.username=ENC(yITtMpDU9iFa7spyahMKPQ==)
spring.datasource.oracledb.password=ENC(fVPAdBUhJ4IEnVCVkM5BbA==)
spring.datasource.oracledb.type=com.alibaba.druid.pool.DruidDataSource
#\u77ED\u4FE1\u5E73\u53F0
spring.datasource.dxpt.url=ENC(XPY3BSYExrLBPR79hbSdIK9iB7xkGq56Hr7P3n8wC/lJaMjtzTm683nN6QHZJvAhT7/iVGpxg/mH9qRAETaPF7VVdqvZjzCY)
spring.datasource.dxpt.username=ENC(ctWB+TVtB3dBFVZmA+06L0Grj2HMrZc7)
spring.datasource.dxpt.password=ENC(jFWJr9iR+qzzOO6BGQ+9wJh31BYDk648)
spring.datasource.dxpt.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.dxpt.type=com.alibaba.druid.pool.DruidDataSource
#redis
spring.redis.host=47.92.225.109
......@@ -81,49 +88,49 @@ 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
#admin服务监控添加描述（页面细节里的信息 描述、作者、版本）
#admin\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04B3\uFFFD\uFFFD\u03F8\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u03E2 \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u07E1\uFFFD\uFFFD\u6C7E\uFFFD\uFFFD
info.describe=SpringBoot_Founder_publicapi
info.author=founder
info.version=1.0.0
info.adderss=http://47.92.48.137:1004/#/login
spring.boot.admin.client.instance.prefer-ip=true
#启用端点，默认情况下，除shutdown以外的所有端点均已启用
#\uFFFD\uFFFD\uFFFD\u00F6\u02F5\u38EC\u012C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00A3\uFFFD\uFFFD\uFFFDshutdown\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0436\u02F5\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
management.endpoint.shutdown.enabled=true
#显示db、redis、rabbti连接情况等
#\uFFFD\uFFFD\u02BEdb\uFFFD\uFFFDredis\uFFFD\uFFFDrabbti\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
management.endpoint.health.show-details=always
#健康状态禁用指标
#\uFFFD\uFFFD\uFFFD\uFFFD\u05F4\u032C\uFFFD\uFFFD\uFFFD\uFFFD\u05B8\uFFFD\uFFFD
management.health.redis.enabled=false
management.health.mail.enabled=false
#公开所有端点web接口
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0436\u02F5\uFFFDweb\uFFFD\u04FF\uFFFD
management.endpoints.web.exposure.include=*
#服务端admin-server地址，以及登录账号、密码
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFDadmin-server\uFFFD\uFFFD\u05B7\uFFFD\uFFFD\uFFFD\u053C\uFFFD\uFFFD\uFFFD\u00BC\uFFFD\u02FA\u0161\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
spring.boot.admin.client.url=http://47.92.48.137:10010
spring.boot.admin.client.username=admin
spring.boot.admin.client.password=admin
#spring.boot.admin.monitor.default-timeout=30000
##可在线查看日志， 日志实时查看是client提供一个读取本地文件的接口，然后admin定时调用显示，达到实时展示的效果。
##\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u07F2\u9FF4\uFFFD\uFFFD\u05BE\uFFFD\uFFFD \uFFFD\uFFFD\u05BE\u02B5\u02B1\uFFFD\u9FF4\uFFFD\uFFFDclient\uFFFD\u1E69\u04BB\uFFFD\uFFFD\uFFFD\uFFFD\u0221\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u013C\uFFFD\uFFFD\u013D\u04FF\u06A3\uFFFD\u023B\uFFFD\uFFFDadmin\uFFFD\uFFFD\u02B1\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02BE\uFFFD\uFFFD\uFFFD\uFD7D\u02B5\u02B1\u0579\u02BE\uFFFD\uFFFD\u0427\uFFFD\uFFFD\uFFFD\uFFFD
management.endpoint.logfile.enabled=true
#生成日志的路径跟暴露给服务端的路径要一致---页面日志文件写本地生成日志文件的路径
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\u00B7\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00B6\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02F5\uFFFD\u00B7\uFFFD\uFFFD\u04AA\u04BB\uFFFD\uFFFD---\u04B3\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\u013C\uFFFD\u0434\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\u013C\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
management.endpoint.logfile.external-file= /data2/skglpt/publicapi1003.log
#是否开启powerjob
powerjob.worker.enabled=true
# akka 工作端口，可选，默认 27778
#\uFFFD\u01F7\uFFFD\uFFFD\uFFFDpowerjob
powerjob.worker.enabled=false
# akka \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02FF\u06A3\uFFFD\uFFFD\uFFFD\u0461\uFFFD\uFFFD\u012C\uFFFD\uFFFD 27778
powerjob.worker.akka-port=27778
# 接入应用名称，用于分组隔离，推荐填写 本 Java 项目名称
# \uFFFD\uFFFD\uFFFD\uFFFD\u04E6\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u01A3\uFFFD\uFFFD\uFFFD\uFFFD\u06B7\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uB8EC\uFFFD\u01BC\uFFFD\uFFFD\uFFFD\u0434 \uFFFD\uFFFD Java \uFFFD\uFFFD\u013F\uFFFD\uFFFD\uFFFD\uFFFD
powerjob.worker.app-name=taskdg
# 调度服务器地址，IP:Port 或 域名，多值逗号分隔
# \uFFFD\uFFFD\uFFFD\u0237\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05B7\uFFFD\uFFFDIP:Port \uFFFD\uFFFD \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05B5\uFFFD\uFFFD\uFFFD\u0177\u05B8\uFFFD
powerjob.worker.server-address=127.0.0.1:7700,47.92.48.137:7700
# 通讯协议，4.3.0 开始支持 HTTP 和 AKKA 两种协议
# \u0368\u0476\u042D\uFFFD\u98EC4.3.0 \uFFFD\uFFFD\u02BC\u05A7\uFFFD\uFFFD HTTP \uFFFD\uFFFD AKKA \uFFFD\uFFFD\uFFFD\uFFFD\u042D\uFFFD\uFFFD
powerjob.worker.protocol=akka
# 持久化方式，可选，默认 disk
# \uFFFD\u05BE\u00FB\uFFFD\uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD\u0461\uFFFD\uFFFD\u012C\uFFFD\uFFFD disk
powerjob.worker.store-strategy=disk
# 任务返回结果信息的最大长度，超过这个长度的信息会被截断，默认值 8192
# \uFFFD\uFFFD\uFFFD\uD99F\uDD7B\u063D\uFFFD\uFFFD\uFFFD\uFFFD\u03E2\uFFFD\uFFFD\uFFFD\uFFFD\uDB8E\uDD36\u0223\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0235\uFFFD\uFFFD\uFFFD\u03E2\uFFFD\u1C7B\uFFFD\u0636\u03E3\uFFFD\u012C\uFFFD\uFFFD\u05B5 8192
powerjob.worker.max-result-length=4096
# 单个任务追加的工作流上下文最大长度，超过这个长度的会被直接丢弃，默认值 8192
# \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05F7\uFFFD\u04F5\u0139\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uDB8E\uDD36\u0223\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0235\u013B\u1C7B\u05B1\uFFFD\u04F6\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u05B5 8192
powerjob.worker.max-appended-wf-context-length=4096
# 同时运行的轻量级任务数量上限
# \u036C\u02B1\uFFFD\uFFFD\uFFFD\u0435\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
powerjob.worker.max-lightweight-task-num=1024
# 同时运行的重量级任务数量上限
# \u036C\u02B1\uFFFD\uFFFD\uFFFD\u0435\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
powerjob.worker.max-heavy-task-num=64
\ No newline at end of file
service/publicapi/src/main/resources/bootstrap.properties
spring.profiles.active=dev
spring.profiles.active=prod
server.port=1003
spring.application.name=Founder_skyp_publicapi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment