From 3dc19bd9fedac3227c377fbc6acda24ea138213b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 31 五月 2024 08:55:59 +0800
Subject: [PATCH] #异常捕捉
---
src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 24 +++++++++---
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 61 +++++++++++++++++++++++++-----
2 files changed, 68 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index dd2ab3b..b5da484 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -61,7 +61,11 @@
.or().eq("io_type",113));
if(!Cools.isEmpty(agvWrkMastList)){
agvWrkMastList.stream().forEach(agvWrkMast -> {
- agvWrkMastHandler.completedPutWayWrk(agvWrkMast);
+ try{
+ agvWrkMastHandler.completedPutWayWrk(agvWrkMast);
+ } catch (Exception e){
+ log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负205,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ }
});
}
}
@@ -77,7 +81,11 @@
.or().eq("io_type",101));
if(!Cools.isEmpty(agvWrkMastList)){
agvWrkMastList.stream().forEach(agvWrkMast -> {
- ReturnT<String> returnT = agvWrkMastHandler.completedCarryWrk(agvWrkMast);
+ try{
+ agvWrkMastHandler.completedCarryWrk(agvWrkMast);
+ } catch (Exception e){
+ log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负206,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ }
});
}
}
@@ -94,7 +102,11 @@
.or().eq("io_type",101));
if(!Cools.isEmpty(agvWrkMastList)){
agvWrkMastList.stream().forEach(agvWrkMast -> {
- ReturnT<String> returnT = agvWrkMastHandler.completedCarryWrk2(agvWrkMast);
+ try{
+ agvWrkMastHandler.completedCarryWrk2(agvWrkMast);
+ } catch (Exception e){
+ log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负206,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ }
});
}
}
@@ -123,10 +135,10 @@
if(!Cools.isEmpty(agvWrkMastList)){
agvWrkMastList.forEach(agvWrkMast -> {
- try {
+ try{
agvWrkMastHandler.startPutWayWrk(agvWrkMast);
- } catch (IOException e) {
- log.error(e.getMessage());
+ } catch (Exception e){
+ log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负206,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
}
});
}
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index f17466b..b8dfe0b 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -10,6 +10,7 @@
import com.zy.asrs.service.AgvWrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.AutoMoveHandler;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -18,6 +19,7 @@
import java.util.List;
// 鑷姩绉诲簱
+@Slf4j
@Component
public class AutoMoveScheduler {
@@ -59,19 +61,24 @@
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 22)
.andNew().eq("io_type",108)
- .eq("crn_no",2)
+ .andNew()
+ .eq("crn_no",2).or().eq("crn_no",3)
.orderBy("appe_time",true)
);
if (agvWrkMastList.isEmpty()) {
return;
}
for (AgvWrkMast agvWrkMast : agvWrkMastList) {
- ReturnT<String> returnT = autoMoveHandler.start2(agvWrkMast);
+ try{
+ autoMoveHandler.start2(agvWrkMast);
+ } catch (Exception e){
+ log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ }
}
}
- @Scheduled(cron = "0/2 * * * * ? ")
+// @Scheduled(cron = "0/2 * * * * ? ")
private void execute5(){
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 22)
@@ -83,7 +90,11 @@
return;
}
for (AgvWrkMast agvWrkMast : agvWrkMastList) {
- ReturnT<String> returnT = autoMoveHandler.start2(agvWrkMast);
+ try{
+ autoMoveHandler.start2(agvWrkMast);
+ } catch (Exception e){
+ log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ }
}
}
@@ -99,7 +110,11 @@
return;
}
for (AgvWrkMast agvWrkMast : agvWrkMastList) {
- ReturnT<String> returnT = autoMoveHandler.start3(agvWrkMast);
+ try{
+ autoMoveHandler.start3(agvWrkMast);
+ } catch (Exception e){
+ log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ }
}
}
@@ -117,7 +132,11 @@
return;
}
for (AgvLocMast agvLocMast : agvLocMasts) {
- ReturnT<String> returnT = autoMoveHandler.autoEmptyBack(agvLocMast);
+ try{
+ autoMoveHandler.autoEmptyBack(agvLocMast);
+ } catch (Exception e){
+ log.error("搴撲綅鍙�"+agvLocMast.getLocNo()+"绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐�,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ }
}
}
// 绌烘澘鑷姩鍥炲簱 鎺ラ┏鐐� - 1妤煎簱浣�
@@ -132,7 +151,11 @@
return;
}
for (AgvWrkMast agvWrkMast : agvWrkMastList) {
- ReturnT<String> returnT = autoMoveHandler.autoEmptyBack3(agvWrkMast);
+ try{
+ autoMoveHandler.autoEmptyBack3(agvWrkMast);
+ } catch (Exception e){
+ log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"绌烘澘鑷姩鍥炲簱 鎺ラ┏鐐� - 1妤煎簱浣�,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ }
}
}
@@ -149,7 +172,11 @@
return;
}
for (AgvLocMast agvLocMast : agvLocMasts) {
- ReturnT<String> returnT = autoMoveHandler.autoEmptyBack2(agvLocMast);
+ try{
+ autoMoveHandler.autoEmptyBack2(agvLocMast);
+ } catch (Exception e){
+ log.error("搴撲綅鍙�"+agvLocMast.getLocNo()+"绌烘澘鑷姩鍥炲簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ }
}
}
@@ -171,7 +198,11 @@
return;
}
for (AgvLocMast agvLocMast : agvLocMasts) {
- ReturnT<String> returnT = autoMoveHandler.autoEmptyBack4(agvLocMast);
+ try{
+ autoMoveHandler.autoEmptyBack4(agvLocMast);
+ } catch (Exception e){
+ log.error("搴撲綅鍙�"+agvLocMast.getLocNo()+"绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ }
}
}
@@ -191,7 +222,11 @@
return;
}
for (AgvBasDevp agvBasDevp : agvBasDevps) {
- ReturnT<String> returnT = autoMoveHandler.autoEmptyBack5(agvBasDevp);
+ try{
+ autoMoveHandler.autoEmptyBack5(agvBasDevp);
+ } catch (Exception e){
+ log.error("绔欑偣鍙�"+agvBasDevp.getDevNo()+"绔欑偣鏄惁鑷姩 浼樺厛閫夋嫨鍏堝埌鎺ラ┏浣嶏紙鎺ラ┏浣嶅彲鍏ワ級 鍚庨�夋嫨鐩存帴鍥炲簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ }
}
}
@@ -209,7 +244,11 @@
return;
}
for (AgvBasDevp agvBasDevp : agvBasDevps) {
- ReturnT<String> returnT = autoMoveHandler.autoEmptyBack6(agvBasDevp);
+ try{
+ autoMoveHandler.autoEmptyBack6(agvBasDevp);
+ } catch (Exception e){
+ log.error("绔欑偣鍙�"+agvBasDevp.getDevNo()+"妫�娴�1妤兼帴椹崇偣 鐢熸垚 113 鎵嬪姩鍥炴祦,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ }
}
}
}
--
Gitblit v1.9.1