From 94e4a7598d2ed0bee320174bcd44a3844d59cc0d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 十二月 2023 19:25:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 105 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 744e0e5..8d51f0d 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,12 +1,11 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
+import com.core.common.R;
import com.zy.asrs.entity.AxisBean;
import com.zy.asrs.entity.ChartBean;
import com.zy.asrs.entity.LocChartPie;
import com.zy.asrs.entity.WorkChartAxis;
import com.zy.asrs.mapper.ReportQueryMapper;
-import com.core.common.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,38 +24,69 @@
@Autowired
private ReportQueryMapper reportQueryMapper;
- @PostMapping("/pie")
- public R pieStats(){
-// ViewStockUseBean bean = new ViewStockUseBean();
-// bean.setPageSize(65535);
-// bean.setPageNumber(1);
-// List<ViewStockUseBean> list= reportQueryMapper.queryViewStockUseList(bean);
-// PieChartsVo pieVo = new PieChartsVo();
-// for (ViewStockUseBean one: list){
-// // 鎬诲簱浣�
-// pieVo.setTotalQty(pieVo.getTotalQty() + one.getTotal_qty());
-// // 鍦ㄥ簱
-// pieVo.setFullQty(pieVo.getFullQty() + one.getFull_qty());
-// // 绌洪棽
-// pieVo.setNullQty(pieVo.getNullQty() + one.getNull_qty());
-// // 绂佺敤
-// pieVo.setForbidQty(pieVo.getForbidQty() + one.getForbid_qty());
-// // 浣跨敤 = 鎬� - 鍦ㄥ簱 - 绌洪棽 - 绂佺敤
-// pieVo.setOccQty(pieVo.getOccQty()+(one.getTotal_qty()-one.getFull_qty()-one.getNull_qty()-one.getForbid_qty()));
-// }
-// pieVo.complete();
-// System.out.println(JSON.toJSONString(pieVo));
-// return R.ok(pieVo);
- String s = "{\"forbidDes\":\"绂佺敤搴撲綅0.1%\",\"forbidQty\":2,\"fullDes\":\"鍦ㄥ簱搴撲綅44.4%\",\"fullQty\":1061,\"nullDes\":\"绌哄簱浣�47.2%\",\"nullQty\":1128,\"occDes\":\"浣跨敤搴撲綅8.4%\",\"occQty\":201,\"totalDes\":\"\",\"totalQty\":2392}\n";
- return R.ok(JSON.parse(s));
- }
-
@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>();
+ int locAll = 283;
+ LocChartPie locUseRate = reportQueryMapper.getLocUseRateB();
+ locUseRate.setOqty(locAll-locUseRate.getFqty()-locUseRate.getXqty());
+ 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>();
+ int locAll = 744;
+ LocChartPie locUseRate = reportQueryMapper.getLocUseRateC();
+ locUseRate.setOqty(locAll-locUseRate.getFqty()-locUseRate.getXqty());
+ 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>();
+ int locAll = 908;
+ LocChartPie locUseRate = reportQueryMapper.getLocUseRateD();
+ locUseRate.setOqty(locAll-locUseRate.getFqty()-locUseRate.getXqty());
+ 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>();
+ int locAll = 1308;
+ LocChartPie locUseRate = reportQueryMapper.getLocUseRateE();
+ locUseRate.setOqty(locAll-locUseRate.getFqty()-locUseRate.getXqty());
+ 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("鍦ㄥ簱搴撲綅");
@@ -68,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.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