From a11322ca6f572daddf98ea8858e9421281c58508 Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Fri, 2 Jun 2023 11:43:43 +0800
Subject: [PATCH] =?UTF-8?q?2023-06-02=2011:37:46=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7=E6=89=80=E5=B1=9E=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/psdc/service/IPsdcModelService.java   |  4 ++
 .../service/impl/PsdcModelServiceImpl.java    |  6 +++
 .../monitor/TotalElectricMeterController.java | 46 ++++++++++---------
 3 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/psdc-business/src/main/java/com/psdc/service/IPsdcModelService.java b/psdc-business/src/main/java/com/psdc/service/IPsdcModelService.java
index 8c2e14d..106c196 100644
--- a/psdc-business/src/main/java/com/psdc/service/IPsdcModelService.java
+++ b/psdc-business/src/main/java/com/psdc/service/IPsdcModelService.java
@@ -2,6 +2,8 @@ package com.psdc.service;
 
 import com.psdc.entity.vo.ModelVo;
 
+import java.util.List;
+
 /**
  * @Author：Stone
  * @Project：psdc
@@ -13,4 +15,6 @@ public interface IPsdcModelService {
 
     ModelVo queryControlModel(String modelName, String sceneKey);
 
+    List<ModelVo> selDevIsControlByModelName(String modelName);
+
 }
diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcModelServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcModelServiceImpl.java
index 8654206..03bc9ff 100644
--- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcModelServiceImpl.java
+++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcModelServiceImpl.java
@@ -6,6 +6,7 @@ import com.psdc.service.IPsdcModelService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @Author：戴仕崑
@@ -24,4 +25,9 @@ public class PsdcModelServiceImpl implements IPsdcModelService {
     public ModelVo queryControlModel(String modelName, String sceneKey) {
         return modelMapper.queryControlModel(modelName, sceneKey);
     }
+
+    @Override
+    public List<ModelVo> selDevIsControlByModelName(String modelName) {
+        return modelMapper.selDevIsControlByModelName(modelName);
+    }
 }
diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java
index 34269ef..78b2092 100644
--- a/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java
+++ b/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java
@@ -59,28 +59,32 @@ public class TotalElectricMeterController {
                     Map<String, Object> map2 = new HashMap<>();
                     map2.put("deviceId", dev.getDeviceId());
                     map2.put("deviceName", dev.getDeviceName());
-                    map2.put("deviceId", dev.getDeviceId());
-                    boolean b1 = false;
-                    boolean b2 = false;
-                    boolean b3 = false;
-                    ModelVo modelVo1 = psdcModelService.queryControlModel(dd.getDeviceModel(), "intemp");
-                    if (null != modelVo1){
-                        b1 = true;
-                    }
-                    ModelVo modelVo2 = psdcModelService.queryControlModel(dd.getDeviceModel(), "outtemp");
-                    if (null != modelVo2){
-                        b2 = true;
-                    }
-                    ModelVo modelVo3 = psdcModelService.queryControlModel(dd.getDeviceModel(), "temp");
-                    if (null != modelVo3){
-                        b3 = true;
+//                    map2.put("deviceId", dev.getDeviceId());
+//                    boolean b1 = false;
+//                    boolean b2 = false;
+//                    boolean b3 = false;
+//                    ModelVo modelVo1 = psdcModelService.queryControlModel(dd.getDeviceModel(), "intemp");
+//                    if (null != modelVo1){
+//                        b1 = true;
+//                    }
+//                    ModelVo modelVo2 = psdcModelService.queryControlModel(dd.getDeviceModel(), "outtemp");
+//                    if (null != modelVo2){
+//                        b2 = true;
+//                    }
+//                    ModelVo modelVo3 = psdcModelService.queryControlModel(dd.getDeviceModel(), "temp");
+//                    if (null != modelVo3){
+//                        b3 = true;
+//                    }
+//                    map2.put("intemp", null);
+//                    map2.put("outtemp", null);
+//                    map2.put("temp", null);
+//                    map2.put("inTemp", b1);
+//                    map2.put("outTemp", b2);
+//                    map2.put("Temp", b3);
+                    List<ModelVo> modelVoList = psdcModelService.selDevIsControlByModelName(dd.getDeviceModel());
+                    for (ModelVo scr : modelVoList){
+                        map2.put(scr.getRelationField(), null);
                     }
-                    map2.put("intemp", null);
-                    map2.put("outtemp", null);
-                    map2.put("temp", null);
-                    map2.put("inTemp", b1);
-                    map2.put("outTemp", b2);
-                    map2.put("Temp", b3);
                     maps2.add(map2);
                 }
             } else {