阿里云模型热力图提交

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

@@ -13,6 +13,8 @@ public class CQTbStAsj {
     private String zatzJyqkMc;
     private String xzqhdm;
     private String asjfsddDzMc;
-    private String x;
-    private String y;
+    private String asjfsddDqjd;
+    private String asjfsddDqwd;
+    private String bqyp;
+    private String asjfssjAsjfskssj;
 }

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

@@ -37,6 +37,9 @@ public class DataStatisticsParams {
     private List<String> ajlbdmList= new ArrayList<>();
     private List<String> ajztdmList = new ArrayList<>();
     private List<String> ladwList= new ArrayList<>();
+    private List<String> zatzJyqkList;// 小案类别名称集合
+    private List<String> bqypList;// 标签
+
     //模型编号
     private String mxbh;
     //案件状态

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

@@ -168,9 +168,11 @@
         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'
+        a.asjfsdd_Dqjd as asjfsddDqjd,
+        a.asjfsdd_Dqwd as asjfsddDqwd,
+        date_format(a.ASJFSSJ_ASJFSKSSJ,'%Y-%m-%d %H:%i:%s') AS asjfssjAsjfskssj,
+        z.bqyp as bqyp
+        from tb_st_asj a left JOIN tb_st_ajtztq z ON a.ASJBH = z.ASJBH 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')
@@ -196,6 +198,18 @@
         <if test="ajlbdm!=null and ajlbdm!=''">
             and AJLBDM in (${ajlbdm})
         </if>
+        <if test="zatzJyqkList != null and zatzJyqkList.size() > 0">
+        and a.ZATZ_JYQK in
+            <foreach collection="zatzJyqkList" index="index" item="zatzJyqk" open="(" separator="," close=")">
+                #{zatzJyqk}
+            </foreach>
+        </if>
+        <if test="bqypList != null and bqypList.size() > 0">
+            and
+            <foreach collection="bqypList" index="index" item="bqyp" open="(" separator="or" close=")">
+                z.BQYP like '%'|| #{bqyp} || '%'
+            </foreach>
+        </if>
         limit 10000
     </select>
 </mapper>
\ No newline at end of file