From 7e51ecd205ea28e0191b0572557739ca2bf2edbf Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 22 十一月 2024 13:50:00 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/config/ScheduleConfig.java | 8 ++++----
src/main/java/com/zy/asrs/controller/AgvMapController.java | 8 ++++----
src/main/resources/application.yml | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMapController.java b/src/main/java/com/zy/asrs/controller/AgvMapController.java
index 550bbac..cba44b2 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMapController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMapController.java
@@ -105,7 +105,7 @@
private Integer generateMap1Bay(int bay) {
int y = bay;
- Integer[] bayAdd = {1, 3, 5, 7, 9, 11, 13, 15, 17, 19};
+ Integer[] bayAdd = {1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 89, 91, 93, 95, 97, 99, 101, 103, 105};
for (int i = 0; i < bayAdd.length; i++) {
if (bay > bayAdd[i]) {
y++;
@@ -118,7 +118,7 @@
private Integer generateMap4Row(int row) {
int x = row;
- Integer[] rowAdd = {1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21};
+ Integer[] rowAdd = {1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 89, 91, 93, 95, 97, 99, 101, 103, 105, 107, 109, 111, 113, 115, 117, 119};
for (int i = 0; i < rowAdd.length; i++) {
if (row > rowAdd[i]) {
x++;
@@ -131,7 +131,7 @@
private Integer generateMap2Row(int row) {
int x = row;
- Integer[] rowAdd = {2, 4, 6, 7, 8, 10, 12, 13, 15, 17, 19, 20, 22, 24};
+ Integer[] rowAdd = {2, 4, 6, 7, 8, 10, 12, 13, 15, 17, 19, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116};
for (int i = 0; i < rowAdd.length; i++) {
if (row > rowAdd[i]) {
x++;
@@ -156,7 +156,7 @@
private Integer generateMap3Row(int row) {
int x = row;
- Integer[] rowAdd = {2, 4, 6, 8, 10, 12, 14, 15, 17, 19, 21, 22, 24, 26, 28, 30, 32};
+ Integer[] rowAdd = {2, 4, 6, 8, 10, 12, 14, 15, 17, 19, 21, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 120, 122};
for (int i = 0; i < rowAdd.length; i++) {
if (row >= rowAdd[i]) {
x++;
diff --git a/src/main/java/com/zy/common/config/ScheduleConfig.java b/src/main/java/com/zy/common/config/ScheduleConfig.java
index 25b3a15..afe5dc9 100644
--- a/src/main/java/com/zy/common/config/ScheduleConfig.java
+++ b/src/main/java/com/zy/common/config/ScheduleConfig.java
@@ -14,10 +14,10 @@
public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
//閲囩敤瀹氶暱鐨勭嚎绋嬫睜锛岄槻姝㈠畾鏃朵换鍔″紓甯告椂瀵艰嚧澶ч噺绾跨▼琚崰鐢紱
- // 鍒涘缓涓�涓� ScheduledThreadPoolExecutor锛屾牳蹇冪嚎绋嬫暟涓� 12锛屾渶澶х嚎绋嬫暟涓� 24
- ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(12, new ThreadPoolExecutor.CallerRunsPolicy());
- // 璁剧疆鏈�澶х嚎绋嬫暟涓� 24
- executor.setMaximumPoolSize(24);
+ // 鍒涘缓涓�涓� ScheduledThreadPoolExecutor锛屾牳蹇冪嚎绋嬫暟涓� 12锛屾渶澶х嚎绋嬫暟涓� 50
+ ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(12, new ThreadPoolExecutor.DiscardPolicy());
+ // 璁剧疆鏈�澶х嚎绋嬫暟涓� 50
+ executor.setMaximumPoolSize(50);
taskRegistrar.setScheduler(executor);
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 22524fb..f2026f2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
spring:
profiles:
#dev loc prod
- active: loc
\ No newline at end of file
+ active: prod
\ No newline at end of file
--
Gitblit v1.9.1