热力图提交

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

+package com.founder.commonutils.model.newPublicEntity.WarningEntity;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class CQTbStAsj {
+    private String asjbh;
+    private String ajmc;
+    private String ajlbdmMc;
+    private String zatzJyqkMc;
+    private String xzqhdm;
+    private String asjfsddDzMc;
+    private String x;
+    private String y;
+}

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

 package com.founder.commonutils.model.newPublicEntity.WarningEntity;
 
 import lombok.Data;
+
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -32,7 +34,9 @@ public class DataStatisticsParams {
     private String jswd;
     private List<String> ajlbmc;// 案件类别名称
     private List<String> zatzJyqk;// 小案类别名称
-
+    private List<String> ajlbdmList= new ArrayList<>();
+    private List<String> ajztdmList = new ArrayList<>();
+    private List<String> ladwList= new ArrayList<>();
     //模型编号
     private String mxbh;
     //案件状态

service/publicapi/src/main/java/com/founder/publicapi/controller/SkWarningService/DataStatisticsController.java

@@ -56,6 +56,14 @@ public class DataStatisticsController {
 
     }
 
+    @ApiOperation("一体化门户数据统计新地图数据透视列表上图")
+    @PostMapping("/getIntegratedTwoMapDetail")
+    @OperLog(message = "一体化门户数据统计新地图数据透视列表上图", operation = OperationType.QUERY)
+    public JSONObject getIntegratedTwoMapDetail(@RequestBody DataStatisticsParams params){
+        JSONObject resultObj=dataStatisticsService.getIntegratedTwoMapDetail(params);
+        return resultObj;
+    }
+
     /**
      * List<Map<String, Object>>转List<T>
      */

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

 package com.founder.publicapi.mapper.mysqlMapper;
 
 import com.founder.commonutils.model.newPublicEntity.SysDictitem;
+import com.founder.commonutils.model.newPublicEntity.WarningEntity.CQTbStAsj;
 import com.founder.commonutils.model.newPublicEntity.WarningEntity.DataStatisticsParams;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -30,4 +31,7 @@ public interface DataStatisticsMapperCqxz {
 
     //破案
     List<Map<String,Object>> getXzqhPaCount(DataStatisticsParams params);
+
+    //热力图
+    List<CQTbStAsj> getXzqhLaCountDetail(DataStatisticsParams params);
 }

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

@@ -158,4 +158,44 @@
             AND CODE like concat( #{ code , jdbcType=VARCHAR },'%')
         </if>
     </select>
+    <select id="getXzqhLaCountDetail" resultType="com.founder.commonutils.model.newPublicEntity.WarningEntity.CQTbStAsj"
+            parameterType="com.founder.commonutils.model.newPublicEntity.WarningEntity.DataStatisticsParams">
+        select a.ASJBH as asjbh,
+        a.ajmc as ajmc,
+        (select name from sys_dictitem where groupID='CODE_AJLB' AND
+        CODE=a.AJLBDM ) AS ajlbdmMc,
+        (select name from sys_dictitem where groupID='CODE_ZATZ' AND
+        CODE=a.ZATZ_JYQK ) AS zatzJyqkMc,
+        left(a.LADW_GAJGJGDM,6) as xzqhdm,
+        a.asjfsdd_DzMc as asjfsddDzMc,
+        a.asjfsdd_Dqjd as x,
+        a.asjfsdd_Dqwd as y
+        from tb_st_asj a where xxsc_pdbz='0'
+        AND (zcjddm like '04%' or zcjddm like '06%')
+        <if test="xaStartTime!=null and xaStartTime!=''">
+            and ASJFSSJ_ASJFSKSSJ<![CDATA[>=]]> str_to_date(#{xaStartTime},'%Y-%m-%d %H:%i:%s')
+        </if>
+        <if test="xaEndTime!=null and xaEndTime!=''">
+            and ASJFSSJ_ASJFSKSSJ<![CDATA[<=]]> str_to_date(#{xaEndTime},'%Y-%m-%d %H:%i:%s')
+        </if>
+        <if test="startTime!=null and startTime!=''">
+            and larq<![CDATA[>=]]> str_to_date(#{startTime},'%Y-%m-%d %H:%i:%s')
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and larq<![CDATA[<=]]> str_to_date(#{endTime},'%Y-%m-%d %H:%i:%s')
+        </if>
+        <if test="xzqhdm!=null and xzqhdm!=''">
+            and LADW_GAJGJGDM LIKE concat(#{xzqhdm},'%')
+        </if>
+        <if test="ajztdm!=null and ajztdm!=''">
+            and zcjddm in (${ajztdm})
+        </if>
+        <if test="xzlb!=null and xzlb!=''">
+            and ZATZ_JYQK in (${xzlb})
+        </if>
+        <if test="ajlbdm!=null and ajlbdm!=''">
+            and AJLBDM in (${ajlbdm})
+        </if>
+        limit 10000
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -7,5 +7,6 @@ public interface DataStatisticsService {
 
     JSONObject getIntegratedTwoMapNew(DataStatisticsParams params);
 
+    JSONObject getIntegratedTwoMapDetail(DataStatisticsParams params);
 
 }

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

@@ -5,10 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.founder.commonutils.model.newPublicEntity.SysDictitem;
-import com.founder.commonutils.model.newPublicEntity.WarningEntity.DataStatisticsParams;
-import com.founder.commonutils.model.newPublicEntity.WarningEntity.SkWarning;
-import com.founder.commonutils.model.newPublicEntity.WarningEntity.SkWarningRule;
-import com.founder.commonutils.model.newPublicEntity.WarningEntity.WaringVo;
+import com.founder.commonutils.model.newPublicEntity.WarningEntity.*;
 import com.founder.publicapi.mapper.mysqlMapper.DataStatisticsMapperCqxz;
 import com.founder.publicapi.mapper.mysqlMapper.WarningMapper;
 import com.founder.publicapi.mapper.mysqlMapper.WarningRuleMapper;
@@ -60,7 +57,46 @@ public class DataStatisticsServiceImpl implements DataStatisticsService {
         return resultJson;
     }
 
-
+    @Override
+    public JSONObject getIntegratedTwoMapDetail(DataStatisticsParams params) {
+        List<CQTbStAsj> mapIn = new ArrayList<>();
+        JSONObject resultJson = new JSONObject();
+        // 区划处理
+        if (params.getXzqhdm().equals("500000")) {// 重庆市处理
+            params.setXzqhdmList(Arrays.asList("50"));
+        } else if (!params.getXzqhdm().equals("000000")) {
+            params.setXzqhdmList(Arrays.asList(params.getXzqhdm()));
+        } else {
+            params.setXzqhdmList(Arrays.asList("500103", "500112", "500107", "500099", "500105", "500108", "500113", "500104", "500109", "500106", "500098"));
+        }
+        try {
+            params = getDataParams(params);// SelectType用于案件类别
+            mapIn = mapTjDetail(params);
+            resultJson.put("data", mapIn);
+            resultJson.put("total", mapIn.size());
+            resultJson.put("status", "200");
+            resultJson.put("msg", "成功");
+        } catch (Exception e) {
+            resultJson.put("data", mapIn);
+            resultJson.put("total", mapIn.size());
+            resultJson.put("status", "201");
+            resultJson.put("msg", e);
+        }
+        return resultJson;
+    }
+    public List<CQTbStAsj> mapTjDetail(DataStatisticsParams params) {
+        JSONObject j1 = getTqRangeNew(params.getStartTime(), params.getEndTime());
+        /*当前时间现案时间*/
+        String startTimela = j1.getString("kssj");
+        String endTimela = j1.getString("jssj");
+        JSONObject afsjTimela = getAfsjRange(startTimela,endTimela);
+        params.setXaStartTime(afsjTimela.getString("afkssj"));
+        params.setXaEndTime(afsjTimela.getString("afjssj"));
+        params.setStartTime(startTimela);
+        params.setEndTime(endTimela);
+        List<CQTbStAsj> xzqhlaList = dataStatisticsMapperCqxz.getXzqhLaCountDetail(params);
+        return xzqhlaList;
+    }
     //根据模型id查询模型详情
     public WaringVo DetialBymxbh(String mxbh){
         QueryWrapper<SkWarning> wrapper = new QueryWrapper<>();