From 8384040c3204f1bfa8fe30d264ef87b4d3b317ff Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 31 十二月 2025 15:31:23 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/resources/application.yml | 4 ++--
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java | 10 +++++++++-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
index 5ddf526..002673a 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
@@ -65,7 +65,15 @@
}
List<Long> areaIds = areaGovernService.queryAreas(code);
List<Long> agvIds = areaAgvService.queryAgvIdsByAreaIds(areaIds);
- agvIds.addAll(areaAgvService.findAgvIdsWithoutAreaAgv());
+ List<Long> agvIdsWithoutAreaAgv = areaAgvService.findAgvIdsWithoutAreaAgv();
+ if (agvIdsWithoutAreaAgv.isEmpty()) {
+ return agvIds;
+ }else {
+ if (agvIds.isEmpty()){
+ return agvIdsWithoutAreaAgv;
+ }
+ }
+ agvIds.addAll(agvIdsWithoutAreaAgv);
return agvIds;
}
diff --git a/zy-acs-manager/src/main/resources/application.yml b/zy-acs-manager/src/main/resources/application.yml
index 94fb3d0..ba2affc 100644
--- a/zy-acs-manager/src/main/resources/application.yml
+++ b/zy-acs-manager/src/main/resources/application.yml
@@ -7,7 +7,7 @@
static-path-pattern: /**
datasource:
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://localhost:3306/rcs_ctu_stable_xgc?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://10.10.10.200:3306/rcs_ctu_stable_xgc?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: xltys1995
type: com.alibaba.druid.pool.DruidDataSource
@@ -42,7 +42,7 @@
enabled: false
redis:
- host: localhost
+ host: 10.10.10.200
password: xltys1995
port: 6379
max: 30
--
Gitblit v1.9.1