From 0cb52bb33420044fe2887e1dd9f1b857c96027d4 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期四, 03 七月 2025 09:02:05 +0800
Subject: [PATCH] 日志打印优化
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 8bcef14..d7d80bb 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -377,7 +377,12 @@
runRgv:
for (WrkMast wrkMast : wrkMasts) {
- BasDevpPosition basDevpPositions = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("dev_no", wrkMast.getRgvSstaNo())); // 绔欑偣
+ Integer rgvSstaNo = wrkMast.getRgvSstaNo();
+ // 1090锛�1089,1086,1083 鎸�1083绔欑偣浣嶇疆璁＄畻锛岃兘鍙�1083锛屽氨鑳藉彇1090锛�1089锛�1086锛岄伩鍏嶄换鍔″欢杩熶笅鍙戞柟妗堜竴鐩寸粰1083鍙�
+ if (rgvSstaNo == 1090 || rgvSstaNo == 1089 || rgvSstaNo == 1086) {
+ rgvSstaNo = 1083;
+ }
+ BasDevpPosition basDevpPositions = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("dev_no", rgvSstaNo)); // 绔欑偣
long position = basDevpPositions.getPlcPosition(); // 璧峰绔欎綅缃�
TreeMap<Long, RgvProtocol> map = new TreeMap<>();
for (RgvProtocol rgvProtocol : rgvProtocolList) {
@@ -389,13 +394,13 @@
}
map.put(distance, rgvProtocol);
}
- log.info("鍙栬揣绔欑偣锛歿}锛屽悗闈㈠皬杞︽帓搴�", basDevpPositions.getDevNo());
- StringBuilder sb = new StringBuilder();
- for (Map.Entry<Long, RgvProtocol> rgvProtocolMap : map.entrySet()) {
- RgvProtocol rgvProtocol = rgvProtocolMap.getValue();
- sb.append("[").append(rgvProtocol.getRgvNo()).append(",").append(rgvProtocol.getStatusType().desc).append("]");
- }
- log.info(sb.toString());
+// log.info("鍙栬揣绔欑偣锛歿}锛屽悗闈㈠皬杞︽帓搴�", basDevpPositions.getDevNo());
+// StringBuilder sb = new StringBuilder();
+// for (Map.Entry<Long, RgvProtocol> rgvProtocolMap : map.entrySet()) {
+// RgvProtocol rgvProtocol = rgvProtocolMap.getValue();
+// sb.append("[").append(rgvProtocol.getRgvNo()).append(",").append(rgvProtocol.getStatusType().desc).append("]");
+// }
+// log.info(sb.toString());
for (Map.Entry<Long, RgvProtocol> rgvProtocolMap : map.entrySet()) {
RgvProtocol rgvProtocol = rgvProtocolMap.getValue(); // 鏈�杩戣窛绂诲皬杞�
@@ -493,7 +498,7 @@
log.error("鏈煡鍒板皬杞︽墽琛屼换鍔★紒" + rgvProtocol.getTaskNo1());
continue;
} else if(wrkMast.getWrkSts() != 10) {
- log.error("鎵ц浠诲姟鐘舵�佷笉绗﹀悎锛�" + rgvProtocol.getTaskNo1());
+ log.warn("鎵ц浠诲姟鐘舵�佷笉绗﹀悎锛�" + rgvProtocol.getTaskNo1());
continue;
}
boolean rgvComplete = rgvComplete(rgvProtocol.getRgvNo());
@@ -533,7 +538,7 @@
log.error("鏈煡鍒板皬杞︽墽琛屼换鍔★紒" + rgvProtocol.getTaskNo1());
continue;
} else if(wrkMast.getWrkSts() != 10) {
- log.error("鎵ц浠诲姟鐘舵�佷笉绗﹀悎锛�" + rgvProtocol.getTaskNo1());
+ log.warn("鎵ц浠诲姟鐘舵�佷笉绗﹀悎锛�" + rgvProtocol.getTaskNo1());
continue;
}
boolean rgvComplete = rgvComplete(rgvProtocol.getRgvNo());
@@ -562,7 +567,7 @@
log.error("灏忚溅澶嶄綅RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}", rgvNo);
return false;
} else {
- log.info("RGV鍛戒护涓嬪彂鎴愬姛锛孯GV鍙�={}", rgvNo);
+ log.info("灏忚溅澶嶄綅RGV鍛戒护涓嬪彂鎴愬姛锛孯GV鍙�={}", rgvNo);
return true;
}
} catch (Exception e) {
--
Gitblit v1.9.1