2023-06-02 14:59:36 优化完善用户所属设备列表查询接口,补充动态处理,增强接口灵活性!

master
魔神煜修罗皇 2 years ago
parent 84c6f72ab9
commit facbcb6c5a
  1. 4
      psdc-business/src/main/java/com/psdc/entity/vo/DeviceVo.java
  2. 7
      psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java

@ -5,6 +5,8 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.Map;
/** /**
* @AuthorStone * @AuthorStone
* @Projectpsdc * @Projectpsdc
@ -31,4 +33,6 @@ public class DeviceVo {
private String outtemp ; private String outtemp ;
/** 温度 */ /** 温度 */
private String temp ; private String temp ;
private Map tempValue;
} }

@ -82,9 +82,14 @@ public class TotalElectricMeterController {
// map2.put("outTemp", b2); // map2.put("outTemp", b2);
// map2.put("Temp", b3); // map2.put("Temp", b3);
List<ModelVo> modelVoList = psdcModelService.selDevIsControlByModelName(dd.getDeviceModel()); List<ModelVo> modelVoList = psdcModelService.selDevIsControlByModelName(dd.getDeviceModel());
List<Map> ary = new ArrayList<>();
for (ModelVo scr : modelVoList){ for (ModelVo scr : modelVoList){
map2.put(scr.getRelationField(), null); Map<String, Object> content = new HashMap<>();
content.put("label", scr.getIoDesc());
content.put("value", scr.getRelationField());
ary.add(content);
} }
map2.put("controlKey", ary);
maps2.add(map2); maps2.add(map2);
} }
} else { } else {

Loading…
Cancel
Save