From aa5c831b256f6fa85851cfe8bfa53c5e3b7ce8be Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 14 一月 2025 11:05:31 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 23 ++++++++---------------
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PathQueueConsumer.java | 2 +-
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index 59ca80b..b7968b4 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -653,9 +653,9 @@
// JSONObject storeDirection = configService.getVal("storeDirection", JSONObject.class);
int angleOffsetVal = configService.getVal("mapAngleOffsetVal", Integer.class);
String agvNo = agvService.getAgvNo(agvId);
- if (!agvService.judgeEnable(agvId)) {
- throw new CoolException("AGV[" + agvNo + "]褰撳墠涓嶅彲鐢�...");
- }
+// if (!agvService.judgeEnable(agvId)) {
+// throw new CoolException("AGV[" + agvNo + "]褰撳墠涓嶅彲鐢�...");
+// }
AgvModel agvModel = agvModelService.getByAgvId(agvId);
Double workDirection = agvModel.getWorkDirection();
@@ -989,27 +989,20 @@
now // 宸ヤ綔鏃堕棿
));
-// List<Action> newActionList = new ArrayList<>(actionList);
-
-// List<Action> optimizeList = actionService.optimizeSort(actionList);
-
- List<Action> optimizeList = actionSorter.optimizeSort(actionList);
- List<Action> newActionList = new ArrayList<>(optimizeList);
-
-
+ List<Action> newActionList = actionSorter.optimizeSort(actionList);
String groupId = String.valueOf(snowflakeIdWorker.nextId()).substring(3);
// save action
int i = newActionList.size();
for (Action action : newActionList) {
- action.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
+// action.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
action.setGroupId(groupId);
action.setPriority(i);
- if (!actionService.save(action)) {
- throw new BusinessException(action.getName() + "鍔ㄤ綔淇濆瓨澶辫触");
- }
i -= 1;
}
+ if (!actionService.saveBatch(newActionList)) {
+ throw new BusinessException("group[" + groupId + "] 鍔ㄤ綔淇濆瓨澶辫触");
+ }
// update segment
for (Segment item : segmentList) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PathQueueConsumer.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PathQueueConsumer.java
index fb9d862..2ba64c6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PathQueueConsumer.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PathQueueConsumer.java
@@ -37,7 +37,7 @@
this.consumerExecutor.execute(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
- Thread.sleep(30);
+ Thread.sleep(50);
List<UnlockPathTask> tasks = new ArrayList<>();
// if unlockTaskQueue was empty, then block
tasks.add(unlockTaskQueue.take());
--
Gitblit v1.9.1