hwj_system
/
scmy
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'aa/master'

Browse Source
master
林颖晨 2 years ago
parent 1756d70b04 ee424e7bd0
commit 9f8bb78419
2 changed files with 49 additions and 46 deletions
  1. 9
      psdc-business/src/main/java/com/psdc/entity/vo/DeviceVo.java
  2. 86
      psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java

9
psdc-business/src/main/java/com/psdc/entity/vo/DeviceVo.java
Unescape View File

@ -28,14 +28,7 @@ public class DeviceVo {
/** 设备sn */ /** 设备sn */
private String deviceSn ; private String deviceSn ;
/** 进水温度 */ private List<Map> tempValue;
private String intemp ;
/** 出水温度 */
private String outtemp ;
/** 温度 */
private String temp ;
private Map tempValue;
private List<Map> tempList ; private List<Map> tempList ;

86
psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java
Unescape View File

@ -216,26 +216,30 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
List<DeviceVo> ary = new ArrayList<>(); List<DeviceVo> ary = new ArrayList<>();
Integer deviceId = listByCode.get(0).getDeviceId(); Integer deviceId = listByCode.get(0).getDeviceId();
DeviceVo deviceVo = new DeviceVo(); DeviceVo deviceVo = new DeviceVo();
Map<String, Object> map = new HashMap<>(); List<Map> list = new ArrayList<>();
for (int i = 0; i < listByCode.size(); i++) { for (int i = 0; i < listByCode.size(); i++) {
SceneVo sv = listByCode.get(i); SceneVo sv = listByCode.get(i);
if (deviceId == sv.getDeviceId()) { if (deviceId == sv.getDeviceId()) {
deviceVo.setDeviceId(sv.getDeviceId()); deviceVo.setDeviceId(sv.getDeviceId());
deviceVo.setDeviceName(sv.getDeviceName()); deviceVo.setDeviceName(sv.getDeviceName());
deviceVo.setDeviceSn(sv.getDeviceSn()); deviceVo.setDeviceSn(sv.getDeviceSn());
switch (sv.getSceneKey()) { // switch (sv.getSceneKey()) {
case "intemp": // case "intemp":
deviceVo.setIntemp(sv.getSceneValue()); // deviceVo.setIntemp(sv.getSceneValue());
break; // break;
case "outtemp": // case "outtemp":
deviceVo.setOuttemp(sv.getSceneValue()); // deviceVo.setOuttemp(sv.getSceneValue());
break; // break;
case "temp": // case "temp":
deviceVo.setTemp(sv.getSceneValue()); // deviceVo.setTemp(sv.getSceneValue());
break; // break;
} // }
map.put(sv.getSceneKey(), sv.getSceneValue()); Map<String, Object> map = new HashMap<>();
deviceVo.setTempValue(map); map.put("label", sv.getSceneKey());
map.put("value", sv.getSceneValue());
list.add(map);
deviceVo.setTempValue(list);
if (1 == listByCode.size() || i == listByCode.size() - 1){ if (1 == listByCode.size() || i == listByCode.size() - 1){
ary.add(deviceVo); ary.add(deviceVo);
} }
@ -244,36 +248,42 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
ary.add(deviceVo); ary.add(deviceVo);
deviceId = sv.getDeviceId(); deviceId = sv.getDeviceId();
deviceVo = new DeviceVo(); deviceVo = new DeviceVo();
map = new HashMap<>(); list = new ArrayList<>();
deviceVo.setDeviceId(sv.getDeviceId()); deviceVo.setDeviceId(sv.getDeviceId());
deviceVo.setDeviceName(sv.getDeviceName()); deviceVo.setDeviceName(sv.getDeviceName());
deviceVo.setDeviceSn(sv.getDeviceSn()); deviceVo.setDeviceSn(sv.getDeviceSn());
if (i == listByCode.size() - 1) { // 判断是否为最后1个元素 if (i == listByCode.size() - 1) { // 判断是否为最后1个元素
switch (sv.getSceneKey()) { // switch (sv.getSceneKey()) {
case "intemp": // case "intemp":
deviceVo.setIntemp(sv.getSceneValue()); // deviceVo.setIntemp(sv.getSceneValue());
case "outtemp": // case "outtemp":
deviceVo.setOuttemp(sv.getSceneValue()); // deviceVo.setOuttemp(sv.getSceneValue());
case "temp": // case "temp":
deviceVo.setTemp(sv.getSceneValue()); // deviceVo.setTemp(sv.getSceneValue());
} // }
map.put(sv.getSceneKey(), sv.getSceneValue()); Map<String, Object> map = new HashMap<>();
deviceVo.setTempValue(map); map.put("label", sv.getSceneKey());
map.put("value", sv.getSceneValue());
list.add(map);
deviceVo.setTempValue(list);
ary.add(deviceVo); ary.add(deviceVo);
} else { } else {
switch (sv.getSceneKey()) { // switch (sv.getSceneKey()) {
case "intemp": // case "intemp":
deviceVo.setIntemp(sv.getSceneValue()); // deviceVo.setIntemp(sv.getSceneValue());
break; // break;
case "outtemp": // case "outtemp":
deviceVo.setOuttemp(sv.getSceneValue()); // deviceVo.setOuttemp(sv.getSceneValue());
break; // break;
case "temp": // case "temp":
deviceVo.setTemp(sv.getSceneValue()); // deviceVo.setTemp(sv.getSceneValue());
break; // break;
} // }
map.put(sv.getSceneKey(), sv.getSceneValue()); Map<String, Object> map = new HashMap<>();
deviceVo.setTempValue(map); map.put("label", sv.getSceneKey());
map.put("value", sv.getSceneValue());
list.add(map);
deviceVo.setTempValue(list);
} }
} }
} }

Write Preview
Loading…
Cancel
Save