diff --git a/psdc-business/src/main/java/com/psdc/entity/vo/DeviceVo.java b/psdc-business/src/main/java/com/psdc/entity/vo/DeviceVo.java index 5be745d..56a5e11 100644 --- a/psdc-business/src/main/java/com/psdc/entity/vo/DeviceVo.java +++ b/psdc-business/src/main/java/com/psdc/entity/vo/DeviceVo.java @@ -5,6 +5,8 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.stereotype.Component; +import java.util.Map; + /** * @Author:Stone * @Project:psdc @@ -31,4 +33,6 @@ public class DeviceVo { private String outtemp ; /** 温度 */ private String temp ; + + private Map tempValue; } diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java index 2f36607..678a4ac 100644 --- a/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java +++ b/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java @@ -84,9 +84,14 @@ public class TotalElectricMeterController { // map2.put("outTemp", b2); // map2.put("Temp", b3); List modelVoList = psdcModelService.selDevIsControlByModelName(dd.getDeviceModel()); + List ary = new ArrayList<>(); for (ModelVo scr : modelVoList){ - map2.put(scr.getRelationField(), null); + Map content = new HashMap<>(); + content.put("label", scr.getIoDesc()); + content.put("value", scr.getRelationField()); + ary.add(content); } + map2.put("controlKey", ary); maps2.add(map2); } } else {