From d3d3857cda8b4307d8f03bf15ec9fb2c98c34b64 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 17 十二月 2024 09:58:39 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java | 107 ++++++++++++++++++-----------------------------------
1 files changed, 37 insertions(+), 70 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
index c8ea055..59dae6c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.common.enums.AgvStatusType;
+import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.DateUtils;
+import com.zy.acs.manager.core.service.MainLockWrapService;
import com.zy.acs.manager.core.service.MainService;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
@@ -15,7 +17,7 @@
import java.util.Date;
import java.util.List;
-import java.util.Objects;
+import java.util.Optional;
/**
* judge whether agv go to funcSta which be charging or standby
@@ -25,6 +27,8 @@
@Component
public class MaintainScheduler {
+ private final RedisSupport redis = RedisSupport.defaultRedisSupport;
+
@Autowired
private AgvService agvService;
@Autowired
@@ -33,6 +37,8 @@
private FuncStaService funcStaService;
@Autowired
private MainService mainService;
+ @Autowired
+ private MainLockWrapService mainLockWrapService;
@Autowired
private TaskService taskService;
@Autowired
@@ -54,34 +60,35 @@
if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
continue;
}
- if (agvDetail.getVol() < agv.getChargeLine() || agvDetail.getVol() < agvModel.getLowBattery()) {
- if (taskService.count(new LambdaQueryWrapper<Task>()
+ if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
+ if (0 < taskService.count(new LambdaQueryWrapper<Task>()
.eq(Task::getAgvId, agv.getId())
.and(i -> {
i.eq(Task::getTaskSts, TaskStsType.WAITING.val())
.or().eq(Task::getTaskSts, TaskStsType.ASSIGN.val())
.or().eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
- })) > 0) {
+ })
+ )) {
continue;
}
- if (segmentService.count(new LambdaQueryWrapper<Segment>()
+ if (0 < segmentService.count(new LambdaQueryWrapper<Segment>()
.eq(Segment::getAgvId, agv.getId())
.and( i -> {
// i.eq(Segment::getState, SegmentStateType.WAITING.toString()).or()
i.eq(Segment::getState, SegmentStateType.RUNNING.toString());
})
- ) > 0) {
+ )) {
continue;
}
- mainService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_CHARGE, null);
+ mainLockWrapService.buildMinorTask(agv, TaskTypeType.TO_CHARGE, null, null);
}
}
}
-// @Scheduled(cron = "0/30 * * * * ? ")
- @Scheduled(cron = "0 */2 * * * ? ")
+ @Scheduled(cron = "0/1 * * * * ? ")
+// @Scheduled(cron = "0 */2 * * * ? ")
private synchronized void autoStandby(){
if (!configService.getVal("automaticStandbyPosition", Boolean.class)) { return; }
@@ -93,7 +100,7 @@
continue;
}
// low battery status, that need to go to charge
- if (agvDetail.getVol() < agv.getChargeLine() || agvDetail.getVol() < agvModel.getLowBattery()) {
+ if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
continue;
}
// is charging ?
@@ -110,26 +117,34 @@
continue;
}
// has running tasks ?
- if (taskService.count(new LambdaQueryWrapper<Task>()
+ if (0 < taskService.count(new LambdaQueryWrapper<Task>()
.eq(Task::getAgvId, agv.getId())
.and(i -> {
i.eq(Task::getTaskSts, TaskStsType.WAITING.val())
.or().eq(Task::getTaskSts, TaskStsType.ASSIGN.val())
.or().eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
- })) > 0) {
+ })
+ )) {
continue;
}
- // the time between the latest task and now that be must more that 20 minutes
- Integer intervalOfAutoStandby = configService.getVal("intervalOfAutoStandby", Integer.class);
- if (null != intervalOfAutoStandby && intervalOfAutoStandby > 0) {
- Task latestTask = taskService.findLatestTask(agv.getId(), TaskStsType.COMPLETE);
- if (null != latestTask && !latestTask.getTaskType().equals(TaskTypeType.TO_CHARGE.val())) {
- long minutes = DateUtils.diffToMinute(latestTask.getUpdateTime(), new Date());
- if (minutes < intervalOfAutoStandby) { continue; }
+ // the time between the latest task and now that be must more that @{param} seconds
+// if (!Optional.ofNullable((Boolean) redis.getObject(RedisConstant.AGV_TO_STANDBY_FLAG, agv.getUuid())).orElse(false)) {
+ Integer intervalOfAutoStandby = configService.getVal("intervalOfAutoStandby", Integer.class);
+ if (null != intervalOfAutoStandby && intervalOfAutoStandby > 0) {
+ Task latestTask = taskService.findLatestTask(agv.getId(), null);
+ if (null != latestTask) {
+ long seconds = DateUtils.diffToSeconds(
+ Optional.ofNullable(latestTask.getEndTime()).orElse(latestTask.getUpdateTime())
+ , new Date()
+ );
+ if (seconds < intervalOfAutoStandby) { continue; }
+ }
+ } else {
+ continue;
}
- }
+// }
- mainService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_STANDBY, null);
+ mainLockWrapService.buildMinorTask(agv, TaskTypeType.TO_STANDBY, null, null);
}
}
@@ -137,55 +152,7 @@
private synchronized void releaseFuncSta(){
List<FuncSta> funcStaList = funcStaService.list(new LambdaQueryWrapper<FuncSta>().eq(FuncSta::getState, FuncStaStateType.OCCUPIED.toString()));
for (FuncSta funcSta : funcStaList) {
- boolean beIdle = true;
- Agv agv = agvService.findByPosition(funcSta.getCode());
- switch (Objects.requireNonNull(FuncStaType.query(funcSta.getType()))) {
- case CHARGE:
- AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
- if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
- beIdle = false;
- } else {
- Task latestTask = taskService.findLatestTask(agv.getId(), null);
- if (null != latestTask
- && latestTask.getTaskType().equals(TaskTypeType.TO_CHARGE.val())
- && latestTask.getDestCode().equals(funcSta.getCode())
- ) {
- beIdle = false;
- }
- }
- if (taskService.count(new LambdaQueryWrapper<Task>()
- .eq(Task::getTaskType, TaskTypeType.TO_CHARGE.val())
- .eq(Task::getDestCode, funcSta.getCode())
- .and(i -> {
- i.eq(Task::getTaskSts, TaskStsType.WAITING.val()).or()
- .eq(Task::getTaskSts, TaskStsType.ASSIGN.val()).or()
- .eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
- })) > 0) {
- beIdle = false;
- }
- break;
- case STANDBY:
- Task latestTask = taskService.findLatestTask(agv.getId(), null);
- if (null != latestTask
- && latestTask.getTaskType().equals(TaskTypeType.TO_STANDBY.val())
- && latestTask.getDestCode().equals(funcSta.getCode())
- ) {
- beIdle = false;
- }
- if (taskService.count(new LambdaQueryWrapper<Task>()
- .eq(Task::getTaskType, TaskTypeType.TO_STANDBY.val())
- .eq(Task::getDestCode, funcSta.getCode())
- .and(i -> {
- i.eq(Task::getTaskSts, TaskStsType.WAITING.val()).or()
- .eq(Task::getTaskSts, TaskStsType.ASSIGN.val()).or()
- .eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
- })) > 0) {
- beIdle = false;
- }
- break;
- default:
- break;
- }
+ boolean beIdle = funcStaService.isCanBeIdle(funcSta);
if (beIdle) {
funcSta.setState(FuncStaStateType.IDLE.toString());
funcSta.setUpdateTime(new Date());
--
Gitblit v1.9.1