From 4c167750ac805b35d0c025961b060b23f0268969 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 19 一月 2026 15:35:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 54da5d7..dc6bda6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -339,9 +339,9 @@
staProtocol.setStaNo(RouteUtils.SouStaEnd(dto.getStaNo(),dto.getSourceStaNo()));
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.error("杈撻�佺嚎涓嬪彂2锛�"+dto.getWorkNo()+","+dto.getStaNo());
+ log.info("杈撻�佺嚎涓嬪彂2锛�"+dto.getWorkNo()+","+dto.getStaNo());
ledThread.errorReset();
- log.error("缁勬墭璇锋眰鍚嶭ED閿欒娓呴櫎");
+ log.info("缁勬墭璇锋眰鍚嶭ED閿欒娓呴櫎");
if (!result) {
News.error(methodName + ":鏇存柊plc绔欑偣淇℃伅澶辫触");
@@ -903,7 +903,7 @@
wrkMast9997.setCrnEndTime(new Date());
if (wrkMastMapper.updateById(wrkMast9997) != 0) {
// 澶嶄綅鍫嗗灈鏈�
- log.error("鍑哄簱浠诲姟瀹屾垚涓嬪彂鍫嗗灈鏈哄浣�,{}", wrkMast9997.getWrkNo());
+ log.info("鍑哄簱浠诲姟瀹屾垚涓嬪彂鍫嗗灈鏈哄浣�,{}", wrkMast9997.getWrkNo());
crnThread.setResetFlag(true);
} else {
News.error(""+mark+" - 1"+" - 鏇存柊宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负14澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast9997.getWrkNo());
@@ -949,7 +949,7 @@
wrkMast9996.setCrnEndTime(new Date());
if (wrkMastMapper.updateById(wrkMast9996) != 0) {
// 澶嶄綅鍫嗗灈鏈�
- log.error("鍑哄簱浠诲姟瀹屾垚涓嬪彂鍫嗗灈鏈哄浣�,{}", wrkMast9996.getWrkNo());
+ log.info("鍑哄簱浠诲姟瀹屾垚涓嬪彂鍫嗗灈鏈哄浣�,{}", wrkMast9996.getWrkNo());
crnThread.setResetFlag(true);
} else {
News.error(""+mark+" - 1"+" - 鏇存柊宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负14澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast9996.getWrkNo());
@@ -1003,7 +1003,7 @@
wrkMast.setCrnEndTime(new Date());
if (wrkMastMapper.updateById(wrkMast) != 0) {
// 澶嶄綅鍫嗗灈鏈�
- log.error("鍑哄簱浠诲姟瀹屾垚涓嬪彂鍫嗗灈鏈哄浣�,{}", wrkMast.getWrkNo());
+ log.info("鍑哄簱浠诲姟瀹屾垚涓嬪彂鍫嗗灈鏈哄浣�,{}", wrkMast.getWrkNo());
crnThread.setResetFlag(true);
} else {
News.error(""+mark+" - 1"+" - 鏇存柊宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负14澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast.getWrkNo());
@@ -3583,7 +3583,7 @@
}
wrkMastSta.setWrkSts(2);
wrkMastStaMapper.updateById(wrkMastSta);
- log.error("鏇存柊灏忚溅浠诲姟鎴愬姛");
+ log.info("鏇存柊灏忚溅浠诲姟鎴愬姛");
}catch (Exception e){
log.error("鏇存柊灏忚溅浠诲姟澶辫触"+ e);
}
@@ -3652,7 +3652,7 @@
}
wrkMastSta.setWrkSts(2);
wrkMastStaMapper.updateById(wrkMastSta);
- log.error("鏇存柊灏忚溅浠诲姟鎴愬姛");
+ log.info("鏇存柊灏忚溅浠诲姟鎴愬姛");
}catch (Exception e){
log.error("鏇存柊灏忚溅浠诲姟澶辫触");
}
@@ -3982,10 +3982,11 @@
try{
wrkMastSta.setWrkSts(1);
wrkMastStaMapper.updateById(wrkMastSta);
- log.error("鏇存柊灏忚溅浠诲姟鎴愬姛{}",wrkMastSta);
+ log.info("鏇存柊灏忚溅浠诲姟鎴愬姛{}",wrkMastSta);
}catch (Exception e){
log.error("鏇存柊灏忚溅浠诲姟澶辫触");
}
+ break; // 鏂板锛氫笅鍙戞垚鍔熷悗閫�鍑哄惊鐜紝闃叉杩炵画涓嬪彂澶氫釜
} else {
log.error("宸ヤ綔鍙穥}鎵�灞炰换鍔′笅鍙戝け璐�",wrkMastSta.getWrkNo());
}
@@ -4131,10 +4132,11 @@
try{
wrkMastSta.setWrkSts(1);
wrkMastStaMapper.updateById(wrkMastSta);
- log.error("鏇存柊灏忚溅浠诲姟鎴愬姛{}",wrkMastSta);
+ log.info("鏇存柊灏忚溅浠诲姟鎴愬姛{}",wrkMastSta);
}catch (Exception e){
log.error("鏇存柊灏忚溅浠诲姟澶辫触");
}
+ break; // 鏂板锛氫笅鍙戞垚鍔熷悗閫�鍑哄惊鐜紝闃叉杩炵画涓嬪彂澶氫釜
} else {
log.error("宸ヤ綔鍙穥}鎵�灞炰换鍔′笅鍙戝け璐�",wrkMastSta.getWrkNo());
}
@@ -4280,10 +4282,11 @@
try{
wrkMastSta.setWrkSts(1);
wrkMastStaMapper.updateById(wrkMastSta);
- log.error("鏇存柊灏忚溅浠诲姟鎴愬姛{}",wrkMastSta);
+ log.info("鏇存柊灏忚溅浠诲姟鎴愬姛{}",wrkMastSta);
}catch (Exception e){
log.error("鏇存柊灏忚溅浠诲姟澶辫触");
}
+ break; // 鏂板锛氫笅鍙戞垚鍔熷悗閫�鍑哄惊鐜紝闃叉杩炵画涓嬪彂澶氫釜
} else {
log.error("宸ヤ綔鍙穥}鎵�灞炰换鍔′笅鍙戝け璐�",wrkMastSta.getWrkNo());
}
@@ -4415,7 +4418,7 @@
try{
wrkMastSta.setWrkSts(1);
wrkMastStaMapper.updateById(wrkMastSta);
- log.error("鏇存柊灏忚溅浠诲姟鎴愬姛");
+ log.info("鏇存柊灏忚溅浠诲姟鎴愬姛");
}catch (Exception e){
log.error("鏇存柊灏忚溅浠诲姟澶辫触");
}
@@ -4680,10 +4683,11 @@
try{
wrkMastSta.setWrkSts(1);
wrkMastStaMapper.updateById(wrkMastSta);
- log.error("鏇存柊灏忚溅浠诲姟鎴愬姛{}",wrkMastSta);
+ log.info("鏇存柊灏忚溅浠诲姟鎴愬姛{}",wrkMastSta);
}catch (Exception e){
log.error("鏇存柊灏忚溅浠诲姟澶辫触");
}
+ break; // 鏂板锛氫笅鍙戞垚鍔熷悗閫�鍑哄惊鐜紝闃叉杩炵画涓嬪彂澶氫釜
} else {
log.error("宸ヤ綔鍙穥}鎵�灞炰换鍔′笅鍙戝け璐�",wrkMastSta.getWrkNo());
}
--
Gitblit v1.9.1