1

src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Mbcdzy.java

@@ -11,7 +11,7 @@ public class Mbcdzy {
     private String zuoyeleibie;
     private String shijizuoyekaishishij;
     private String shishijieshushijian;
-    private String donghuodidianjidongh;
+    private String mangbanchouduzuoyedi;
     private String zuoyeneirong;
     private String jingweidu;
     private String zuoyezhuangtai;
@@ -65,6 +65,13 @@ public class Mbcdzy {
     private String guanliandeqitateshuz;
     private String shifouweiqiyetuisong;
 
+    public String getMangbanchouduzuoyedi() {
+        return mangbanchouduzuoyedi;
+    }
+
+    public void setMangbanchouduzuoyedi(String mangbanchouduzuoyedi) {
+        this.mangbanchouduzuoyedi = mangbanchouduzuoyedi;
+    }
 
     public String getZuoyepiaobianhao() {
         return zuoyepiaobianhao;
@@ -114,13 +121,7 @@ public class Mbcdzy {
         this.shishijieshushijian = shishijieshushijian;
     }
 
-    public String getDonghuodidianjidongh() {
-        return donghuodidianjidongh;
-    }
 
-    public void setDonghuodidianjidongh(String donghuodidianjidongh) {
-        this.donghuodidianjidongh = donghuodidianjidongh;
-    }
 
     public String getZuoyeneirong() {
         return zuoyeneirong;

src/main/java/com/hxjt/dataupload/model/entity/tszy/upload/Sxkjzy.java

@@ -68,8 +68,17 @@ public class Sxkjzy {
     private String shouxiankongjianneiy;
     private String guanliandeqitateshuz;
     private String shifouweiqiyetuisong;
+    private String shouxiankongjianming;
 
 
+    public String getShouxiankongjianming() {
+        return shouxiankongjianming;
+    }
+
+    public void setShouxiankongjianming(String shouxiankongjianming) {
+        this.shouxiankongjianming = shouxiankongjianming;
+    }
+
     public String getBianhao() {
         return bianhao;
     }

src/main/resources/application-dev.yml

@@ -85,7 +85,7 @@ xxl:
   job:
     admin:
       #调度中心部署地址,多个配置逗号分隔 "http://address01,http://address02"
-      addresses: http://192.168.1.107:8080/xxl-job-admin
+      addresses: http://192.168.1.249:8080/xxl-job-admin
     #执行器token，非空时启用 xxl-job, access token
     accessToken: data_upload
     executor:
@@ -105,7 +105,7 @@ xxl:
   mqtt:
     username: 10@ningyanghuagongchany20250508114250
     password: ce07f3c284084b42b674017b72fe73f2
-    hostUrl: tcp://192.168.1.107:1883
+    hostUrl: tcp://192.168.1.249:1883
     clientId: 10@ningyanghuagongchany20250508114250
     sensorDataTopic: /iot/10@ningyanghuagongchany20250422172632/thirdParty/sensorData
     timeout: 100

src/main/resources/mapper/FxfxdxMapper.xml

@@ -723,7 +723,7 @@
 				<otherwise>
 					<![CDATA[
 						and a.APPLYTIME >= '2025-06-01 00:00:00.000'
-						AND a.APPLYTIME < DATEADD(DAY, -7, CAST(GETDATE() AS DATE))
+						--AND a.APPLYTIME < DATEADD(DAY, -7, CAST(GETDATE() AS DATE))
 					]]>
 				</otherwise>
 			</choose>
@@ -745,6 +745,7 @@
 		--受限空间
 		SELECT
 			--bianhao
+			a.fireworktype as shouxiankongjianming,
 			a.ID as bianhao,
 			--zuoyeshenqingdanwei
 			(CASE
@@ -824,7 +825,7 @@
 				<otherwise>
 					<![CDATA[
 						and a.APPLYTIME >= '2025-06-01 00:00:00.000'
-						AND a.APPLYTIME < DATEADD(DAY, -7, CAST(GETDATE() AS DATE))
+						--AND a.APPLYTIME < DATEADD(DAY, -7, CAST(GETDATE() AS DATE))
 					]]>
 				</otherwise>
 			</choose>
@@ -853,7 +854,7 @@
 			'yyyy-MM-dd HH:mm:ss')as shijizuoyekaishishij,
 			FORMAT(A.PEDATE,
 			'yyyy-MM-dd HH:mm:ss')as shishijieshushijian,
-			A.OTLOCARION AS donghuodidianjidongh,
+			A.OTLOCARION AS mangbanchouduzuoyedi,
 			A.OTCONTENT AS zuoyeneirong,
 			--经纬度
 			STUFF( COALESCE(',' + NULLIF(REPLACE( CAST(B.XVAL AS VARCHAR(255)), ';', ','),
@@ -953,7 +954,7 @@
 				<otherwise>
 					<![CDATA[
 						and a.APPLYTIME >= '2025-06-01 00:00:00.000'
-						AND a.APPLYTIME < DATEADD(DAY, -7, CAST(GETDATE() AS DATE))
+						--AND a.APPLYTIME < DATEADD(DAY, -7, CAST(GETDATE() AS DATE))
 					]]>
 				</otherwise>
 			</choose>
@@ -1059,7 +1060,7 @@
 				<otherwise>
 					<![CDATA[
 						and a.APPLYTIME >= '2025-06-01 00:00:00.000'
-						AND a.APPLYTIME < DATEADD(DAY, -7, CAST(GETDATE() AS DATE))
+						--AND a.APPLYTIME < DATEADD(DAY, -7, CAST(GETDATE() AS DATE))
 					]]>
 				</otherwise>
 			</choose>
@@ -1173,7 +1174,7 @@
 				<otherwise>
 					<![CDATA[
 						and a.APPLYTIME >= '2025-06-01 00:00:00.000'
-						AND a.APPLYTIME < DATEADD(DAY, -7, CAST(GETDATE() AS DATE))
+						--AND a.APPLYTIME < DATEADD(DAY, -7, CAST(GETDATE() AS DATE))
 					]]>
 				</otherwise>
 			</choose>
@@ -1279,7 +1280,7 @@
 				<otherwise>
 					<![CDATA[
 						and a.APPLYTIME >= '2025-06-01 00:00:00.000'
-						AND a.APPLYTIME < DATEADD(DAY, -7, CAST(GETDATE() AS DATE))
+						--AND a.APPLYTIME < DATEADD(DAY, -7, CAST(GETDATE() AS DATE))
 					]]>
 				</otherwise>
 			</choose>
@@ -1377,7 +1378,7 @@
 				<otherwise>
 					<![CDATA[
 						and a.APPLYTIME >= '2025-06-01 00:00:00.000'
-						AND a.APPLYTIME < DATEADD(DAY, -7, CAST(GETDATE() AS DATE))
+						--AND a.APPLYTIME < DATEADD(DAY, -7, CAST(GETDATE() AS DATE))
 					]]>
 				</otherwise>
 			</choose>
@@ -1474,7 +1475,7 @@
 				<otherwise>
 					<![CDATA[
 						and a.APPLYTIME >= '2025-06-01 00:00:00.000'
-						AND a.APPLYTIME < DATEADD(DAY, -7, CAST(GETDATE() AS DATE))
+						--AND a.APPLYTIME < DATEADD(DAY, -7, CAST(GETDATE() AS DATE))
 					]]>
 				</otherwise>
 			</choose>

src/main/resources/mapper/ZypSingleQueryMapper.xml

@@ -119,6 +119,7 @@
 		--受限空间
 		SELECT
 			--bianhao
+			a.fireworktype as shouxiankongjianming,
 			a.ID as bianhao,
 			--zuoyeshenqingdanwei
 			(CASE
@@ -227,7 +228,7 @@
 			'yyyy-MM-dd HH:mm:ss')as shijizuoyekaishishij,
 			FORMAT(A.PEDATE,
 			'yyyy-MM-dd HH:mm:ss')as shishijieshushijian,
-			A.OTLOCARION AS donghuodidianjidongh,
+			A.OTLOCARION AS mangbanchouduzuoyedi,
 			A.OTCONTENT AS zuoyeneirong,
 			--经纬度
 			STUFF( COALESCE(',' + NULLIF(REPLACE( CAST(B.XVAL AS VARCHAR(255)), ';', ','),