From d84fbe29517068538a599467518dbcd326c89290 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 16 四月 2026 17:46:49 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java
index 47b55e5..95a1c4b 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/WmsController.java
@@ -39,7 +39,6 @@
@ResponseBody
@PostMapping("/station/getTaskNo")
public R query(@RequestBody StaParam param) {
- log.info("鏍规嵁绔欑偣鏌ヨstaNo锛歿}", param);
String staNo = param.getStaNo();
Map<Integer, StaProtocol> station = stationService.getStationMap(param.getDevpId());
StaProtocol staProtocol = station.get(Integer.parseInt(staNo));
@@ -60,19 +59,20 @@
@ResponseBody
@PostMapping("/station/getError")
public R getError(@RequestBody StaParam param) {
- log.info("鏍规嵁绔欑偣鏌ヨstaNo锛歿}", param);
- String staNo = param.getStaNo();
- Map<Integer, StaProtocol> station = stationService.getStationMap(param.getDevpId());
- StaProtocol staProtocol = station.get(Integer.parseInt(staNo));
- return R.ok(staPlcErr(staProtocol));
+ Map<Integer, StaProtocol> stationMap = stationService.getStationMap(param.getDevpId());
+ List<PlcErrorTableVo> data = new ArrayList<>();
+ for (Integer key : stationMap.keySet()) {
+ StaProtocol staProtocol = stationMap.get(key);
+ data = staPlcErr(data, staProtocol);
+ }
+ return R.ok(data);
}
- private List<PlcErrorTableVo> staPlcErr(StaProtocol staProtocol) {
+ private List<PlcErrorTableVo> staPlcErr(List<PlcErrorTableVo> list, StaProtocol staProtocol) {
if (staProtocol == null) {
return null;
}
- List<PlcErrorTableVo> list = new ArrayList<>();
if (staProtocol.getBreakerErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setStaNo(staProtocol.getSiteId());
--
Gitblit v1.9.1