From ab08f2e28057e226ba42b3268ed36ac489cef34e Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 24 三月 2026 00:59:59 +0800
Subject: [PATCH] 大屏接口
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 127 +++++++++---------------------------------
1 files changed, 27 insertions(+), 100 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 269b9bb..fd1e43a 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -3,12 +3,9 @@
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.domain.dto.AxisBean;
-import com.zy.asrs.domain.dto.WorkChartAxis;
-import com.zy.asrs.domain.vo.LocChartPie;
import com.zy.asrs.entity.BasCrnError;
import com.zy.asrs.mapper.BasCrnErrorMapper;
-import com.zy.asrs.mapper.ReportQueryMapper;
+import com.zy.asrs.service.MonitorReportService;
import com.zy.common.model.annotations.RateLimit;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
@@ -27,8 +24,13 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2020/11/16
@@ -40,7 +42,7 @@
private static final String[] WEEK = {"鏄熸湡鏃�","鏄熸湡涓�","鏄熸湡浜�","鏄熸湡涓�","鏄熸湡鍥�","鏄熸湡浜�","鏄熸湡鍏�"};
@Autowired
- private ReportQueryMapper reportQueryMapper;
+ private MonitorReportService monitorReportService;
@Autowired
private SlaveProperties slaveProperties;
@Autowired
@@ -144,113 +146,38 @@
// @RateLimit(2)
@GetMapping("/pakin/rep")
public R monitorPakinRep(){
- // 鍏ュ簱
- List<Map<String, Object>> pakinRep = reportQueryMapper.queryPakinRep();
- for (Map<String, Object> map : pakinRep) {
- if (map.get("node")!=null) {
- map.put("node", String.valueOf(map.get("node")).substring(5, 10));
- }
- }
- // 鍑哄簱
- List<Map<String, Object>> pakoutRep = reportQueryMapper.queryPakinRep();
- return R.ok(pakinRep);
+ return R.ok(monitorReportService.getPakinRepData());
}
@GetMapping("/line/charts")
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) {
- 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++) {
- boolean flag = true;
- calendar.add(Calendar.DATE, 1);
- String str = sf.format(calendar.getTime());
- for(WorkChartAxis workChart : listChart) {
- if(str.equals(workChart.getYmd())) {
- data1.add(workChart.getInqty());
- data2.add(workChart.getOutqty());
- flag = false;
- break;
- }
- }
- if(flag) {
- data1.add(0);
- data2.add(0);
- }
- }
- AxisBean inqty = new AxisBean();
- inqty.setName("鍏ュ簱鏁伴噺");
- Integer[] array1 = new Integer[data1.size()];
- inqty.setData(data1.toArray(array1));
- list.add(inqty);
- AxisBean outqty = new AxisBean();
- outqty.setName("鍑哄簱鏁伴噺");
- Integer[] array2 = new Integer[data2.size()];
- outqty.setData(data2.toArray(array2));
- list.add(outqty);
- }
- map.put("rows",list);
- return R.ok(map);
+ return R.ok(monitorReportService.getLocIoLineChartsData());
}
/**
* 搴撲綅浣跨敤鎯呭喌缁熻
*/
-// @RateLimit(60)
+// 棰勭暀闄愭祦閰嶇疆锛�60锛�
@GetMapping("/loc/rep")
public R monitorLocRep(){
- List<Map<String, Object>> pie = new ArrayList<>();
+ return R.ok(monitorReportService.getLocRepData());
+ }
- LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
- if(locUseRate!=null) {
- Map<String, Object> map = new HashMap<>();
- map.put("name", "鍦ㄥ簱");
- map.put("value", locUseRate.getFqty());
- pie.add(map);
+ /**
+ * 搴撲綅鐑姏鍥炬帓鍙峰垪琛�
+ */
+ @GetMapping("/loc/map/rows")
+ public R monitorLocMapRows() {
+ return R.ok(monitorReportService.getLocMapRows());
+ }
- Map<String, Object> map1 = new HashMap<>();
- map1.put("name", "绌�");
- map1.put("value", locUseRate.getOqty());
- pie.add(map1);
-
- Map<String, Object> map2 = new HashMap<>();
- map2.put("name", "浣跨敤");
- map2.put("value", locUseRate.getUqty());
- pie.add(map2);
-
- Map<String, Object> map3 = new HashMap<>();
- map3.put("name", "绂佺敤");
- map3.put("value", locUseRate.getXqty());
- pie.add(map3);
- }
-
- // 鎬诲簱浣嶆暟
- Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
- // 浣跨敤涓�
- Integer used = locUseRate.getFqty() + locUseRate.getUqty();
- // 搴撲綅浣跨敤鐜�
- double usedDivides = Arith.divides(3, used, total);
- double usedPr = Arith.multiplys(1, usedDivides, 100);
-
- return R.ok(
- Cools.add("pie", pie)
- .add("stockCunt", locUseRate.getFqty())
- .add("emptyCount", locUseRate.getOqty())
- .add("noneCount", locUseRate.getXqty())
- .add("total", total)
- .add("used", used)
- .add("usedPr", usedPr)
- );
+ /**
+ * 搴撲綅鐑姏鍥惧崟鎺掓暟鎹�
+ */
+ @GetMapping("/loc/map")
+ public R monitorLocMap(@RequestParam(defaultValue = "1") Integer row) {
+ return R.ok(monitorReportService.getLocMapData(row));
}
/**
--
Gitblit v1.9.1