diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EachModuleVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EachModuleVO.java index 2f5ea22..acc89b6 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EachModuleVO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EachModuleVO.java @@ -29,6 +29,9 @@ public class EachModuleVO implements Serializable { @ApiModelProperty("模块输出电流") List modOutList; + @ApiModelProperty("模块温度") + List temperatureList; + @Data public static class HarmonicVo implements Serializable { diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java index 7240eee..f13dcd0 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java @@ -249,6 +249,7 @@ public class DataServiceImpl implements IDataService { List list2 = new ArrayList<>(); List list3 = new ArrayList<>(); + List list4 = new ArrayList<>(); //获取模块状态数据 List dto = commonService.getEachModule(commonQueryParam); @@ -279,8 +280,14 @@ public class DataServiceImpl implements IDataService { vo2.setPhasicType(item.getPhaseType()); vo2.setData(Objects.isNull(item.getAvgValue()) ? 3.14159 : Double.parseDouble(df.format(item.getAvgValue()))); + EachModuleVO.DataVo vo3 = new EachModuleVO.DataVo(); + vo3.setTime(LocalDateTime.ofInstant(item.getTime().minus(8, ChronoUnit.HOURS), ZoneId.systemDefault())); + vo3.setPhasicType(item.getPhaseType()); + vo3.setData(Objects.isNull(item.getMinValue()) ? 3.14159 : Double.parseDouble(df.format(item.getAvgValue()))); + list2.add(vo1); list3.add(vo2); + list4.add(vo3); }); } @@ -372,6 +379,7 @@ public class DataServiceImpl implements IDataService { } moduleVO.setModOutList(list2); moduleVO.setLoadList(list3); + moduleVO.setTemperatureList(list4); result.add(moduleVO); } }