From 8d0e66e935ead9bfeb4a822c0fefb512e4bf2c85 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 02 十一月 2023 16:33:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/ConsoleController.java |   74 +++++++++++++++++++++++++++++++++---
 1 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 1458636..ca53a5b 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -27,9 +27,66 @@
     @PostMapping("loc/pie/charts")
     public R dsa(){
         Map<String,Object> map=new HashMap<String, Object>();
-        List<ChartBean>  list = new ArrayList<ChartBean>();
+
 
         LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
+        List<ChartBean> lists = lists(locUseRate);
+        map.put("rows",lists);
+        return R.ok(map);
+    }
+    @PostMapping("loc/pieA/charts")
+    public R dsaA(){
+        Map<String,Object> map=new HashMap<String, Object>();
+
+
+        LocChartPie locUseRate = reportQueryMapper.getLocUseRateA();
+        List<ChartBean> lists = lists(locUseRate);
+        map.put("rows",lists);
+        return R.ok(map);
+    }
+    @PostMapping("loc/pieB/charts")
+    public R dsaB(){
+        Map<String,Object> map=new HashMap<String, Object>();
+
+
+        LocChartPie locUseRate = reportQueryMapper.getLocUseRateB();
+        List<ChartBean> lists = lists(locUseRate);
+        map.put("rows",lists);
+        return R.ok(map);
+    }
+    @PostMapping("loc/pieC/charts")
+    public R dsaC(){
+        Map<String,Object> map=new HashMap<String, Object>();
+
+
+        LocChartPie locUseRate = reportQueryMapper.getLocUseRateC();
+        List<ChartBean> lists = lists(locUseRate);
+        map.put("rows",lists);
+        return R.ok(map);
+    }
+    @PostMapping("loc/pieD/charts")
+    public R dsaD(){
+        Map<String,Object> map=new HashMap<String, Object>();
+
+
+        LocChartPie locUseRate = reportQueryMapper.getLocUseRateD();
+        List<ChartBean> lists = lists(locUseRate);
+        map.put("rows",lists);
+        return R.ok(map);
+    }
+    @PostMapping("loc/pieE/charts")
+    public R dsaE(){
+        Map<String,Object> map=new HashMap<String, Object>();
+
+
+        LocChartPie locUseRate = reportQueryMapper.getLocUseRateE();
+        List<ChartBean> lists = lists(locUseRate);
+        map.put("rows",lists);
+        return R.ok(map);
+    }
+
+    public List<ChartBean> lists(LocChartPie locUseRate){
+        List<ChartBean>  list = new ArrayList<ChartBean>();
         if(locUseRate!=null) {
             ChartBean fqty = new ChartBean();
             fqty.setName("鍦ㄥ簱搴撲綅");
@@ -41,20 +98,23 @@
             oqty.setY(locUseRate.getOqty());
             list.add(oqty);
 
-            ChartBean uqty = new ChartBean();
-            uqty.setName("浣跨敤搴撲綅");
-            uqty.setY(locUseRate.getUqty());
-            list.add(uqty);
+//            ChartBean uqty = new ChartBean();
+//            uqty.setName("浣跨敤搴撲綅");
+//            uqty.setY(locUseRate.getUqty());
+//            list.add(uqty);
 
             ChartBean xqty = new ChartBean();
             xqty.setName("绂佺敤搴撲綅");
             xqty.setY(locUseRate.getXqty());
             list.add(xqty);
+        }else {
+            return null;
         }
-        map.put("rows",list);
-        return R.ok(map);
+        return list;
     }
 
+
+
     @PostMapping("locIo/line/charts")
     public R locIoLineCharts(){
         Map<String,Object> map=new HashMap<String, Object>();

--
Gitblit v1.9.1