From 7bee330836676c64a411967afe88fa4c63bfef14 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 13 四月 2026 19:14:56 +0800
Subject: [PATCH] 24小时折线图-改为12小时折线图
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 33 +++------------------------------
1 files changed, 3 insertions(+), 30 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..0465b28 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;
@@ -24,32 +23,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(){
@@ -114,12 +87,12 @@
}
}
AxisBean inqty = new AxisBean();
- inqty.setName("鍏ュ簱鏁伴噺");
+ inqty.setName("鍏ュ簱鎵樼洏鏁�");
Integer[] array1 = new Integer[data1.size()];
inqty.setData(data1.toArray(array1));
list.add(inqty);
AxisBean outqty = new AxisBean();
- outqty.setName("鍑哄簱鏁伴噺");
+ outqty.setName("鍑哄簱TU");
Integer[] array2 = new Integer[data2.size()];
outqty.setData(data2.toArray(array2));
list.add(outqty);
--
Gitblit v1.9.1