From 9c5628525900cc9f973af94c7b466eb95a2ec7ca Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 26 三月 2025 10:27:22 +0800
Subject: [PATCH] #
---
/dev/null | 34 -----------------
zy-acs-manager/src/main/java/com/zy/acs/manager/core/listen/AgvCompleteSubscriber.java | 5 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AreaConstant.java | 1
zy-acs-manager/src/main/java/com/zy/acs/manager/core/listen/AgvDataSubscriber.java | 5 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/LocGroupConstant.java | 72 ++++++++++++++++++++++++++++++++++++
5 files changed, 78 insertions(+), 39 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AreaConstant.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AreaConstant.java
index 86d3dee..6844105 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AreaConstant.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AreaConstant.java
@@ -1609,5 +1609,4 @@
add("00000264");
}};
-
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/LocGroupConstant.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/LocGroupConstant.java
new file mode 100644
index 0000000..7013f5f
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/LocGroupConstant.java
@@ -0,0 +1,72 @@
+package com.zy.acs.manager.core.constant;
+
+import java.util.ArrayList;
+
+public class LocGroupConstant {
+
+ public static final ArrayList<Integer> FAR_LEFT_LOC_ROW_LIST = new ArrayList<Integer>(){{
+ add(1);
+ add(2);
+ add(3);
+ add(4);
+ add(5);
+ add(6);
+ add(7);
+ add(8);
+ add(9);
+ add(10);
+ }};
+
+ public static final ArrayList<Integer> LEFT_LOC_ROW_LIST = new ArrayList<Integer>(){{
+ add(11);
+ add(12);
+ add(13);
+ add(14);
+ add(15);
+ add(16);
+ add(17);
+ add(18);
+ add(19);
+ add(20);
+ }};
+
+ public static final ArrayList<Integer> MIDDLE_LOC_ROW_LIST = new ArrayList<Integer>(){{
+ add(21);
+ add(22);
+ add(23);
+ add(24);
+ add(25);
+ add(26);
+ add(27);
+ add(28);
+ add(29);
+ add(30);
+ }};
+
+ public static final ArrayList<Integer> RIGHT_LOC_ROW_LIST = new ArrayList<Integer>(){{
+ add(31);
+ add(32);
+ add(33);
+ add(34);
+ add(35);
+ add(36);
+ add(37);
+ add(38);
+ add(39);
+ add(40);
+ }};
+
+ public static final ArrayList<Integer> FAR_RIGHT_LOC_ROW_LIST = new ArrayList<Integer>(){{
+ add(41);
+ add(42);
+ add(43);
+ add(44);
+ add(45);
+ add(46);
+ add(47);
+ add(48);
+ add(49);
+ add(50);
+ }};
+
+}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/listen/AgvCompleteSubscriber.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/listen/AgvCompleteSubscriber.java
index c0e2e6e..9863260 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/listen/AgvCompleteSubscriber.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/listen/AgvCompleteSubscriber.java
@@ -6,9 +6,10 @@
import com.zy.acs.manager.core.service.MainService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
/**
@@ -24,7 +25,7 @@
@Autowired
private MainService mainService;
- @PostConstruct
+ @EventListener(ApplicationReadyEvent.class)
private void start(){
thread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/listen/AgvDataSubscriber.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/listen/AgvDataSubscriber.java
index d22c727..34c7599 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/listen/AgvDataSubscriber.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/listen/AgvDataSubscriber.java
@@ -6,9 +6,10 @@
import com.zy.acs.manager.core.service.AgvDataService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
/**
@@ -24,7 +25,7 @@
@Autowired
private AgvDataService agvDataService;
- @PostConstruct
+ @EventListener(ApplicationReadyEvent.class)
private void start(){
// redis.deleteList(RedisConstant.AGV_DATA_FLAG);
thread = new Thread(() -> {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AnnealedScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AnnealedScheduler.java
deleted file mode 100644
index 08112c2..0000000
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AnnealedScheduler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.zy.acs.manager.core.scheduler;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.acs.framework.common.Cools;
-import com.zy.acs.manager.manager.entity.Agv;
-import com.zy.acs.manager.manager.entity.Segment;
-import com.zy.acs.manager.manager.enums.SegmentStateType;
-import com.zy.acs.manager.manager.enums.StatusType;
-import com.zy.acs.manager.manager.service.AgvService;
-import com.zy.acs.manager.manager.service.SegmentService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-@Slf4j
-@Component
-public class AnnealedScheduler {
-
- @Autowired
- private AgvService agvService;
- @Autowired
- private SegmentService segmentService;
-
-// @Scheduled(cron = "0/1 * * * * ? ")
- private void init() throws InterruptedException {
-
-
- }
-
-}
--
Gitblit v1.9.1