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 | 72 +++++++++++++-----------------------
1 files changed, 26 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index a5b5631..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);
+ }
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -202,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", "鍦ㄥ簱");
@@ -211,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<>();
@@ -225,10 +248,7 @@
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, 11200);
double usedPr = Arith.multiplys(1, usedDivides, 100);
@@ -238,7 +258,7 @@
.add("stockCunt", locUseRate.getFqty())
.add("emptyCount", 11200-used)
.add("noneCount", locUseRate.getXqty())
- .add("total", total)
+ .add("total", 11200)
.add("used", used)
.add("usedPr", usedPr)
);
@@ -279,46 +299,6 @@
}
return R.ok().add(errorMsg);
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/**
--
Gitblit v1.9.1