From d8282bc83c48030c3338ce014a88574d1bbfe895 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期六, 29 三月 2025 16:50:59 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 75 +++++++++++++++++++------------------
1 files changed, 39 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..2009759 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,32 +24,6 @@
@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>();
@@ -58,15 +31,45 @@
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
if(locUseRate!=null) {
- ChartBean fqty = new ChartBean();
- fqty.setName("鍦ㄥ簱搴撲綅");
- fqty.setY(locUseRate.getFqty());
- list.add(fqty);
+// ChartBean fqty = new ChartBean();
+// fqty.setName("鍦ㄥ簱搴撲綅");
+// fqty.setY(locUseRate.getFqty());
+// list.add(fqty);
- ChartBean oqty = new ChartBean();
- oqty.setName("绌哄簱浣�");
- oqty.setY(locUseRate.getOqty());
- list.add(oqty);
+ ChartBean fqty1 = new ChartBean();
+ fqty1.setName("鍗曞搧鍦ㄥ簱"+locUseRate.getFqty1());
+ fqty1.setY(locUseRate.getFqty1());
+ list.add(fqty1);
+
+ ChartBean fqty2 = new ChartBean();
+ fqty2.setName("楂橀鍦ㄥ簱"+locUseRate.getFqty2());
+ fqty2.setY(locUseRate.getFqty2());
+ list.add(fqty2);
+
+ ChartBean fqty3 = new ChartBean();
+ fqty3.setName("浣庨鍦ㄥ簱"+locUseRate.getFqty3());
+ fqty3.setY(locUseRate.getFqty3());
+ list.add(fqty3);
+
+// ChartBean oqty = new ChartBean();
+// oqty.setName("绌哄簱浣�");
+// oqty.setY(locUseRate.getOqty());
+// list.add(oqty);
+
+ ChartBean oqty1 = new ChartBean();
+ oqty1.setName("鍗曞搧绌哄簱浣�"+locUseRate.getOqty1());
+ oqty1.setY(locUseRate.getOqty1());
+ list.add(oqty1);
+
+ ChartBean oqty2 = new ChartBean();
+ oqty2.setName("楂橀绌哄簱浣�"+locUseRate.getOqty2());
+ oqty2.setY(locUseRate.getOqty2());
+ list.add(oqty2);
+
+ ChartBean oqty3 = new ChartBean();
+ oqty3.setName("浣庨绌哄簱浣�"+locUseRate.getOqty3());
+ oqty3.setY(locUseRate.getOqty3());
+ list.add(oqty3);
ChartBean uqty = new ChartBean();
uqty.setName("浣跨敤搴撲綅");
--
Gitblit v1.9.1