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; }