From 0b7fc421313dfe694f9b0353169f48258a3e7f88 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Tue, 24 Sep 2024 15:53:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A4=E5=A4=96=E7=8E=AF=E5=A2=83=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E4=BF=A1=E6=81=AF=E6=9C=80=E6=96=B020=E6=9D=A1api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/data/mapper/DataCenterMapper.java  |  5 +++++
 .../controller/ProjectDetailsViewController.java | 13 +++++++++++--
 .../impl/ProjectDetailsViewServiceImpl.java      |  4 ++++
 .../resources/mapper/data/DataCenterMapper.xml   | 16 ++++++++++++++++
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/data/mapper/DataCenterMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/data/mapper/DataCenterMapper.java
index 26b2984..01f3893 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/data/mapper/DataCenterMapper.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/data/mapper/DataCenterMapper.java
@@ -111,6 +111,11 @@ public interface DataCenterMapper {
      */
     List<DevAttributeVo> getPitDevAttributeWarnRecord(@Param("proId") Integer proId);
 
+    /**
+     * 查询室外环境报警记录 -- 最新20条
+     */
+    List<DevAttributeVo> getPowerDevAttributeRecordByWarn(@Param("proId") Integer proId);
+
     /**
      * 更新设备采集数据值
      * @param devId
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectDetailsViewController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectDetailsViewController.java
index 1a1b860..9e38569 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectDetailsViewController.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectDetailsViewController.java
@@ -55,6 +55,15 @@ public class ProjectDetailsViewController extends BaseController {
         return projectDetailsViewService.getDevAttributeRecordByDevId(devId);
     }
 
+    /**
+     * 查询室外感知设备预警数据 -- 预警数据（最新20条）
+     * @param proId 工程id
+     */
+    @GetMapping("/getPowerDevAttributeRecordByWarn")
+    public AjaxResult getPowerDevAttributeRecordByWarn(Integer proId) {
+        return projectDetailsViewService.getPowerDevAttributeRecordByWarn(proId);
+    }
+
     /**
      * 查询有限空间监测设备历史数据 / 每监测项各10条数据
      * @param devId 设备id
@@ -77,8 +86,8 @@ public class ProjectDetailsViewController extends BaseController {
      * 查询组塔监测设备 -- 预警数据（最新10条）
      * @param proId 工程id
      */
-    @GetMapping("/getPowerDevAttributeRecordByWarn")
-    public AjaxResult getPowerDevAttributeRecordByWarn(Integer proId) {
+    @GetMapping("/getTowerDevAttributeRecordByWarn")
+    public AjaxResult getTowerDevAttributeRecordByWarn(Integer proId) {
         return projectDetailsViewService.getTowerDevAttributeWarnRecord(proId);
     }
 
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java
index 67e464d..733a8b2 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java
@@ -69,4 +69,8 @@ public class ProjectDetailsViewServiceImpl {
         return AjaxResult.success(records);
     }
 
+    public AjaxResult getPowerDevAttributeRecordByWarn(Integer proId) {
+        return AjaxResult.success(dataCenterMapper.getPowerDevAttributeRecordByWarn(proId));
+    }
+
 }
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/data/DataCenterMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/data/DataCenterMapper.xml
index 8373c9e..01fd888 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/data/DataCenterMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/data/DataCenterMapper.xml
@@ -195,4 +195,20 @@
             tddr.create_time DESC
         limit 10
     </select>
+
+    <select id="getPowerDevAttributeRecordByWarn" resultType="com.bonus.data.entity.DevAttributeVo">
+        SELECT
+            tddr.dev_id,tddr.dev_name,tddr.dev_type,tddr.attribute_name as jcName,tddr.attribute_val as jcValue,
+            tddr.is_warn,tddr.create_time as jcTime
+        FROM
+            tb_dev_data_record AS tddr
+                LEFT JOIN tb_device device ON device.id = tddr.dev_id
+                LEFT JOIN tb_bd_device_record tbdr ON tbdr.id = device.bd_id
+        WHERE
+            tddr.is_warn = '1'
+            AND tbdr.pro_id = #{proId} AND tddr.dev_type = 'environmental'
+        ORDER BY
+            tddr.create_time DESC
+        limit 20
+    </select>
 </mapper>
\ No newline at end of file