From facbcb6c5a672b8511602fe71dd3d2fee1fa1f64 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Fri, 2 Jun 2023 15:00:24 +0800 Subject: [PATCH] =?UTF-8?q?2023-06-02=2014:59:36=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?=EF=BC=8C=E8=A1=A5=E5=85=85=E5=8A=A8=E6=80=81=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=BC=BA=E6=8E=A5=E5=8F=A3=E7=81=B5=E6=B4=BB?= =?UTF-8?q?=E6=80=A7!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/psdc/entity/vo/DeviceVo.java | 4 ++++ .../controller/monitor/TotalElectricMeterController.java | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/psdc-business/src/main/java/com/psdc/entity/vo/DeviceVo.java b/psdc-business/src/main/java/com/psdc/entity/vo/DeviceVo.java index 5be745d..56a5e11 100644 --- a/psdc-business/src/main/java/com/psdc/entity/vo/DeviceVo.java +++ b/psdc-business/src/main/java/com/psdc/entity/vo/DeviceVo.java @@ -5,6 +5,8 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.stereotype.Component; +import java.util.Map; + /** * @Author：Stone * @Project：psdc @@ -31,4 +33,6 @@ public class DeviceVo { private String outtemp ; /** 温度 */ private String temp ; + + private Map tempValue; } 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 78b2092..e396adf 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 @@ -82,9 +82,14 @@ public class TotalElectricMeterController { // map2.put("outTemp", b2); // map2.put("Temp", b3); List modelVoList = psdcModelService.selDevIsControlByModelName(dd.getDeviceModel()); + List ary = new ArrayList<>(); for (ModelVo scr : modelVoList){ - map2.put(scr.getRelationField(), null); + Map content = new HashMap<>(); + content.put("label", scr.getIoDesc()); + content.put("value", scr.getRelationField()); + ary.add(content); } + map2.put("controlKey", ary); maps2.add(map2); } } else {