From 82de5a307466894bbb0258f8a63a26a7bb96d80d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 16 十月 2025 09:55:35 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 57 ++++++++++++++-------------------------------------------
1 files changed, 14 insertions(+), 43 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..6b583a3 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,39 +24,13 @@
@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>();
+ public R dsa() {
+ Map<String, Object> map = new HashMap<String, Object>();
+ List<ChartBean> list = new ArrayList<ChartBean>();
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
- if(locUseRate!=null) {
+ if (locUseRate != null) {
ChartBean fqty = new ChartBean();
fqty.setName("鍦ㄥ簱搴撲綅");
fqty.setY(locUseRate.getFqty());
@@ -78,37 +51,37 @@
xqty.setY(locUseRate.getXqty());
list.add(xqty);
}
- map.put("rows",list);
+ map.put("rows", list);
return R.ok(map);
}
@PostMapping("locIo/line/charts")
- public R locIoLineCharts(){
- Map<String,Object> map=new HashMap<String, Object>();
+ public R locIoLineCharts() {
+ Map<String, Object> map = new HashMap<String, Object>();
List<AxisBean> list = new ArrayList<AxisBean>();
List<WorkChartAxis> listChart = reportQueryMapper.getChartAxis();
- if(listChart!=null) {
+ if (listChart != null) {
ArrayList<Integer> data1 = new ArrayList<Integer>();
ArrayList<Integer> data2 = new ArrayList<Integer>();
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DATE, -12);
- for(int i=0;i<12;i++) {
+ for (int i = 0; i < 12; i++) {
boolean flag = true;
calendar.add(Calendar.DATE, 1);
String str = sf.format(calendar.getTime());
- for(WorkChartAxis workChart : listChart) {
- if(str.equals(workChart.getYmd())) {
+ for (WorkChartAxis workChart : listChart) {
+ if (str.equals(workChart.getYmd())) {
data1.add(workChart.getInqty());
data2.add(workChart.getOutqty());
flag = false;
break;
}
}
- if(flag) {
+ if (flag) {
data1.add(0);
data2.add(0);
}
@@ -124,11 +97,9 @@
outqty.setData(data2.toArray(array2));
list.add(outqty);
}
- map.put("rows",list);
+ map.put("rows", list);
return R.ok(map);
}
-
-
}
--
Gitblit v1.9.1