From ee424e7bd00db8bb71cbea9e046c39acd7b588d5 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Fri, 2 Jun 2023 18:01:37 +0800 Subject: [PATCH] =?UTF-8?q?2023-06-02=2010:30:25=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E6=89=80=E5=B1=9E=E5=8F=AF?= =?UTF-8?q?=E6=8E=A7=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/psdc/entity/vo/DeviceVo.java | 9 +- .../service/impl/PsdcSceneServiceImpl.java | 86 +++++++++++-------- 2 files changed, 49 insertions(+), 46 deletions(-) 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 507439b..4a69ddf 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 @@ -28,14 +28,7 @@ public class DeviceVo { /** 设备sn */ private String deviceSn ; - /** 进水温度 */ - private String intemp ; - /** 出水温度 */ - private String outtemp ; - /** 温度 */ - private String temp ; - - private Map tempValue; + private List tempValue; private List tempList ; diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java index 0a32f79..31fc6b7 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java @@ -216,26 +216,30 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { List ary = new ArrayList<>(); Integer deviceId = listByCode.get(0).getDeviceId(); DeviceVo deviceVo = new DeviceVo(); - Map map = new HashMap<>(); + List list = new ArrayList<>(); + for (int i = 0; i < listByCode.size(); i++) { SceneVo sv = listByCode.get(i); if (deviceId == sv.getDeviceId()) { deviceVo.setDeviceId(sv.getDeviceId()); deviceVo.setDeviceName(sv.getDeviceName()); deviceVo.setDeviceSn(sv.getDeviceSn()); - switch (sv.getSceneKey()) { - case "intemp": - deviceVo.setIntemp(sv.getSceneValue()); - break; - case "outtemp": - deviceVo.setOuttemp(sv.getSceneValue()); - break; - case "temp": - deviceVo.setTemp(sv.getSceneValue()); - break; - } - map.put(sv.getSceneKey(), sv.getSceneValue()); - deviceVo.setTempValue(map); +// switch (sv.getSceneKey()) { +// case "intemp": +// deviceVo.setIntemp(sv.getSceneValue()); +// break; +// case "outtemp": +// deviceVo.setOuttemp(sv.getSceneValue()); +// break; +// case "temp": +// deviceVo.setTemp(sv.getSceneValue()); +// break; +// } + Map map = new HashMap<>(); + map.put("label", sv.getSceneKey()); + map.put("value", sv.getSceneValue()); + list.add(map); + deviceVo.setTempValue(list); if (1 == listByCode.size() || i == listByCode.size() - 1){ ary.add(deviceVo); } @@ -244,36 +248,42 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { ary.add(deviceVo); deviceId = sv.getDeviceId(); deviceVo = new DeviceVo(); - map = new HashMap<>(); + list = new ArrayList<>(); deviceVo.setDeviceId(sv.getDeviceId()); deviceVo.setDeviceName(sv.getDeviceName()); deviceVo.setDeviceSn(sv.getDeviceSn()); if (i == listByCode.size() - 1) { // 判断是否为最后1个元素 - switch (sv.getSceneKey()) { - case "intemp": - deviceVo.setIntemp(sv.getSceneValue()); - case "outtemp": - deviceVo.setOuttemp(sv.getSceneValue()); - case "temp": - deviceVo.setTemp(sv.getSceneValue()); - } - map.put(sv.getSceneKey(), sv.getSceneValue()); - deviceVo.setTempValue(map); +// switch (sv.getSceneKey()) { +// case "intemp": +// deviceVo.setIntemp(sv.getSceneValue()); +// case "outtemp": +// deviceVo.setOuttemp(sv.getSceneValue()); +// case "temp": +// deviceVo.setTemp(sv.getSceneValue()); +// } + Map map = new HashMap<>(); + map.put("label", sv.getSceneKey()); + map.put("value", sv.getSceneValue()); + list.add(map); + deviceVo.setTempValue(list); ary.add(deviceVo); } else { - switch (sv.getSceneKey()) { - case "intemp": - deviceVo.setIntemp(sv.getSceneValue()); - break; - case "outtemp": - deviceVo.setOuttemp(sv.getSceneValue()); - break; - case "temp": - deviceVo.setTemp(sv.getSceneValue()); - break; - } - map.put(sv.getSceneKey(), sv.getSceneValue()); - deviceVo.setTempValue(map); +// switch (sv.getSceneKey()) { +// case "intemp": +// deviceVo.setIntemp(sv.getSceneValue()); +// break; +// case "outtemp": +// deviceVo.setOuttemp(sv.getSceneValue()); +// break; +// case "temp": +// deviceVo.setTemp(sv.getSceneValue()); +// break; +// } + Map map = new HashMap<>(); + map.put("label", sv.getSceneKey()); + map.put("value", sv.getSceneValue()); + list.add(map); + deviceVo.setTempValue(list); } } }