From 5c3f2ceeaead80ce4b12be933ddf759cf8bddefc Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 02 二月 2026 15:07:42 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunRebootScheduler.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunRebootScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunRebootScheduler.java
index bcfde8c..bcfbadf 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunRebootScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunRebootScheduler.java
@@ -6,10 +6,10 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.manager.common.domain.TaskDto;
+import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam;
import com.zy.acs.manager.core.service.AreaGovernService;
import com.zy.acs.manager.core.service.MainLockWrapService;
import com.zy.acs.manager.core.service.MainService;
-import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.service.*;
@@ -18,12 +18,11 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
import java.util.*;
@Slf4j
-@Component
+//@Component
public class AutoRunRebootScheduler {
private static final AgvModelType DEFAULT_AGV_MODEL = AgvModelType.HEAVY_LOAD_STACKING_ROBOT;
@@ -118,7 +117,7 @@
Collections.shuffle(stockList);
OpenBusSubmitParam param = new OpenBusSubmitParam();
- param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
+ param.setBatchNo(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
for (int i = 0; i < Math.min(agvModel.getBackpack(), stockList.size()) ; i++) {
Sta stockSta = stockList.get(i);
String staCode = codeService.getCacheById(stockSta.getCode()).getData();
@@ -156,11 +155,11 @@
taskDto.setOriSta(stockSta.getStaNo());
taskDto.setDestLoc(idleLoc.getLocNo());
taskDto.setPriority(100);
- taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
+ taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
- param.getTaskList().add(taskDto);
+ param.getTasks().add(taskDto);
}
- if (Cools.isEmpty(param.getTaskList())) { return; }
+ if (Cools.isEmpty(param.getTasks())) { return; }
mainService.generateBusAndTask(param, memo);
}
@@ -174,7 +173,7 @@
Collections.shuffle(idleList);
OpenBusSubmitParam param = new OpenBusSubmitParam();
- param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
+ param.setBatchNo(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
for (int i = 0; i < Math.min(agvModel.getBackpack(), idleList.size()) ; i++) {
Sta idleSta = idleList.get(i);
String staCode = codeService.getCacheById(idleSta.getCode()).getData();
@@ -212,11 +211,11 @@
taskDto.setOriLoc(stockLoc.getLocNo());
taskDto.setDestSta(idleSta.getStaNo());
taskDto.setPriority(100);
- taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
+ taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
- param.getTaskList().add(taskDto);
+ param.getTasks().add(taskDto);
}
- if (Cools.isEmpty(param.getTaskList())) { return; }
+ if (Cools.isEmpty(param.getTasks())) { return; }
mainService.generateBusAndTask(param, memo);
}
@@ -250,7 +249,7 @@
Collections.shuffle(idleLocList);
OpenBusSubmitParam param = new OpenBusSubmitParam();
- param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
+ param.setBatchNo(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
for (int i = 0; i < Math.min(maxCapacity, Math.min(stockLocList.size(), idleLocList.size())); i++) {
Loc stockLoc = stockLocList.get(i);
Loc idleLoc = idleLocList.get(i);
@@ -258,11 +257,11 @@
TaskDto taskDto = new TaskDto();
taskDto.setOriLoc(stockLoc.getLocNo());
taskDto.setDestLoc(idleLoc.getLocNo());
- taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
+ taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
- param.getTaskList().add(taskDto);
+ param.getTasks().add(taskDto);
}
- if (Cools.isEmpty(param.getTaskList())) { return; }
+ if (Cools.isEmpty(param.getTasks())) { return; }
mainService.generateBusAndTask(param, memo);
}
--
Gitblit v1.9.1