From 8027c8e2e0b5c559da612b187031dd6fd82d9bc7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 04 四月 2026 12:03:48 +0800
Subject: [PATCH] #任务分析异常修复
---
src/main/java/com/zy/asrs/task/WrkMastScheduler.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
index 81946e9..c7258ce 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
@@ -5,6 +5,7 @@
import com.zy.asrs.domain.enums.NotifyMsgType;
import com.zy.asrs.entity.BasStation;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.WrkMastLog;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.NotifyUtils;
@@ -88,10 +89,11 @@
}
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ WrkMastLog wrkMastLog = wrkMastLogService.saveRecord(wrkMast.getWrkNo());
+ if (wrkMastLog == null) {
log.info("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={}]澶辫触", wrkMast.getWrkNo());
} else {
- wrkAnalysisService.finishTask(wrkMast, resolveFinishTime(wrkMast));
+ wrkAnalysisService.finishTask(wrkMast, resolveFinishTime(wrkMast), wrkMastLog.getId());
}
// 鍒犻櫎宸ヤ綔涓绘。
if (!wrkMastService.removeById(wrkMast.getWrkNo())) {
@@ -149,10 +151,11 @@
}
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ WrkMastLog wrkMastLog = wrkMastLogService.saveRecord(wrkMast.getWrkNo());
+ if (wrkMastLog == null) {
log.info("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={}]澶辫触", wrkMast.getWrkNo());
} else {
- wrkAnalysisService.finishTask(wrkMast, resolveFinishTime(wrkMast));
+ wrkAnalysisService.finishTask(wrkMast, resolveFinishTime(wrkMast), wrkMastLog.getId());
}
// 鍒犻櫎宸ヤ綔涓绘。
if (!wrkMastService.removeById(wrkMast.getWrkNo())) {
@@ -227,10 +230,11 @@
}
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ WrkMastLog wrkMastLog = wrkMastLogService.saveRecord(wrkMast.getWrkNo());
+ if (wrkMastLog == null) {
log.info("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={}]澶辫触", wrkMast.getWrkNo());
} else {
- wrkAnalysisService.finishTask(wrkMast, resolveFinishTime(wrkMast));
+ wrkAnalysisService.finishTask(wrkMast, resolveFinishTime(wrkMast), wrkMastLog.getId());
}
// 鍒犻櫎宸ヤ綔涓绘。
if (!wrkMastService.removeById(wrkMast.getWrkNo())) {
@@ -251,10 +255,11 @@
}
for (WrkMast wrkMast : wrkMasts) {
- if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ WrkMastLog wrkMastLog = wrkMastLogService.saveRecord(wrkMast.getWrkNo());
+ if (wrkMastLog == null) {
log.info("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={}]澶辫触", wrkMast.getWrkNo());
} else {
- wrkAnalysisService.finishTask(wrkMast, resolveFinishTime(wrkMast));
+ wrkAnalysisService.finishTask(wrkMast, resolveFinishTime(wrkMast), wrkMastLog.getId());
}
if (!wrkMastService.removeById(wrkMast.getWrkNo())) {
@@ -273,10 +278,11 @@
for (WrkMast wrkMast : wrkMasts) {
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ WrkMastLog wrkMastLog = wrkMastLogService.saveRecord(wrkMast.getWrkNo());
+ if (wrkMastLog == null) {
log.info("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={}]澶辫触", wrkMast.getWrkNo());
} else {
- wrkAnalysisService.finishTask(wrkMast, resolveFinishTime(wrkMast));
+ wrkAnalysisService.finishTask(wrkMast, resolveFinishTime(wrkMast), wrkMastLog.getId());
}
// 鍒犻櫎宸ヤ綔涓绘。
if (!wrkMastService.removeById(wrkMast.getWrkNo())) {
--
Gitblit v1.9.1