diff --git a/mh-system/src/main/java/com/mh/system/service/energy/impl/EnergyAnalyzeServiceImpl.java b/mh-system/src/main/java/com/mh/system/service/energy/impl/EnergyAnalyzeServiceImpl.java index f1204d6..0d69dcc 100644 --- a/mh-system/src/main/java/com/mh/system/service/energy/impl/EnergyAnalyzeServiceImpl.java +++ b/mh-system/src/main/java/com/mh/system/service/energy/impl/EnergyAnalyzeServiceImpl.java @@ -245,6 +245,7 @@ public class EnergyAnalyzeServiceImpl implements EnergyAnalyzeService { map.put("timeStr", timeStr.subList(startIndex, endIndex)); map.put("dataList", columnData); } + map.put("total", timeStr.size()); return new ArrayList<>(map.entrySet()); } diff --git a/mh-system/src/main/java/com/mh/system/service/energy/impl/EnergyQueryServiceImpl.java b/mh-system/src/main/java/com/mh/system/service/energy/impl/EnergyQueryServiceImpl.java index 1d58f8a..92e2885 100644 --- a/mh-system/src/main/java/com/mh/system/service/energy/impl/EnergyQueryServiceImpl.java +++ b/mh-system/src/main/java/com/mh/system/service/energy/impl/EnergyQueryServiceImpl.java @@ -262,6 +262,7 @@ public class EnergyQueryServiceImpl implements IEnergyQueryService { map.put("copArr", Arrays.copyOfRange(copArr, startIndex, endIndex)); map.put("timeStrArr", Arrays.copyOfRange(timeStrArr, startIndex, endIndex)); } + map.put("total", timeStrArr.length); // 组装赋值 List> listData = new ArrayList<>(); @@ -281,6 +282,9 @@ public class EnergyQueryServiceImpl implements IEnergyQueryService { Map timeStr = new HashMap<>(); timeStr.put("timeStrArr", map.get("timeStrArr")); listData.add(timeStr); + Map total = new HashMap<>(); + total.put("total", map.get("total")); + listData.add(total); return AjaxResult.success(listData); }