Skip to content

M
map-parent
Commit f5db33fc by Guojunfeng
Options

网合平台相关代码更新

parent 0fb9b3b7
Showing with 309 additions and 10 deletions
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/TbStAsj.java
......@@ -25,13 +25,26 @@ public class TbStAsj extends Model<TbStAsj> {
private String asjbh;
@ApiModelProperty(value = "案件名称")
@TableField(value = "ajmc")
private String ajmc;
@ApiModelProperty(value = "案事件发生时间_案事件发生开始时间")
@TableField(value = "asjfssj_asjfskssj")
private Date asjfssjAsjfskssj;
@ApiModelProperty(value = "案事件简要情况")
@TableField(value = "jyaq")
private String asjJyqk;
/**
* 东莞专用 是否图侦- 0未图侦 1-已图侦
*/
@ApiModelProperty(value = "是否图侦")
@TableField(value = "tz_pdbz_dg")
private String tzPdbzDg;
@ApiModelProperty(value = "信息删除_判断标识")
@TableField(value = "xxsc_pdbz")
private String xxscPdbz;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/TbXwZbfzxyr.java 0 → 100644
package com.founder.commonutils.model.zczxEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Godffy
* @create 2023-08-22 10:20
*/
@Data
@TableName("TB_XW_ZBFZXYR")
@ApiModel(value = "抓捕犯罪嫌疑人(TB_XW_ZBFZXYR)表实体类",description = "")
public class TbXwZbfzxyr extends Model<TbXwZbfzxyr> {
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "信息主键编号")
private String xxzjbh;
@ApiModelProperty(value = "案事件编号")
@TableField(value = "asjbh")
private String asjbh;
@ApiModelProperty(value = "信息删除_判断标识")
@TableField(value = "xxsc_pdbz")
private String xxscPdbz;
@ApiModelProperty(value = "到案状态")
@TableField(value = "zhfzxyr_fzxyrdaztdm")
private String zhfzxyrFzxyrdaztdm;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/TbYwXszCbaj.java 0 → 100644
package com.founder.commonutils.model.zczxEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Godffy
* @create 2023-08-22 9:27
*/
@Data
@TableName("tb_yw_xsz_cbaj")
@ApiModel(value = "线索组(tb_yw_xsz_cbaj)表实体类", description = "")
public class TbYwXszCbaj extends Model<TbYwXszCbaj> {
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "线索组案件编号")
private String xszajbh;
@ApiModelProperty(value = "信息主键编号")
@TableField(value = "xxzjbh")
private String xxzjbh;
@ApiModelProperty(value = "信息删除_判断标识")
@TableField(value = "xxsc_pdbz")
private String xxscPdbz;
@ApiModelProperty(value = "信息来源描述")
@TableField(value = "xxlyms")
private String xxlyms;
@ApiModelProperty(value = "案事件编号")
@TableField(value = "asjbh")
private String asjbh;
@ApiModelProperty(value = "侦查行为依据描述")
@TableField(value = "zcxwyjms")
private String zcxwyjms;
@ApiModelProperty(value = "串并相关服务标识号")
@TableField(value = "cbxgfwbzh")
private String cbxgfwbzh;
@ApiModelProperty(value = "串并类型")
@TableField(value = "cblx")
private String cblx;
}
common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java
......@@ -151,6 +151,8 @@ public class SysUserController extends ApiController {
qw.likeRight(StringUtils.isNotBlank(sysUser.getUnitcode()),"unitcode",sysUser.getUnitcode());
qw.eq("scbz","0");//未删除
qw.eq("open_flag","1");//已激活
qw.eq(StringUtils.isNotBlank(sysUser.getWhggzhFlag()),"whggzh_flag",sysUser.getWhggzhFlag());//是否为网合公共账号
qw.eq(StringUtils.isNotBlank(sysUser.getWhzhzxFlag()),"whzhzx_flag",sysUser.getWhzhzxFlag());//是否为网合指挥中心公共账号
List<SysUser> list = this.sysUserService.list(qw);
return MapRestResult.build(200, "按条件查询用户表信息（不分页）", list);
}
......
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/XcrwController.java
......@@ -100,26 +100,38 @@ public class XcrwController extends ApiController {
zczx.setSffqjzypPdbz("1");
xcrw.setXcrwjsrzh("441917000000");//市局技侦网合
xcrw.setXcrwjsrdwdm("441917000000");//接收人单位代码
xcrw.setXcrwjsrxm("技术侦察支队");
xcrw.setXcrwjsrdwmc("技术侦察支队");
} else if (StringUtils.isNotBlank(xcrwlx) && "2".equals(xcrwlx)) {
zczx.setSffqsjwjwhPdbz("1");
xcrw.setXcrwjsrzh("441905000000");//市局网警网合
xcrw.setXcrwjsrdwdm("441905000000");//接收人单位代码
xcrw.setXcrwjsrxm("网络警察支队");
xcrw.setXcrwjsrdwmc("网络警察支队");
} else if (StringUtils.isNotBlank(xcrwlx) && "3".equals(xcrwlx)) {
zczx.setSffqsjqbwhPdbz("1");
xcrw.setXcrwjsrzh("441933020000");//市局情报网合
xcrw.setXcrwjsrdwdm("441933020000");//接收人单位代码
xcrw.setXcrwjsrzh("441933000000");//市局情报网合
xcrw.setXcrwjsrdwdm("441933000000");//接收人单位代码
xcrw.setXcrwjsrxm("联合情报作战中心");
xcrw.setXcrwjsrdwmc("联合情报作战中心");
} else if (StringUtils.isNotBlank(xcrwlx) && "4".equals(xcrwlx)) {
//分局网合也是指定的接收账号,用户表新建各分局的分局网合公共账号,还没确定字典和用户入库！！！！！！！！
zczx.setSffqfjwhPdbz("1");//分局网合
String substring = unitcode.substring(0, 6);
substring = substring + "000000";//不是在循环体内不考虑并发
xcrw.setXcrwjsrzh(substring);//登录人的所属分局单位
xcrw.setXcrwjsrdwdm(substring);//接收人单位代码
// String substring = unitcode.substring(0, 6);
// substring = substring + "000000";//不是在循环体内不考虑并发
// xcrw.setXcrwjsrzh(substring);//登录人的所属分局单位
// xcrw.setXcrwjsrdwdm(substring);//接收人单位代码
xcrw.setXcrwjsrzh(xcrwDto.getXcrwjsrzh());//前端指定接收账号
xcrw.setXcrwjsrdwdm(xcrwDto.getXcrwjsrzh());//接收人单位代码
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());//接收人单位代码
xcrw.setXcrwjsrxm(xcrwDto.getXcrwjsrxm());//接收人姓名
xcrw.setXcrwjsrdwmc(xcrwDto.getXcrwjsrdwmc());//接收人单位名称
}
xcrwService.save(xcrw);//插入协查任务
zczxService.update(zczx, updateWrapper);//更新侦查专项状态
......
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxController.java
......@@ -10,10 +10,7 @@ import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.newPublicEntity.SysUser;
import com.founder.commonutils.model.zczxEntity.*;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.service.ApproveDetailService;
import com.founder.publicapi.service.ApproveService;
import com.founder.publicapi.service.ZczxRoleService;
import com.founder.publicapi.service.ZczxService;
import com.founder.publicapi.service.*;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import io.swagger.annotations.Api;
......@@ -51,6 +48,15 @@ public class ZczxController extends ApiController {
@Resource
private ApproveDetailService approveDetailService;
@Resource
private TbStAsjService tbStAsjService;
@Resource
private TbYwXszCbajService tbYwXszCbajService;
@Resource
private TbXwZbfzxyrService tbXwZbfzxyrService;
/**
* 创建侦查专项时，把当前用户的机构代码存到侦查专项角色表(TB_WH_ZCZX_ROLE)
*
......@@ -80,6 +86,45 @@ public class ZczxController extends ApiController {
zczx.setZxcjrjh(policemanid);//警号
zczx.setZxcjdwdm(unitcode);//创建人单位代码
zczx.setZxcjdwmc(unitname);//专项创建单位名称
String asjbh = zczx.getAsjbh();
//如果有案件编号,关联图侦、刑技、抓捕、串并状态插进侦查专项表
if (StringUtils.isNotBlank(asjbh)) {
//关联图侦
QueryWrapper<TbStAsj> tbStAsjQueryWrapper = new QueryWrapper<>();
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"
}
//关联刑技
//关联抓捕
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"
}
//关联串并
QueryWrapper<TbYwXszCbaj> tbYwXszCbajQueryWrapper = new QueryWrapper<>();
tbYwXszCbajQueryWrapper.eq("asjbh", asjbh);
tbYwXszCbajQueryWrapper.eq("xxsc_pdbz", "0");
TbYwXszCbaj tbYwXszCbaj = this.tbYwXszCbajService.getOne(tbYwXszCbajQueryWrapper);
if (tbYwXszCbaj != null) {
zczx.setSfcbaPdbz("1");//串并案状态设为"1"
}
}
//侦查专项编号，在警情和案件更新的情况下，是否变动？
zczxService.save(zczx);
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/TbStAsjMapper.java 0 → 100644
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.zczxEntity.TbStAsj;
/**
* @author Godffy
* @create 2023-08-22 9:20
*/
public interface TbStAsjMapper extends BaseMapper<TbStAsj> {
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/TbXwZbfzxyrMapper.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-22 10:28
*/
public interface TbXwZbfzxyrMapper extends BaseMapper<TbXwZbfzxyr> {
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/TbYwXszCbajMapper.java 0 → 100644
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.zczxEntity.TbYwXszCbaj;
/**
* @author Godffy
* @create 2023-08-22 10:01
*/
public interface TbYwXszCbajMapper extends BaseMapper<TbYwXszCbaj> {
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbStAsjMapper.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.TbStAsjMapper">
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbXwZbfzxyrMapper.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.TbXwZbfzxyrMapper">
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbYwXszCbajMapper.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.TbYwXszCbajMapper">
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/service/TbStAsjService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.zczxEntity.TbStAsj;
/**
* @author Godffy
* @create 2023-08-22 9:17
*/
public interface TbStAsjService extends IService<TbStAsj> {
}
service/publicapi/src/main/java/com/founder/publicapi/service/TbXwZbfzxyrService.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-22 10:27
*/
public interface TbXwZbfzxyrService extends IService<TbXwZbfzxyr> {
}
service/publicapi/src/main/java/com/founder/publicapi/service/TbYwXszCbajService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.zczxEntity.TbYwXszCbaj;
/**
* @author Godffy
* @create 2023-08-22 9:59
*/
public interface TbYwXszCbajService extends IService<TbYwXszCbaj> {
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/TbStAsjServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.zczxEntity.TbStAsj;
import com.founder.publicapi.mapper.mysqlMapper.TbStAsjMapper;
import com.founder.publicapi.service.TbStAsjService;
import org.springframework.stereotype.Service;
/**
* @author Godffy
* @create 2023-08-22 9:18
*/
@Service
public class TbStAsjServiceImpl extends ServiceImpl<TbStAsjMapper, TbStAsj> implements TbStAsjService {
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/TbXwZbfzxyrServiceImpl.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.TbXwZbfzxyrMapper;
import com.founder.publicapi.service.TbXwZbfzxyrService;
import org.springframework.stereotype.Service;
/**
* @author Godffy
* @create 2023-08-22 10:27
*/
@Service
public class TbXwZbfzxyrServiceImpl extends ServiceImpl<TbXwZbfzxyrMapper, TbXwZbfzxyr> implements TbXwZbfzxyrService {
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/TbYwXszCbajServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.zczxEntity.TbYwXszCbaj;
import com.founder.publicapi.mapper.mysqlMapper.TbYwXszCbajMapper;
import com.founder.publicapi.service.TbYwXszCbajService;
import org.springframework.stereotype.Service;
/**
* @author Godffy
* @create 2023-08-22 10:00
*/
@Service
public class TbYwXszCbajServiceImpl extends ServiceImpl<TbYwXszCbajMapper, TbYwXszCbaj> implements TbYwXszCbajService {
}
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