From edd19b5a3361f1f2bc0a63a2d78bd35ca7326b3b Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Mon, 27 Jul 2026 17:54:41 +0800
Subject: [PATCH] =?UTF-8?q?feat(sensor):=20=E6=B7=BB=E5=8A=A0=E4=BC=A0?=
 =?UTF-8?q?=E6=84=9F=E5=99=A8=E8=AE=BE=E5=A4=87=E8=AF=A6=E6=83=85=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcloud/command/query/SensorDeviceQueryExe.java   |  2 +-
 .../persistence/mapper/SensorDeviceMapper.java       |  2 ++
 .../repository/SensorDeviceRepository.java           |  2 ++
 .../repository/impl/SensorDeviceRepositoryImpl.java  |  5 +++++
 .../src/main/resources/mapper/SensorDeviceMapper.xml | 12 ++++++++++++
 5 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/web-app/src/main/java/com/zcloud/command/query/SensorDeviceQueryExe.java b/web-app/src/main/java/com/zcloud/command/query/SensorDeviceQueryExe.java
index 7150f6c..39faad1 100644
--- a/web-app/src/main/java/com/zcloud/command/query/SensorDeviceQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/command/query/SensorDeviceQueryExe.java
@@ -79,7 +79,7 @@ public class SensorDeviceQueryExe {
     }
     
     public SingleResponse<SensorDeviceCO> getById(Long id) {
-        SensorDeviceDO d = sensorDeviceRepository.getById(id);
+        SensorDeviceDO d = sensorDeviceRepository.detailView(id);
         if (d == null || "TRUE".equals(d.getDeleteEnum())) {
             return SingleResponse.buildFailure("记录不存在或已被删除");
         }
diff --git a/web-infrastructure/src/main/java/com/zcloud/persistence/mapper/SensorDeviceMapper.java b/web-infrastructure/src/main/java/com/zcloud/persistence/mapper/SensorDeviceMapper.java
index b7765c1..a8004c4 100644
--- a/web-infrastructure/src/main/java/com/zcloud/persistence/mapper/SensorDeviceMapper.java
+++ b/web-infrastructure/src/main/java/com/zcloud/persistence/mapper/SensorDeviceMapper.java
@@ -30,4 +30,6 @@ public interface SensorDeviceMapper extends BaseMapper<SensorDeviceDO> {
     IPage<SensorDeviceScreenCO> screenList(IPage<SensorDeviceScreenCO> page, @Param("params") Map<String, Object> params);
 
     List<SensorDeviceFireStatusCO> fireSituation(@Param("params") Map<String, Object> params);
+
+    SensorDeviceDO detailView(@Param("id") Long id);
 }
diff --git a/web-infrastructure/src/main/java/com/zcloud/persistence/repository/SensorDeviceRepository.java b/web-infrastructure/src/main/java/com/zcloud/persistence/repository/SensorDeviceRepository.java
index 12b5801..d6171c5 100644
--- a/web-infrastructure/src/main/java/com/zcloud/persistence/repository/SensorDeviceRepository.java
+++ b/web-infrastructure/src/main/java/com/zcloud/persistence/repository/SensorDeviceRepository.java
@@ -21,4 +21,6 @@ public interface SensorDeviceRepository extends BaseRepository<SensorDeviceDO> {
     PageResponse<SensorDeviceScreenCO> screenList(Map<String, Object> params);
 
     List<SensorDeviceFireStatusCO> fireSituation(Map<String, Object> params);
+
+    SensorDeviceDO detailView(Long id);
 }
diff --git a/web-infrastructure/src/main/java/com/zcloud/persistence/repository/impl/SensorDeviceRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/persistence/repository/impl/SensorDeviceRepositoryImpl.java
index 4705946..3c48005 100644
--- a/web-infrastructure/src/main/java/com/zcloud/persistence/repository/impl/SensorDeviceRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/persistence/repository/impl/SensorDeviceRepositoryImpl.java
@@ -50,4 +50,9 @@ public class SensorDeviceRepositoryImpl extends BaseRepositoryImpl<SensorDeviceM
     public List<SensorDeviceFireStatusCO> fireSituation(Map<String, Object> params) {
         return sensorDeviceMapper.fireSituation(params);
     }
+
+    @Override
+    public SensorDeviceDO detailView(Long id) {
+        return sensorDeviceMapper.detailView(id);
+    }
 }
diff --git a/web-infrastructure/src/main/resources/mapper/SensorDeviceMapper.xml b/web-infrastructure/src/main/resources/mapper/SensorDeviceMapper.xml
index 80faa94..44d2a18 100644
--- a/web-infrastructure/src/main/resources/mapper/SensorDeviceMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/SensorDeviceMapper.xml
@@ -75,4 +75,16 @@
         </where>
         GROUP BY sd.sensor_status
     </select>
+
+    <select id="detailView" resultType="com.zcloud.persistence.dataobject.SensorDeviceDO">
+        SELECT
+            sd.*,
+            st.type_name AS sensorTypeName
+        FROM iot_alarm_sensor_device sd
+        LEFT JOIN iot_alarm_sensor_type st ON sd.sensor_type_id = st.id AND st.delete_enum = 'FALSE'
+        <where>
+            sd.id = #{id}
+            AND sd.delete_enum = 'FALSE'
+        </where>
+    </select>
 </mapper>