Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

模块新增温度数据

Browse Source
This commit is contained in:
xy
2025-07-17 15:34:40 +08:00
parent a847f541f1
commit 6c9a33c05d
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EachModuleVO.java
View File

@@ -29,6 +29,9 @@ public class EachModuleVO implements Serializable {
@ApiModelProperty("模块输出电流") @ApiModelProperty("模块输出电流")
List<DataVo> modOutList; List<DataVo> modOutList;
@ApiModelProperty("模块温度")
List<DataVo> temperatureList;
@Data @Data
public static class HarmonicVo implements Serializable { public static class HarmonicVo implements Serializable {

8
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java
View File

@@ -249,6 +249,7 @@ public class DataServiceImpl implements IDataService {
List<EachModuleVO.DataVo> list2 = new ArrayList<>(); List<EachModuleVO.DataVo> list2 = new ArrayList<>();
List<EachModuleVO.DataVo> list3 = new ArrayList<>(); List<EachModuleVO.DataVo> list3 = new ArrayList<>();
List<EachModuleVO.DataVo> list4 = new ArrayList<>();
//获取模块状态数据 //获取模块状态数据
List<StatisticalDataDTO> dto = commonService.getEachModule(commonQueryParam); List<StatisticalDataDTO> dto = commonService.getEachModule(commonQueryParam);
@@ -279,8 +280,14 @@ public class DataServiceImpl implements IDataService {
vo2.setPhasicType(item.getPhaseType()); vo2.setPhasicType(item.getPhaseType());
vo2.setData(Objects.isNull(item.getAvgValue()) ? 3.14159 : Double.parseDouble(df.format(item.getAvgValue()))); 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); list2.add(vo1);
list3.add(vo2); list3.add(vo2);
list4.add(vo3);
}); });
} }
@@ -372,6 +379,7 @@ public class DataServiceImpl implements IDataService {
} }
moduleVO.setModOutList(list2); moduleVO.setModOutList(list2);
moduleVO.setLoadList(list3); moduleVO.setLoadList(list3);
moduleVO.setTemperatureList(list4);
result.add(moduleVO); result.add(moduleVO);
} }
} }