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 7aaf32e..e0da85f 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 @@ -311,7 +311,6 @@ public class DataServiceImpl implements IDataService { List dataList = list1.stream() .sorted(Comparator.comparing(EachModuleVO.HarmonicVo::getTime)) .collect(Collectors.toList()); - moduleVO.setDataList(dataList); EachModuleVO.HarmonicVo last = dataList.get(dataList.size() - 1); if (Objects.equals(last.getDataType(),0)) { moduleVO.setModuleState(last.getStateDesc()); @@ -328,7 +327,9 @@ public class DataServiceImpl implements IDataService { vo.setTime(LocalDateTime.now()); vo.setStateDesc(last.getStateDesc()); vo.setDataType(0); + dataList.add(vo); } + moduleVO.setDataList(dataList); } moduleVO.setModOutList(list2); moduleVO.setLoadList(list3);