From e10bb39f5e2376dedd28d1fe18f503fbad8e970f Mon Sep 17 00:00:00 2001
From: baogq <445720029@qq.com>
Date: Thu, 7 Jul 2022 19:45:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/broad/BoxBroadController.java  | 29 ++++++++++++-
 .../main/resources/templates/broad/box.html   |  6 +--
 .../com/ruoyi/system/domain/EchartsDTO.java   | 42 +++++++++++++++++++
 3 files changed, 72 insertions(+), 5 deletions(-)
 create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/EchartsDTO.java

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java
index 2fe240c..dd178ae 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java
@@ -3,8 +3,10 @@ package com.ruoyi.web.controller.broad;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONPObject;
+import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.system.domain.BoxOutputByType;
 import com.ruoyi.system.domain.BoxPlanCompletion;
+import com.ruoyi.system.domain.EchartsDTO;
 import com.ruoyi.system.service.IBroadDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -17,6 +19,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author wanghao
@@ -50,8 +54,29 @@ public class BoxBroadController {
 //    按类型查询产量
     @PostMapping("/selectOutputByType")
     public String selectOutputByType(){
-        List<BoxOutputByType> boxOutputByType=service.selectOutputByType();
-        return JSONArray.toJSONString(boxOutputByType);
+//        List<BoxOutputByType> boxOutputByType=service.selectOutputByType();
+//        return JSONArray.toJSONString(boxOutputByType);
+        EchartsDTO echarts = new EchartsDTO();
+        List<Long> seriesInfo = new ArrayList<Long>();
+        List<String>  xAxisInfo = new ArrayList<String>();
+
+        List<BoxOutputByType> info = service.selectOutputByType();
+        Map<String,List<BoxOutputByType>> orderInfoMap = info.stream().collect(Collectors.groupingBy(BoxOutputByType:: getPlan_type));
+
+        for (String key : orderInfoMap.keySet()) {
+            xAxisInfo.add(key);
+            seriesInfo.add(Convert.toLong(orderInfoMap.get(key).stream().mapToDouble(BoxOutputByType:: getActual_production).sum()));
+        }
+
+        echarts.setSeriesInfo(seriesInfo);
+        echarts.setXAxisInfo(xAxisInfo);
+
+        String jsonInfo = JSONArray.toJSONString(echarts);
+
+        System.out.println("根据型号统计产量："+jsonInfo);
+        return jsonInfo;
+
+
     }
 
 
diff --git a/ruoyi-admin/src/main/resources/templates/broad/box.html b/ruoyi-admin/src/main/resources/templates/broad/box.html
index 13a1f17..c2b36d6 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/box.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/box.html
@@ -411,9 +411,9 @@
                 inventoryInfoDataMerger.getData()[rowName2],
                 rowName2,
             )
-        })
+        })*/
 
-        autoUpdate('/system/UShellMes/getUshellOutPath', INTERVAL, data => {
+        autoUpdate('/broad/box/selectOutputByType', INTERVAL, data => {
             statByType.setOption({
                 xAxis: {
                     data: data['xAxisInfo'].map(value => value),
@@ -429,7 +429,7 @@
                     // }
                 ]
             })
-        })*/
+        })
 
         // autoUpdate('/system/UShellMes/getHourOutPut', INTERVAL, data => {
         //     statByHour.setOption({
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/EchartsDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/EchartsDTO.java
new file mode 100644
index 0000000..4227d28
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/EchartsDTO.java
@@ -0,0 +1,42 @@
+package com.ruoyi.system.domain;
+
+
+import java.util.List;
+
+/**
+ * @author WenJY
+ * @date 2021年11月08日 13:48
+ */
+
+public class EchartsDTO {
+    public EchartsDTO() {
+    }
+
+    //xAxis
+    //series
+
+    public EchartsDTO(List<String> xAxisInfo, List<Long> seriesInfo) {
+        this.xAxisInfo = xAxisInfo;
+        this.seriesInfo = seriesInfo;
+    }
+
+    public List<String> xAxisInfo;
+
+    public List<Long> seriesInfo;
+
+    public List<String> getxAxisInfo() {
+        return xAxisInfo;
+    }
+
+    public List<Long> getSeriesInfo() {
+        return seriesInfo;
+    }
+
+    public void setSeriesInfo(List<Long> seriesInfo) {
+        this.seriesInfo = seriesInfo;
+    }
+
+    public void setXAxisInfo(List<String> xAxisInfo) {
+        this.xAxisInfo = xAxisInfo;
+    }
+}