From dd683df066fb4bb92f778c1a4a6d99478f36b3de Mon Sep 17 00:00:00 2001
From: "review512jwy@163.com" <“review512jwy@163.com”>
Date: Wed, 7 Jan 2026 21:19:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A5=BC=E5=AE=87=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6=E7=BA=A2=E8=89=B2=E6=95=B0=E5=AD=97=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E4=B8=8A=E6=8A=A5=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ex/DeviceRawdataRealtimeMapperExt.xml     | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceRawdataRealtimeMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceRawdataRealtimeMapperExt.xml
index e7da35f..f9abf7b 100644
--- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceRawdataRealtimeMapperExt.xml
+++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceRawdataRealtimeMapperExt.xml
@@ -5,26 +5,29 @@
 
     <select id="getOverviewInfo" resultType="com.dongjian.dashboard.back.vo.data.OverviewInfo">
 		SELECT
-            drr.building_id,
+            bbuilding.building_id,
             bbuilding.name AS buildingName,
-            drr.device_id,
-            drr.receive_ts,
+            ah.device_id,
+            ah.receive_ts,
             basic_asset_class_big.id AS monitoringPointCategoryId,
             basic_asset_class_big.class_name AS monitoringPointCategoryName
-		FROM
-            device_rawdata_realtime drr
-		INNER JOIN basic_building bbuilding ON drr.building_id = bbuilding.building_id
-        INNER JOIN device_info dinfo ON dinfo.device_id = drr.device_id
-        INNER JOIN basic_monitoring_asset on dinfo.asset_id = basic_monitoring_asset.equipment_id
-        INNER JOIN basic_asset_class_big on basic_asset_class_big.id = basic_monitoring_asset.class_big_id
+        FROM
+        basic_building bbuilding
+        INNER JOIN basic_floor on basic_floor.building_id = bbuilding.building_id
+        INNER JOIN basic_space on basic_space.floor_id = basic_floor.floor_id
+        INNER JOIN basic_monitoring_asset on basic_monitoring_asset.space_id = basic_space.space_id
+        INNER JOIN device_info dinfo ON dinfo.asset_id = basic_monitoring_asset.equipment_id
+        INNER JOIN alert_history ah ON dinfo.device_id = ah.device_id
+        LEFT JOIN basic_asset_class_big on basic_asset_class_big.id = basic_monitoring_asset.class_big_id
         LEFT JOIN type ty ON dinfo.type_id = ty.id
 		WHERE
-            bbuilding.company_id = #{companyId} AND bbuilding.flag = 0 AND dinfo.flag = 0 AND basic_monitoring_asset.flag = 0 AND basic_asset_class_big.flag = 0
-		  AND drr.dashboard_status = 'alert'
-		  AND ty.device_category_id in
-            <foreach collection="categoryIdList" item="categoryId" open="(" separator="," close=")">
-                #{categoryId}
-            </foreach>
+            bbuilding.company_id = #{companyId} AND bbuilding.flag = 0 AND basic_floor.flag = 0 AND basic_space.flag = 0
+        AND basic_monitoring_asset.flag = 0 AND dinfo.flag = 0 AND basic_asset_class_big.flag = 0
+        AND ah.confirm_status = 0 AND ah.handle_status = 1
+        AND ty.device_category_id in
+        <foreach collection="categoryIdList" item="categoryId" open="(" separator="," close=")">
+            #{categoryId}
+        </foreach>
 	</select>
 
     <select id="getBuildingInfo" resultType="com.dongjian.dashboard.back.vo.data.OverviewVO">