From 566392943866d7cf90ded0d5a67660caf51af022 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 13 十一月 2024 14:32:52 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 239ff50..08add0d 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
@@ -4,6 +4,7 @@
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.*;
@@ -37,6 +38,8 @@
private FuncStaService funcStaService;
@Autowired
private MainService mainService;
+ @Autowired
+ private MainLockWrapService mainLockWrapService;
@Autowired
private TaskService taskService;
@Autowired
@@ -79,7 +82,7 @@
continue;
}
- mainService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_CHARGE, null);
+ mainLockWrapService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_CHARGE, null);
}
}
}
@@ -137,10 +140,12 @@
);
if (seconds < intervalOfAutoStandby) { continue; }
}
+ } else {
+ continue;
}
// }
- mainService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_STANDBY, null);
+ mainLockWrapService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_STANDBY, null);
}
}
@@ -150,11 +155,11 @@
for (FuncSta funcSta : funcStaList) {
boolean beIdle = true;
Agv agv = agvService.findByPosition(funcSta.getCode());
- AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
- AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
switch (Objects.requireNonNull(FuncStaType.query(funcSta.getType()))) {
case CHARGE:
+ AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
+ AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
beIdle = false;
} else {
@@ -173,9 +178,9 @@
.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());
+ i.eq(Task::getTaskSts, TaskStsType.WAITING.val()).or()
+ .eq(Task::getTaskSts, TaskStsType.ASSIGN.val()).or()
+ .eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
})
)) {
beIdle = false;
@@ -194,8 +199,8 @@
.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());
+ .eq(Task::getTaskSts, TaskStsType.ASSIGN.val()).or()
+ .eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
})
)) {
beIdle = false;
@@ -204,6 +209,7 @@
default:
break;
}
+
if (beIdle) {
funcSta.setState(FuncStaStateType.IDLE.toString());
funcSta.setUpdateTime(new Date());
--
Gitblit v1.9.1