From 3dcd26a1243d0d38f40b8a8d1348fd07e0afb237 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 11 四月 2025 08:24:11 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/MainProcess.java | 4 ++--
src/main/java/com/zy/core/thread/impl/FyDevpThread.java | 2 +-
src/main/resources/application.yml | 3 ++-
src/main/java/com/zy/core/ServerBootstrap.java | 1 -
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 76f7997..23ffc9c 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -43,9 +43,9 @@
//zhangc
//杈撻�佺嚎
// 鍏ュ簱
- //mainService.generateInboundWrk();
+ mainService.generateInboundWrk();
// 鍑哄簱
- //mainService.stnToOutStn();
+ mainService.stnToOutStn();
//鍒濆鍖栧疄鏃跺湴鍥�
mainService.initRealtimeBasMap();
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index dcdccd7..73cd386 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -127,7 +127,6 @@
} else {
throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
}
-
new Thread(thread).start();
SlaveConnection.put(SlaveType.Shuttle, devpSlave.getId(), thread);
}
diff --git a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
index 36cb2a9..3625152 100644
--- a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
+++ b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
@@ -78,7 +78,7 @@
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
- connect();
+// connect();
while (true) {
try {
int step = 1;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7014689..7d70dc0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -13,7 +13,7 @@
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/fyxc_shuttle?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: root
+ password: zhangchao
mvc:
static-path-pattern: /**
redis:
@@ -78,6 +78,7 @@
port: 102
rack: 0
slot: 0
+ threadImpl: FyDevpThread
# 鍏ュ簱鍙�1
inSta[0]:
staNo: 1012
--
Gitblit v1.9.1