From de02326d63e856ef0505059a6ced2e78108f09d3 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Fri, 2 Jun 2023 18:58:55 +0800 Subject: [PATCH] =?UTF-8?q?2023-06-02=2018: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/service/impl/PsdcSceneServiceImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 d8f4861..2d97627 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 @@ -236,7 +236,6 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { // break; // } Map map = new HashMap<>(); - map.put("context", sv.getSceneKey()); map.put("label", sv.getSceneContext()); map.put("value", sv.getSceneValue()); list.add(map); @@ -253,7 +252,8 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { deviceVo.setDeviceId(sv.getDeviceId()); deviceVo.setDeviceName(sv.getDeviceName()); deviceVo.setDeviceSn(sv.getDeviceSn()); - if (i == listByCode.size() - 1) { // 判断是否为最后1个元素 + if (i == listByCode.size() - 1) { + // 判断是否为最后1个元素 // switch (sv.getSceneKey()) { // case "intemp": // deviceVo.setIntemp(sv.getSceneValue()); @@ -263,7 +263,6 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { // deviceVo.setTemp(sv.getSceneValue()); // } Map map = new HashMap<>(); - map.put("context", sv.getSceneKey()); map.put("label", sv.getSceneContext()); map.put("value", sv.getSceneValue()); list.add(map); @@ -282,7 +281,6 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { // break; // } Map map = new HashMap<>(); - map.put("context", sv.getSceneKey()); map.put("label", sv.getSceneContext()); map.put("value", sv.getSceneValue()); list.add(map); @@ -292,7 +290,6 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { } psr.setDeviceVos(ary); } - // System.out.println("集合：" + sceneRes + "\n"); return sceneRes; }