From 139b831d805be2ed5bafb5f4c2dc1143610c7cc9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 18 十一月 2024 14:29:07 +0800
Subject: [PATCH] #
---
zy-acs-flow/.env | 4 ++--
zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java | 2 ++
zy-acs-gateway/src/main/resources/application.yml | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/zy-acs-flow/.env b/zy-acs-flow/.env
index 75212a7..12a76d8 100644
--- a/zy-acs-flow/.env
+++ b/zy-acs-flow/.env
@@ -1,5 +1,5 @@
# COOL_BASE_IP = '10.242.136.69'
-# COOL_BASE_IP = 'localhost'
-COOL_BASE_IP = '192.168.4.53'
+COOL_BASE_IP = 'localhost'
+# COOL_BASE_IP = '192.168.4.53'
COOL_BASE_PORT = 8088
diff --git a/zy-acs-gateway/src/main/resources/application.yml b/zy-acs-gateway/src/main/resources/application.yml
index 50b3fcd..79ccaa8 100644
--- a/zy-acs-gateway/src/main/resources/application.yml
+++ b/zy-acs-gateway/src/main/resources/application.yml
@@ -6,7 +6,7 @@
name: @pom.artifactId@
datasource:
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://localhost:3306/zy_acs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://localhost:3306/zy_acs1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: xltys1995
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java
index 4a605e3..d45d318 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java
@@ -161,7 +161,9 @@
task.setSeqNum(Utils.generateSeqNum(Cools.isEmpty(lastTasks)?null:lastTasks.get(0).getSeqNum()));
task.setOriLoc(oriLoc.getId());
+ task.setOriCode(oriLoc.getCode());
task.setDestLoc(destLoc.getId());
+ task.setDestCode(destLoc.getCode());
task.setTaskType(param.getTaskMode().val());
task.setTaskSts(TaskStsType.WAITING.val());
--
Gitblit v1.9.1