This commit is contained in:
xy
2025-07-15 20:11:27 +08:00
parent 913c2ef262
commit d277eba5fb

View File

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