From 964a867a0e8a0814ecd7152a8ef1266f664a014b Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 11 十二月 2025 15:36:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 193 +++++++++--------------------------------------
1 files changed, 39 insertions(+), 154 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 75493b6..0985cc2 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -22,6 +22,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -38,6 +39,23 @@
private ReportQueryMapper reportQueryMapper;
@Autowired
private SlaveProperties slaveProperties;
+
+ @GetMapping("/getIpConfig")
+ public R getIpConfig(HttpServletRequest request) {
+ HashMap<String, String> map = new HashMap<>();
+ for (LedSlave slave : slaveProperties.getLed()) {
+ if (slave.getIp().equals(request.getRemoteAddr())) {
+
+ map.put("ledIp","127.0.0.1");
+ map.put("ledPort","8088");
+ map.put("ledUrl","wcs");
+ map.put("ledId",slave.getAgvStaArr().get(0));
+
+ break;
+ }
+ }
+ return R.ok(map);
+ }
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -62,42 +80,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 +132,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(
@@ -227,7 +220,12 @@
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 +234,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,20 +248,17 @@
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("emptyCount", 11200-used)
.add("noneCount", locUseRate.getXqty())
- .add("total", total)
+ .add("total", 11200)
.add("used", used)
.add("usedPr", usedPr)
);
@@ -274,41 +269,6 @@
*/
@GetMapping("/led")
public R monitorLed(@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;
- }
String ledContent = "";
List<LedCommand> commandList = null;
for (LedSlave slave : slaveProperties.getLed()) {
@@ -328,41 +288,6 @@
*/
@GetMapping("/led/error")
public R monitorLedError(@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;
- }
String errorMsg = "";
for (LedSlave slave : slaveProperties.getLed()) {
if (slave.getStaArr().contains(ledId)) {
@@ -374,46 +299,6 @@
}
return R.ok().add(errorMsg);
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/**
--
Gitblit v1.9.1