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

2023-06-02 10:30:25 新增获取用户所属可控设备列表接口!

Browse Source
master
魔神煜修罗皇 2 years ago
parent a932f249f8
commit ee424e7bd0
2 changed files with 49 additions and 46 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  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 */
private String deviceSn ;
/** 进水温度 */
private String intemp ;
/** 出水温度 */
private String outtemp ;
/** 温度 */
private String temp ;
private Map tempValue;
private List<Map> tempValue;
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<>();
Integer deviceId = listByCode.get(0).getDeviceId();
DeviceVo deviceVo = new DeviceVo();
Map<String, Object> map = new HashMap<>();
List<Map> 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<String, Object> 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<String, Object> 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<String, Object> map = new HashMap<>();
map.put("label", sv.getSceneKey());
map.put("value", sv.getSceneValue());
list.add(map);
deviceVo.setTempValue(list);
}
}
}

Write Preview
Loading…
Cancel
Save