From 8c48ae1e3efea1c024c605bf22de7b1cf62599a5 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 23 十一月 2024 15:04:53 +0800
Subject: [PATCH] 优化AGV任务更新逻辑及环境配置
---
src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 5 +++--
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 8 ++++++--
src/main/resources/application.yml | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index 13d1074..77de969 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -126,8 +126,9 @@
瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负201.鐢熸垚鍏ュ簱浠诲姟ID 涓�(鍑哄簱绫诲瀷涓� 53.鎷ｆ枡鍐嶅叆搴� || 1.鍏ュ簱 || 10.绌烘澘鍏ュ簱鏍� || 57.鐩樼偣鍐嶅叆搴�)鐨勬暟鎹�
*/
//@Scheduled(cron = "0/1 * * * * ? ")
- @Scheduled(fixedDelay = 1000)
- public void startPutwayWrk(){
+ @Scheduled(fixedDelay = 3000)
+ public synchronized void startPutwayWrk(){
+ log.info(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
,new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 201)
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 9733c90..4dfd8fe 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -533,7 +533,11 @@
agvWrkMast.setWrkSts(202L);
agvWrkMast.setModiTime(new Date());
- agvWrkMastService.updateById(agvWrkMast);
+ boolean b = agvWrkMastService.updateById(agvWrkMast);
+ if (!b) {
+ log.info("鏇存柊浠诲姟鐘舵�佸け璐�,{}", agvWrkMast.getWrkNo());
+ throw new CoolException("鏇存柊浠诲姟鐘舵�佸け璐�");
+ }
if (agvWrkMast.getIoType() == 1) {
//淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y
agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(), "Y");
@@ -541,7 +545,7 @@
return SUCCESS;
} catch (Exception e) {
//TODO
- log.error("淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y" + e.getMessage());
+ log.error("淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y,{}", e.getMessage());
}
return FAIL;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 22524fb..f2026f2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
spring:
profiles:
#dev loc prod
- active: loc
\ No newline at end of file
+ active: prod
\ No newline at end of file
--
Gitblit v1.9.1