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

bug修改提交

Browse Source
This commit is contained in:
huangzj
2023-08-29 15:22:32 +08:00
parent cddf6ed43b
commit 4b8ffb0a0e
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,6 +199,8 @@ public class StableDataServiceImpl implements StableDataService {
vo.setStatisticalIndex(data.getId()); vo.setStatisticalIndex(data.getId());
vo.setStatisticalName(data.getName()+ finalFrequency +"("+data.getUnit()+")"); vo.setStatisticalName(data.getName()+ finalFrequency +"("+data.getUnit()+")");
vo.setAnotherName(data.getShowName()); vo.setAnotherName(data.getShowName());
vo.setUnit(data.getUnit());
return vo; return vo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
@@ -238,6 +240,8 @@ public class StableDataServiceImpl implements StableDataService {
vo.setStatMethod(temp.getValueType()); vo.setStatMethod(temp.getValueType());
vo.setStatisticalData(Double.valueOf(df.format(temp.getValue()))); vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
vo.setStatisticalIndex(data.getId()); vo.setStatisticalIndex(data.getId());
vo.setUnit(data.getUnit());
return vo; return vo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
@@ -282,6 +286,7 @@ public class StableDataServiceImpl implements StableDataService {
vo.setStatMethod(temp.getValueType()); vo.setStatMethod(temp.getValueType());
vo.setStatisticalData(Double.valueOf(df.format(temp.getValue()))); vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
vo.setStatisticalIndex(data.getId()); vo.setStatisticalIndex(data.getId());
vo.setUnit(data.getUnit());
return vo; return vo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
collect1 = collect1.stream().distinct().collect(Collectors.toList()); collect1 = collect1.stream().distinct().collect(Collectors.toList());