群体研判相关提交

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

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

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

@@ -69,4 +69,7 @@ public class AjQueryParam {
 
 	@ApiModelProperty(value = "共同关系系数")
 	private String commonRelationshipNum;
+
+	@ApiModelProperty(value = "0否 1是")
+	private String sfdj;
 }

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

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

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

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

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

@@ -118,6 +118,10 @@ public class TbStZtypFwbsh {
 	@TableField(exist = false)
 	private List<List<String>> unitcodeList;
 
+	@ApiModelProperty(value = "标识号表入参")
+	@TableField(exist = false)
+	private List<String>  bshlb;
+
 	//登录人员
 	public void setDjUser(SysUser user){
 		this.xxdjryXm=user.getTrueName();

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

@@ -323,6 +323,12 @@ public class TbYwCchshzztjb{
     @ApiModelProperty(value = "信息操作单位_联系电话")
     protected String xxczryLxdh;
 
+    @ApiModelProperty(value = "可视化案件编号集合")
+    protected List<String> asjbhList;
+
+    @ApiModelProperty(value = "可视化证件号集合")
+    protected List<String> zjhmList;
+
     public void setDjUser(SysUser user){
         this.xxdjryXm=user.getTrueName();
         this.xxdjdwGajgjgdm=user.getUnitcode();

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

@@ -117,21 +117,37 @@ public class ZtypController {
     @PostMapping("/queryAjypfx")
     @ApiOperation(value = "群体研判列表")
     public R queryAjypfx(AjQueryParam requestParam) {
-        requestParam.setPage((requestParam.getPage()-1) * requestParam.getLimit());
-        requestParam.setLimit(requestParam.getLimit());
-        Integer count = ztypService.queryAjypfxCount(requestParam);
+        Integer count = 0;
         List<AjypFxPojo> records = new ArrayList<>();
-        if (count != null && count > 0) {
-            records = ztypService.queryAjypfxData(requestParam);
+        if("0".equals(requestParam.getSfdj())){
+            requestParam.setPage((requestParam.getPage()-1) * requestParam.getLimit());
+            requestParam.setLimit(requestParam.getLimit());
+             count = ztypService.queryAjypfxCount(requestParam);
+            if (count != null && count > 0) {
+                records = ztypService.queryAjypfxData(requestParam);
+            }
+        }else if("1".equals(requestParam.getSfdj())){
+            requestParam.setPage((requestParam.getPage()-1) * requestParam.getLimit());
+            requestParam.setLimit(requestParam.getLimit());
+            count = ztypService.queryAjypfxCountDj(requestParam);
+            if (count != null && count > 0) {
+                records = ztypService.queryAjypfxDataDj(requestParam);
+            }
         }
         return R.ok().total(count).rows(records);
+
     }
 
     @OperLog(message = "案件团伙分析可视化接口",operation = OperationType.QUERY)
     @PostMapping("/getThfxAccompliceBythId")
     @ApiOperation(value = "案件团伙分析可视化接口")
     public MapRestResult getThfxAccompliceBythId(@RequestBody AjQueryParam requestParam) {
-        return ztypService.getThfxAccompliceBythId(requestParam.getThbh(), requestParam.getFxwd(),requestParam.getCommonRelationshipNum());
+        if("0".equals(requestParam.getSfdj())){
+            return ztypService.getThfxAccompliceBythId(requestParam.getThbh(), requestParam.getFxwd(),requestParam.getCommonRelationshipNum());
+        }else if("1".equals(requestParam.getSfdj())){
+            return ztypService.getThfxAccompliceBythIdDj(requestParam.getThbh(), requestParam.getFxwd(),requestParam.getCommonRelationshipNum());
+        }
+        return null;
     }
 
     @OperLog(message = "可视化",operation = OperationType.QUERY)
@@ -194,6 +210,20 @@ public class ZtypController {
         }
     }
 
+    @OperLog(message = "根据可视化登记为犯罪团伙",operation = OperationType.QUERY)
+    @PostMapping("/addFzthajKsh")
+    @ApiOperation(value = "根据可视化登记为犯罪团伙")
+    public R addFzthajKsh(TbYwCchshzztjb cchshzztjb,HttpServletRequest request){
+        try {
+            cchshzztjb.setDjUser(JwtUser.getUser(request));
+            String xxzjbh = ztypService.addFzthajKsh(cchshzztjb,request);
+            return R.ok().data("xxzjbh",xxzjbh);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error(e.getMessage());
+        }
+    }
+
     @PostMapping("getThgaByKsh")
     @ApiOperation(value = "查询可视化关联案件信息")
     @OperLog(message = "查询可视化关联案件信息", operation = OperationType.QUERY)

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

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

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

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

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

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

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

@@ -40,6 +40,8 @@ public interface ZtypService{
     void updateFwbshYp(TbStZtypFwbsh fwbsh);
     List<AjypFxPojo> queryAjypfxData(AjQueryParam requestParam);
     Integer queryAjypfxCount(AjQueryParam requestParam);
+    List<AjypFxPojo> queryAjypfxDataDj(AjQueryParam requestParam);
+    Integer queryAjypfxCountDj(AjQueryParam requestParam);
     /**
      * kshdata 标识号可视化
      * @param fwbsh: 标识号
@@ -69,6 +71,9 @@ public interface ZtypService{
     //根据推荐的团伙信息添加犯罪团伙
     String addFzthaj(TbYwCchshzztjb cchshzztjb, HttpServletRequest request);
 
+    //根据可视化团伙信息添加犯罪团伙
+    String addFzthajKsh(TbYwCchshzztjb cchshzztjb, HttpServletRequest request);
+
     Map<String, Object> getSjhJzxx(String phoneNum) throws Exception;
 
     Map<String, Object> getSjInfo(TxxxParam txxxParam) throws Exception;
@@ -77,5 +82,7 @@ public interface ZtypService{
 
     MapRestResult getThfxAccompliceBythId(String thbh, String fxwd, String commonRelationshipNum);
 
+    MapRestResult getThfxAccompliceBythIdDj(String thbh, String fxwd, String commonRelationshipNum);
+
     Integer judgePhone(String phoneNum);
 }