From 5efde10d84194cb7e5ace0336f5d694898e4652b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 07 十月 2024 14:06:26 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java | 10 +++++++---
version/logical-line.xmind | 0
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/version/logical-line.xmind b/version/logical-line.xmind
new file mode 100644
index 0000000..e948f5d
--- /dev/null
+++ b/version/logical-line.xmind
Binary files differ
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
index 24adf5a..6634b81 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
@@ -12,6 +12,7 @@
import com.zy.acs.manager.manager.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.stream.Collectors;
@@ -32,6 +33,8 @@
private AgvDetailService agvDetailService;
@Autowired
private TaskService taskService;
+ @Autowired
+ private BusService busService;
@Override
public List<MissionVo> getList(Long agvId, String groupNo) {
@@ -116,6 +119,7 @@
}
@Override
+ @Transactional
public Boolean resend(List<Action> actionList) {
if (Cools.isEmpty(actionList)) {
return Boolean.FALSE;
@@ -135,7 +139,7 @@
for (Action action : newActionList) {
action.setPriority(i);
if (!actionService.save(action)) {
- throw new BusinessException(action.getName() + "鍔ㄤ綔鏇存柊澶辫触");
+ throw new BusinessException(action.getName() + " Action Update Fail!");
}
i -= 1;
}
@@ -149,7 +153,7 @@
task.setUpdateTime(now);
task.setIoTime(now);
if (!taskService.updateById(task)) {
- throw new BusinessException(task.getUuid() + "浠诲姟鏇存柊澶辫触");
+ throw new BusinessException(task.getUuid() + " Task Update Fail!");
}
busIds.add(task.getBusId());
}
@@ -160,7 +164,7 @@
bus.setBusSts(BusStsType.PROGRESS.val());
bus.setUpdateTime(now);
if (!busService.updateById(bus)) {
- throw new BusinessException(bus.getUuid() + "鎬荤嚎鏇存柊澶辫触");
+ throw new BusinessException(bus.getUuid() + " Bus Update Fail!");
}
}
}
--
Gitblit v1.9.1