From 7eb8986695e7408c5e741fdacda553670859b111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Wed, 23 Jul 2025 16:18:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zh/monitor/job/DeviceClearLogJob.java     |  2 +-
 .../zh/monitor/mapper/DeviceInfoMapper.java   |  1 +
 .../monitor/mapper/xml/DeviceInfoMapper.xml   | 15 +++++--
 .../service/impl/DeviceInfoServiceImpl.java   |  1 +
 .../home/controller/ZhHomeController.java     | 21 ++++++---
 .../zh/view/home/mapper/ZhHomeMapper.java     |  7 +--
 .../zh/view/home/mapper/xml/ZhHomeMapper.xml  | 45 +++++++++++++++++++
 .../zh/view/home/service/IZhHomeService.java  |  7 +--
 .../home/service/impl/ZhHomeServiceImpl.java  | 22 ++++++---
 .../view/shebei/mapper/xml/ShebeiMapper.xml   | 30 ++++++-------
 .../src/main/resources/application-dev.yml    |  4 ++
 11 files changed, 117 insertions(+), 38 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/monitor/job/DeviceClearLogJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/monitor/job/DeviceClearLogJob.java
index 56dfa40..8547315 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/monitor/job/DeviceClearLogJob.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/monitor/job/DeviceClearLogJob.java
@@ -25,7 +25,7 @@ public class DeviceClearLogJob implements Job {
         DeviceClearLog deviceClearLog = new DeviceClearLog();
         Calendar c = Calendar.getInstance();
         deviceClearLog.setEndedAt(c.getTime());
-        c.add(Calendar.HOUR_OF_DAY,-1);
+        c.add(Calendar.DAY_OF_MONTH,-1);
         deviceClearLog.setStartedAt(c.getTime());
         clearService.monitorDeviceClearLog(deviceClearLog);
     }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/monitor/mapper/DeviceInfoMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/monitor/mapper/DeviceInfoMapper.java
index 273c680..671b78a 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/monitor/mapper/DeviceInfoMapper.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/monitor/mapper/DeviceInfoMapper.java
@@ -14,6 +14,7 @@ import java.util.List;
 public interface DeviceInfoMapper extends BaseMapper<DeviceInfo> {
     int insert(DeviceInfo deviceInfo);
     int update(DeviceInfo deviceInfo);
+    int deleteAll();
     List<DeviceInfo> getDeviceInfoList(DeviceInfo deviceInfo);
     DeviceInfo getDeviceInfo(DeviceInfo deviceInfo);
 }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/monitor/mapper/xml/DeviceInfoMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/monitor/mapper/xml/DeviceInfoMapper.xml
index 194f184..4dd1700 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/monitor/mapper/xml/DeviceInfoMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/monitor/mapper/xml/DeviceInfoMapper.xml
@@ -14,7 +14,8 @@
             overflow_box_num,
             in_warehouse,
             housingestate_id,
-            create_time
+            create_time,
+            del_flag
         )
         values(
             #{deviceId},
@@ -27,7 +28,8 @@
             #{overflowBoxNum},
             #{inWarehouse},
             #{housingestateId},
-            now()
+            now(),
+            '0'
         )
     </insert>
 
@@ -42,10 +44,16 @@
             overflow_box_num = #{overflowBoxNum},
             in_warehouse = #{inWarehouse},
             housingestate_id = #{housingestateId},
-            update_time = now()
+            update_time = now(),
+            del_flag = '0'
         where device_id = #{deviceId}
     </update>
 
+    <update id="deleteAll" parameterType="org.jeecg.modules.zh.monitor.entity.DeviceInfo">
+        update bl_device_info
+        set del_flag = '1'
+    </update>
+
     <select id="getDeviceInfoList" resultType="org.jeecg.modules.zh.monitor.entity.DeviceInfo" >
         select
             id,
@@ -60,6 +68,7 @@
             in_warehouse as inWarehouse,
             housingestate_id as housingestateId
         from bl_device_info
+        where del_flag = '0'
     </select>
 
     <select id="getDeviceInfo" resultType="org.jeecg.modules.zh.monitor.entity.DeviceInfo" >
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/monitor/service/impl/DeviceInfoServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/monitor/service/impl/DeviceInfoServiceImpl.java
index 3db2bf0..54bfbce 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/monitor/service/impl/DeviceInfoServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/monitor/service/impl/DeviceInfoServiceImpl.java
@@ -37,6 +37,7 @@ public class DeviceInfoServiceImpl extends JeecgServiceImpl<DeviceInfoMapper, De
 
     @Override
     public Result<?> monitorAllDeviceInfos(DeviceInfo deviceInfo){
+        baseMapper.deleteAll();
         Map<String, Object> params = getParmas(1,50);
         String url = ApiEnum.GET_DEVICE_INFO.getValue();
         String errorMsg = postUrl(url,params);
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/controller/ZhHomeController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/controller/ZhHomeController.java
index f6124d2..9f6c2f7 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/controller/ZhHomeController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/controller/ZhHomeController.java
@@ -55,8 +55,8 @@ public class ZhHomeController {
 	 * 小区投递
 	 */
 	@RequestMapping(value = "/getXqtd", method = RequestMethod.GET)
-	public Result getXqtd() {
-		List<ZhHome> list = service.getXqtd();
+	public Result getXqtd(ZhHome zhHome) {
+		List<ZhHome> list = service.getXqtd(zhHome);
 		return Result.ok(list);
 	}
 
@@ -64,8 +64,8 @@ public class ZhHomeController {
 	 * 设备投递
 	 */
 	@RequestMapping(value = "/getSbtd", method = RequestMethod.GET)
-	public Result getSbtd() {
-		List<ZhHome> list = service.getSbtd();
+	public Result getSbtd(ZhHome zhHome) {
+		List<ZhHome> list = service.getSbtd(zhHome);
 		return Result.ok(list);
 	}
 
@@ -73,8 +73,17 @@ public class ZhHomeController {
 	 * 会员投递
 	 */
 	@RequestMapping(value = "/getHytd", method = RequestMethod.GET)
-	public Result getHytd() {
-		List<ZhHome> list = service.getHytd();
+	public Result getHytd(ZhHome zhHome) {
+		List<ZhHome> list = service.getHytd(zhHome);
+		return Result.ok(list);
+	}
+
+	/**
+	 * 小区清运
+	 */
+	@RequestMapping(value = "/getXqqy", method = RequestMethod.GET)
+	public Result getXqqy(ZhHome zhHome) {
+		List<ZhHome> list = service.getXqqy(zhHome);
 		return Result.ok(list);
 	}
 
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/mapper/ZhHomeMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/mapper/ZhHomeMapper.java
index fc5abfa..3a49432 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/mapper/ZhHomeMapper.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/mapper/ZhHomeMapper.java
@@ -25,9 +25,10 @@ public interface ZhHomeMapper extends BaseMapper<ZhHome>{
     ZhHome getHyrs(ZhHome zhHome);
 
     List<ZhHome> getOrderTypeCn();
-    List<ZhHome> getXqtd();
-    List<ZhHome> getSbtd();
-    List<ZhHome> getHytd();
+    List<ZhHome> getXqtd(ZhHome zhHome);
+    List<ZhHome> getSbtd(ZhHome zhHome);
+    List<ZhHome> getHytd(ZhHome zhHome);
+    List<ZhHome> getXqqy(ZhHome zhHome);
     IPage<ZhHome> getSstd(Page<ZhHome> page, @Param("params")ZhHome zhHome);
 
 }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/mapper/xml/ZhHomeMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/mapper/xml/ZhHomeMapper.xml
index 010c300..2b34860 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/mapper/xml/ZhHomeMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/mapper/xml/ZhHomeMapper.xml
@@ -34,6 +34,7 @@
 		    sum(case when is_online = 'true' then 1 else 0 end) as zxsbsA,
 		    sum(case when is_online = 'false' then 1 else 0 end) as lxsbsA
 		from bl_device_info
+		where del_flag = '0'
 	</select>
 
 	<select id="getTd" parameterType="org.jeecg.modules.zh.view.home.entity.ZhHome" resultType="org.jeecg.modules.zh.view.home.entity.ZhHome">
@@ -85,6 +86,14 @@
 			count(a.id) as cn
 		from bl_order_info a
 		inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
+		<where>
+			<if test="beginTime != null and beginTime !=''">
+				and a.add_time  >= #{beginTime}
+			</if>
+			<if test="endTime != null and endTime !=''">
+				and a.add_time  &lt;= #{endTime}
+			</if>
+		</where>
 		group by a.housingestate_id,b.name
 		order by weight desc
 		limit 10
@@ -101,6 +110,14 @@
 		from bl_order_info a
 				 inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
 				 inner join bl_device_info c on a.imei = c.imei
+		<where>
+			<if test="beginTime != null and beginTime !=''">
+				and a.add_time  >= #{beginTime}
+			</if>
+			<if test="endTime != null and endTime !=''">
+				and a.add_time  &lt;= #{endTime}
+			</if>
+		</where>
 		group by a.housingestate_id,b.name,a.imei,c.content
 		order by weight desc
 		limit 10
@@ -112,11 +129,39 @@
 			round(sum(a.weight),2) as weight,
 			count(a.id) as cn
 		from bl_order_info a
+		<where>
+			<if test="beginTime != null and beginTime !=''">
+				and a.add_time  >= #{beginTime}
+			</if>
+			<if test="endTime != null and endTime !=''">
+				and a.add_time  &lt;= #{endTime}
+			</if>
+		</where>
 		group by phone
 		order by weight desc
 		limit 10
 	</select>
 
+	<select id="getXqqy" parameterType="org.jeecg.modules.zh.view.home.entity.ZhHome" resultType="org.jeecg.modules.zh.view.home.entity.ZhHome">
+		select
+			a.housing_id as housingestateId,
+			b.name as housingestateName,
+			round(sum(a.this_weight)/-1000,2) as weight,
+			count(a.id) as cn
+		from bl_device_clear_log a
+		inner join bl_housingestate_info b on a.housing_id = b.housingestate_id
+		where a.status = '1'
+		<if test="beginTime != null and beginTime !=''">
+			and a.start_time  >= #{beginTime}
+		</if>
+		<if test="endTime != null and endTime !=''">
+			and a.start_time  &lt;= #{endTime}
+		</if>
+		group by a.housing_id,b.name
+		order by weight desc
+		limit 10
+	</select>
+
 	<select id="getSstd" parameterType="org.jeecg.modules.zh.view.home.entity.ZhHome" resultType="org.jeecg.modules.zh.view.home.entity.ZhHome">
 		select
 			a.phone,
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/service/IZhHomeService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/service/IZhHomeService.java
index c382c3f..e684e84 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/service/IZhHomeService.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/service/IZhHomeService.java
@@ -18,8 +18,9 @@ public interface IZhHomeService extends IService<ZhHome> {
 
 	List<ZhHome> getOrderTypeCn();
 
-	List<ZhHome> getXqtd();
-	List<ZhHome> getSbtd();
-	List<ZhHome> getHytd();
+	List<ZhHome> getXqtd(ZhHome zhHome);
+	List<ZhHome> getSbtd(ZhHome zhHome);
+	List<ZhHome> getHytd(ZhHome zhHome);
+	List<ZhHome> getXqqy(ZhHome zhHome);
 	IPage<ZhHome> getSstd(Page<ZhHome> page, ZhHome zhHome);
 }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/service/impl/ZhHomeServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/service/impl/ZhHomeServiceImpl.java
index 073ed6b..644d0a0 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/service/impl/ZhHomeServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/home/service/impl/ZhHomeServiceImpl.java
@@ -44,7 +44,7 @@ public class ZhHomeServiceImpl extends ServiceImpl<ZhHomeMapper, ZhHome> impleme
 		ZhHome sbsA = baseMapper.getSbsA();
 		zhHome.setSbsA(sbsA.getSbsA());
 		zhHome.setZxsbsA(sbsA.getZxsbsA());
-		zhHome.setLxsbsA(sbsA.getZxsbsA());
+		zhHome.setLxsbsA(sbsA.getLxsbsA());
 		return zhHome;
 	}
 
@@ -162,24 +162,32 @@ public class ZhHomeServiceImpl extends ServiceImpl<ZhHomeMapper, ZhHome> impleme
 	 * 小区投递
 	 */
 	@Override
-	public List<ZhHome> getXqtd(){
-		return baseMapper.getXqtd();
+	public List<ZhHome> getXqtd(ZhHome zhHome){
+		return baseMapper.getXqtd(zhHome);
 	}
 
 	/**
 	 * 设备投递
 	 */
 	@Override
-	public List<ZhHome> getSbtd(){
-		return baseMapper.getSbtd();
+	public List<ZhHome> getSbtd(ZhHome zhHome){
+		return baseMapper.getSbtd(zhHome);
 	}
 
 	/**
 	 * 会员投递
 	 */
 	@Override
-	public List<ZhHome> getHytd(){
-		return baseMapper.getHytd();
+	public List<ZhHome> getHytd(ZhHome zhHome){
+		return baseMapper.getHytd(zhHome);
+	}
+
+	/**
+	 * 小区清运
+	 */
+	@Override
+	public List<ZhHome> getXqqy(ZhHome zhHome){
+		return baseMapper.getXqqy(zhHome);
 	}
 
 	/**
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/xml/ShebeiMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/xml/ShebeiMapper.xml
index af0497d..e5e1e8b 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/xml/ShebeiMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/xml/ShebeiMapper.xml
@@ -17,20 +17,19 @@
             (select count(*) from bl_order_info b where a.imei = b.imei) as tdcsCount
         FROM bl_device_info a
         LEFT JOIN bl_housingestate_info b ON a.housingestate_id = b.housingestate_id
-        <where>
-            <if test="params.housingestateId != null and params.housingestateId != ''">
-                AND a.housingestate_id = #{params.housingestateId}
-            </if>
-            <if test="params.imei != null and params.imei != ''">
-                AND a.imei LIKE concat('%',#{params.imei},'%')
-            </if>
-            <if test="params.isOnline != null and params.isOnline != ''">
-                AND a.is_online = #{params.isOnline}
-            </if>
-            <if test="params.inWarehouse != null and params.inWarehouse != ''">
-                AND a.in_warehouse = #{params.inWarehouse}
-            </if>
-        </where>
+        where del_flag = '0'
+        <if test="params.housingestateId != null and params.housingestateId != ''">
+            AND a.housingestate_id = #{params.housingestateId}
+        </if>
+        <if test="params.imei != null and params.imei != ''">
+            AND a.imei LIKE concat('%',#{params.imei},'%')
+        </if>
+        <if test="params.isOnline != null and params.isOnline != ''">
+            AND a.is_online = #{params.isOnline}
+        </if>
+        <if test="params.inWarehouse != null and params.inWarehouse != ''">
+            AND a.in_warehouse = #{params.inWarehouse}
+        </if>
         order by a.device_id
     </select>
 
@@ -83,7 +82,8 @@
         b.name as housingestateName
         FROM bl_device_info a
         LEFT JOIN bl_housingestate_info b ON a.housingestate_id = b.housingestate_id
-        where a.is_online = 'true'
+        where a.del_flag = '0'
+        and a.is_online = 'true'
         <if test="housingestateId != null and housingestateId != ''">
             AND a.housingestate_id = #{housingestateId}
         </if>
diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
index 7dcc625..e4699f4 100644
--- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
+++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
@@ -165,6 +165,10 @@ spring:
           username: root
           password: Root@123..
           driver-class-name: com.mysql.cj.jdbc.Driver
+#          url: jdbc:mysql://localhost:3306/zh_db?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#          username: root
+#          password: root
+#          driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
 #        multi-datasource1:
 #          url: jdbc:mysql://localhost:3306/course_information_center_jeecg_db?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai