diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java index 0b370d4..c960fa0 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java @@ -199,6 +199,8 @@ public class StableDataServiceImpl implements StableDataService { vo.setStatisticalIndex(data.getId()); vo.setStatisticalName(data.getName()+ finalFrequency +"("+data.getUnit()+")"); vo.setAnotherName(data.getShowName()); + vo.setUnit(data.getUnit()); + return vo; }).collect(Collectors.toList()); @@ -238,6 +240,8 @@ public class StableDataServiceImpl implements StableDataService { vo.setStatMethod(temp.getValueType()); vo.setStatisticalData(Double.valueOf(df.format(temp.getValue()))); vo.setStatisticalIndex(data.getId()); + vo.setUnit(data.getUnit()); + return vo; }).collect(Collectors.toList()); @@ -282,6 +286,7 @@ public class StableDataServiceImpl implements StableDataService { vo.setStatMethod(temp.getValueType()); vo.setStatisticalData(Double.valueOf(df.format(temp.getValue()))); vo.setStatisticalIndex(data.getId()); + vo.setUnit(data.getUnit()); return vo; }).collect(Collectors.toList()); collect1 = collect1.stream().distinct().collect(Collectors.toList());