From 6ba157825d34078a75fee36cb66ead17327f5b32 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 29 四月 2025 14:32:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 128 +++++++++++++++++++++++++-----------------
1 files changed, 77 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 796ecff..84604dd 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -62,42 +62,17 @@
* 鑾峰彇鍏朵粬淇℃伅
*/
@GetMapping("/other")
- public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer ledId) {
- switch (ledId){
- case 101:
- ledId=1;
- break;
- case 109:
- ledId=2;
- break;
- case 117:
- ledId=3;
- break;
- case 126:
- ledId=4;
- break;
- case 134:
- ledId=5;
- break;
- case 201:
- ledId=6;
- break;
- case 205:
- ledId=7;
- break;
- case 207:
- ledId=8;
- break;
- case 211:
- ledId=9;
- break;
- case 213:
- ledId=10;
- break;
- case 217:
- ledId=11;
- break;
+ public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer sta) {
+ Integer ledId = 0;
+ for (LedSlave led : slaveProperties.getLed()) {
+ for (Integer staNo : led.getStaArr()) {
+ if (staNo.equals(sta)) {
+ ledId = led.getId();
+ break;
+ }
+ }
}
+
Double xSpeed = 0.0D;
Double ySpeed = 0.0D;
Double zSpeed = 0.0D;
@@ -139,7 +114,7 @@
// 鑾峰彇杈撻�佺嚎plc绾跨▼
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
- String ledContent = ledThread.getWorkNos().toString();
+ String ledContent = Cools.isEmpty(ledThread) ? "" : ledThread.getWorkNos().toString();
// ledContent = "ask鐨勬ā鍧楄惃婊″ぇ绠椾簡钀ㄦ弧澶т簡\n 鏄獦澧冨埌鍩冨強鍡插鍡瞈n 钀ㄨ揪濮嗘墦寮�钀ㄦ弧澶у嚡鎾掗害褰撳姵钀ㄦ弧澶ц�佸笀";
return R.ok(
@@ -220,14 +195,18 @@
}
- /**
- * 搴撲綅浣跨敤鎯呭喌缁熻
- */
+
+
@GetMapping("/loc/rep")
public R monitorLocRep(){
List<Map<String, Object>> pie = new ArrayList<>();
+
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
+ // 鎬诲簱浣嶆暟
+ Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
+ // 浣跨敤涓�
+ Integer used = locUseRate.getFqty() + locUseRate.getUqty();
if(locUseRate!=null) {
Map<String, Object> map = new HashMap<>();
map.put("name", "鍦ㄥ簱");
@@ -236,7 +215,7 @@
Map<String, Object> map1 = new HashMap<>();
map1.put("name", "绌�");
- map1.put("value", locUseRate.getOqty());
+ map1.put("value", 11200-used);
pie.add(map1);
Map<String, Object> map2 = new HashMap<>();
@@ -250,25 +229,72 @@
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 usedDivides = Arith.divides(3, used, 11200);
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)
+ .add("stockCunt", locUseRate.getFqty())
+ .add("emptyCount", 11200-used)
+ .add("noneCount", locUseRate.getXqty())
+ .add("total", 11200)
+ .add("used", used)
+ .add("usedPr", usedPr)
);
}
+
+ /**
+ * 搴撲綅浣跨敤鎯呭喌缁熻
+ */
+// @GetMapping("/loc/rep")
+// public R monitorLocRep(){
+// List<Map<String, Object>> pie = new ArrayList<>();
+//
+// LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
+// if(locUseRate!=null) {
+// Map<String, Object> map = new HashMap<>();
+// map.put("name", "鍦ㄥ簱");
+// map.put("value", locUseRate.getFqty());
+// pie.add(map);
+//
+// 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)
+// );
+// }
+
/**
* 鑾峰彇鍏朵粬淇℃伅
*/
--
Gitblit v1.9.1