From a354de7cb08cfe858efc8061b1e5f11b40d5778f Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Sat, 28 Sep 2024 14:58:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E5=A2=9E=E5=8A=A0=E6=9D=86?=
 =?UTF-8?q?=E5=A1=94=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/controller/ProjectDetailsViewController.java    | 4 ++--
 .../java/com/bonus/screen/mapper/TbDeviceDataRecord.java   | 2 +-
 .../screen/service/impl/ProjectDetailsViewServiceImpl.java | 4 ++--
 .../resources/mapper/screen/TbDeviceDataRecordMapper.xml   | 7 ++++++-
 4 files changed, 11 insertions(+), 6 deletions(-)

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 7fa6ba3..4920096 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
@@ -30,8 +30,8 @@ public class ProjectDetailsViewController extends BaseController {
      * 根据工程id查询相对应类型下的设备信息
      */
     @GetMapping("/queryDevInfoByProject")
-    public AjaxResult queryDevInfoByProject(Integer proId, Integer devType) {
-        return AjaxResult.success(projectDetailsViewService.queryDevInfoByProject(proId, devType));
+    public AjaxResult queryDevInfoByProject(Integer proId, Integer powerId, Integer devType) {
+        return AjaxResult.success(projectDetailsViewService.queryDevInfoByProject(proId, powerId, devType));
     }
 
     /**
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java
index d5073ab..65234f3 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java
@@ -20,7 +20,7 @@ import java.util.Map;
 @Mapper
 public interface TbDeviceDataRecord {
 
-    List<Map<String,String>> queryDevInfoByProject(@Param("proId") Integer proId, @Param("devType") Integer devType);
+    List<Map<String,String>> queryDevInfoByProject(@Param("proId") Integer proId, @Param("powerId") Integer powerId, @Param("devType") Integer devType);
 
     /**
      * 安全隐患预测记录信息
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 e1e5d9c..2082aee 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
@@ -31,8 +31,8 @@ public class ProjectDetailsViewServiceImpl {
      * @param devType
      * @return
      */
-    public AjaxResult queryDevInfoByProject(Integer proId, Integer devType) {
-        return AjaxResult.success(tbDeviceDataRecordMapper.queryDevInfoByProject(proId, devType));
+    public AjaxResult queryDevInfoByProject(Integer proId, Integer powerId, Integer devType) {
+        return AjaxResult.success(tbDeviceDataRecordMapper.queryDevInfoByProject(proId, powerId, devType));
     }
 
     public AjaxResult getDevAttributeLatestInfoById(Integer proId) {
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml
index a7775aa..b7b8d49 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml
@@ -8,7 +8,12 @@
             device.dev_type as devType, device.dev_status as devStatus, device.dev_warn as devWarn
         FROM
         tb_device device
-        LEFT JOIN tb_bd_device_record tbdr ON device.bd_id = tbdr.id
+        <if test="powerId != null ">
+            LEFT JOIN tb_bd_device_record tbdr ON device.bd_id = tbdr.id and tbdr.power_id = #{powerId}
+        </if>
+        <if test="powerId == null">
+            LEFT JOIN tb_bd_device_record tbdr ON device.bd_id = tbdr.id
+        </if>
         LEFT JOIN tb_project project ON project.id = tbdr.pro_id AND project.del_flag = 0
         WHERE project.id = #{proId} and device.dev_type = #{devType} and device.del_flag = 0
     </select>