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 3f731f4..153d9ce 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 @@ -197,6 +197,7 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { List<DeviceVo> ary = new ArrayList<>(); Integer deviceId = listByCode.get(0).getDeviceId(); DeviceVo deviceVo = new DeviceVo(); + Map<String, Object> map = new HashMap<>(); for (int i = 0; i < listByCode.size(); i++) { SceneVo sv = listByCode.get(i); if (deviceId == sv.getDeviceId()) { @@ -214,6 +215,8 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { deviceVo.setTemp(sv.getSceneValue()); break; } + map.put(sv.getSceneKey(), sv.getSceneValue()); + deviceVo.setTempValue(map); if (1 == listByCode.size() || i == listByCode.size() - 1){ ary.add(deviceVo); } @@ -222,6 +225,7 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { ary.add(deviceVo); deviceId = sv.getDeviceId(); deviceVo = new DeviceVo(); + map = new HashMap<>(); deviceVo.setDeviceId(sv.getDeviceId()); deviceVo.setDeviceName(sv.getDeviceName()); deviceVo.setDeviceSn(sv.getDeviceSn()); @@ -234,6 +238,8 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { case "temp": deviceVo.setTemp(sv.getSceneValue()); } + map.put(sv.getSceneKey(), sv.getSceneValue()); + deviceVo.setTempValue(map); ary.add(deviceVo); } else { switch (sv.getSceneKey()) { @@ -247,6 +253,8 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { deviceVo.setTemp(sv.getSceneValue()); break; } + map.put(sv.getSceneKey(), sv.getSceneValue()); + deviceVo.setTempValue(map); } } }