From 3b73ea7b24c1281f4ad789a80359d77f8121da33 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 10 一月 2024 16:55:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 67987d5..d4f93e1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -424,6 +424,21 @@
if (taskWrkMapper.selectCrnWorking(slave.getId()) != null) {
continue;
}
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�
+ log.error("杩涘叆淇敼宸ヤ綔妗ｆ祦绋�");
+ Date now = new Date();
+ taskWrk.setWrkSts(3);
+ taskWrk.setModiTime(now);
+ if (taskWrkMapper.updateById(taskWrk) == 0) {
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+ }
+ TaskWrk taskWrk2 = taskWrkService.selectByWrkNo(staProtocol.getWorkNo().intValue());
+
+ if (taskWrk2.getWrkSts() != 3){
+ continue;
+ }
+ log.error("杩涘叆淇敼宸ヤ綔妗ｆ祦绋嬪畬鎴�,taskWrk=", JSON.toJSONString(taskWrk));
+
//鍙栧嚭鍛戒护
List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
@@ -438,13 +453,6 @@
if (!MessageQueue.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
} else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�
- Date now = new Date();
- taskWrk.setWrkSts(3);
- taskWrk.setModiTime(now);
- if (taskWrkMapper.updateById(taskWrk) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
- }
//寮�濮嬭繍琛�
String response = CrnStartRunning(taskWrk);
JSONObject jsonObject = JSON.parseObject(response);
@@ -967,7 +975,7 @@
try {
taskWrkService.distribute(taskWrk.getTaskNo(), 9527L);
} catch (CoolException e) {
- log.info(e.getMessage());
+// log.info(e.getMessage());
}
}
}
--
Gitblit v1.9.1