From 84500495f1ee360ffbd5442154c241d72eb5d58d Mon Sep 17 00:00:00 2001
From: wuyw <373811525@qq.com>
Date: Wed, 14 Aug 2024 07:17:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=B0=B4=E7=94=A8=E7=94=B5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../waterele/MaWatereleRecordController.java  |  5 ++--
 .../service/IMaWatereleRecordService.java     |  3 ++-
 .../impl/MaWatereleRecordServiceImpl.java     | 23 +++++++++++++++----
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/waterele/MaWatereleRecordController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/waterele/MaWatereleRecordController.java
index 1ad333b..bb7f3fd 100644
--- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/waterele/MaWatereleRecordController.java
+++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/waterele/MaWatereleRecordController.java
@@ -1,5 +1,6 @@
 package com.fastbee.data.controller.waterele;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
@@ -57,8 +58,8 @@ public class MaWatereleRecordController extends BaseController {
     @GetMapping("/echart")
     @ApiOperation("查询水电双计数据记录echart")
     public Map<String, Object> echart(MaWatereleRecord maWatereleRecord) {
-        Map<String, Object> map  = maWatereleRecordService.chartData(maWatereleRecord);
-        return success(map);
+        ArrayList<Object> list  = maWatereleRecordService.chartData(maWatereleRecord);
+        return success(list);
     }
 
 
diff --git a/fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/IMaWatereleRecordService.java b/fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/IMaWatereleRecordService.java
index 3c0d403..15f5ac0 100644
--- a/fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/IMaWatereleRecordService.java
+++ b/fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/IMaWatereleRecordService.java
@@ -1,5 +1,6 @@
 package com.fastbee.waterele.service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -61,7 +62,7 @@ public interface IMaWatereleRecordService
      */
     public int deleteMaWatereleRecordById(Long id);
 
-    Map<String, Object> chartData(MaWatereleRecord maWatereleRecord);
+    ArrayList<Object> chartData(MaWatereleRecord maWatereleRecord);
 
 
 }
diff --git a/fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/impl/MaWatereleRecordServiceImpl.java b/fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/impl/MaWatereleRecordServiceImpl.java
index 6c4310d..4a18793 100644
--- a/fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/impl/MaWatereleRecordServiceImpl.java
+++ b/fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/impl/MaWatereleRecordServiceImpl.java
@@ -96,20 +96,33 @@ public class MaWatereleRecordServiceImpl implements IMaWatereleRecordService
     }
 
     @Override
-    public Map<String, Object> chartData(MaWatereleRecord maWatereleRecord) {
+    public ArrayList<Object> chartData(MaWatereleRecord maWatereleRecord) {
         Map<String, Object> map = new HashMap<String, Object>();
+        ArrayList<Object> list = new ArrayList<>();
         List<MaWatereleRecord> maWatereleRecords = maWatereleRecordMapper.selectMaWatereleRecordList(maWatereleRecord);
         List<String> time = new ArrayList<>();
         List<String> sumFlow = new ArrayList<>();
         List<String> sumEle = new ArrayList<>();
+        HashMap<String, Object> sumFlowtMap = new HashMap<>();
+        sumFlowtMap.put("name", "累计水量");
+        sumFlowtMap.put("unit", "m³");
+        HashMap<String, Object> sumEletMap = new HashMap<>();
+        sumEletMap.put("name", "累计电量");
+        sumEletMap.put("unit", "度");
         for (MaWatereleRecord record : maWatereleRecords) {
             time.add(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, record.getCreateTime()));
             sumFlow.add(record.getSumflow());
             sumEle.add(record.getSumele());
         }
-        map.put("time", time);
-        map.put("sumFlow", sumFlow);
-        map.put("sumEle", sumEle);
-        return map;
+        sumFlowtMap.put("time", time);
+        sumFlowtMap.put("data", sumFlow);
+        sumEletMap.put("time", time);
+        sumEletMap.put("data", sumEle);
+        list.add(sumFlowtMap);
+        list.add(sumEletMap);
+//        map.put("time", time);
+//        map.put("sumFlow", sumFlow);
+//        map.put("sumEle", sumEle);
+        return list;
     }
 }