From 1313906bb1eb983d3beece810035e7fc28d6a92f Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 20 五月 2025 16:57:11 +0800
Subject: [PATCH] 新增充电桩
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java | 76 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 5 deletions(-)
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 65656a3..630daac 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
@@ -2,15 +2,20 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.framework.common.Cools;
+import com.zy.acs.manager.common.exception.BusinessException;
import com.zy.acs.manager.manager.controller.result.MissionVo;
import com.zy.acs.manager.manager.entity.*;
+import com.zy.acs.manager.manager.enums.ActionStsType;
+import com.zy.acs.manager.manager.enums.BusStsType;
import com.zy.acs.manager.manager.enums.SegmentStateType;
+import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.service.*;
+import org.apache.ibatis.session.SqlSession;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -29,6 +34,10 @@
private AgvDetailService agvDetailService;
@Autowired
private TaskService taskService;
+ @Autowired
+ private BusService busService;
+ @Autowired
+ private SqlSession sqlSession;
@Override
public List<MissionVo> getList(Long agvId, String groupNo) {
@@ -61,12 +70,12 @@
Long recentCode = agvDetail.getRecentCode();
String currCode = null;
if (null != recentCode) {
- currCode = codeService.getById(recentCode).getData();
+ currCode = codeService.getCacheById(recentCode).getData();
}
// action -------------------------------
List<Action> actionList = actionService.list(new LambdaQueryWrapper<Action>()
- .eq(Action::getGroupId, groupNo).orderByDesc(Action::getPriority));
+ .eq(Action::getGroupId, groupNo).ne(Action::getActionSts, ActionStsType.EXPIRED.val()).orderByDesc(Action::getPriority));
if (Cools.isEmpty(actionList)) {
return null;
}
@@ -95,7 +104,7 @@
return null;
}
List<Action> actionList = actionService.list(new LambdaQueryWrapper<Action>()
- .eq(Action::getGroupId, groupNo).orderByDesc(Action::getPriority));
+ .eq(Action::getGroupId, groupNo).ne(Action::getActionSts, ActionStsType.EXPIRED.val()).orderByDesc(Action::getPriority));
if (Cools.isEmpty(actionList)) {
return null;
}
@@ -112,6 +121,63 @@
return vo;
}
+ @Override
+ @Transactional
+ public Boolean resend(List<Action> actionList) {
+ if (Cools.isEmpty(actionList)) {
+ return Boolean.FALSE;
+ }
+ List<Long> actionIds = actionList.stream().map(Action::getId).collect(Collectors.toList());
+
+ String actionGroupId = actionService.getById(actionIds.get(0)).getGroupId();
+ actionService.updateStsByGroupId(actionGroupId, ActionStsType.EXPIRED.val());
+
+ List<Action> newActionList = new ArrayList<>();
+ Date now = new Date();
+ for (Long actionId : actionIds) {
+ sqlSession.clearCache();
+ Action action = actionService.getById(actionId);
+ action.setActionSts(ActionStsType.PREPARE.val());
+ action.setIoTime(now);
+ action.setUpdateTime(now);
+ newActionList.add(action);
+ }
+ int i = newActionList.size();
+ for (Action action : newActionList) {
+ action.setPriority(i);
+ if (!actionService.save(action)) {
+ throw new BusinessException(action.getName() + " Action Update Fail!");
+ }
+ i -= 1;
+ }
+
+ Set<Long> busIds = new HashSet<>();
+ List<Long> taskIds = actionService.selectTaskIdsByGroupId(actionGroupId);
+ for (Long taskId : taskIds) {
+ Task task = taskService.getById(taskId);
+ if (null != task) {
+ task.setTaskSts(TaskStsType.ASSIGN.val());
+ task.setUpdateTime(now);
+ task.setIoTime(now);
+ if (!taskService.updateById(task)) {
+ throw new BusinessException(task.getUuid() + " Task Update Fail!");
+ }
+ busIds.add(task.getBusId());
+ }
+ }
+ for (Long busId : busIds) {
+ Bus bus = busService.getById(busId);
+ if (null != bus) {
+ bus.setBusSts(BusStsType.PROGRESS.val());
+ bus.setUpdateTime(now);
+ if (!busService.updateById(bus)) {
+ throw new BusinessException(bus.getUuid() + " Bus Update Fail!");
+ }
+ }
+ }
+ return Boolean.TRUE;
+ }
+
public Double calcProgress(String currCode, List<Action> actionList) {
double progress = 0D;
if (Cools.isEmpty(actionList, currCode)) {
--
Gitblit v1.9.1