From 1443e13e91ffb1bc6548722ef6a7a3b68d0ceed9 Mon Sep 17 00:00:00 2001
From: zy <zy@123>
Date: 星期三, 16 七月 2025 10:32:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/fake/FakeNyShuttleThread.java | 26 +++++++++++++++-----------
src/main/resources/application.yml | 6 +++++-
src/main/java/com/zy/core/ServerBootstrap.java | 10 +++++++++-
3 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 9c9ebd6..1dac4f8 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -30,6 +30,10 @@
@Value("${deviceMsgConfig.gatewayPort}")
private int gatewayPort;
+ @Value("${deviceMsgConfig.enableFakeAndDeviceThread}")
+ private boolean enableFakeAndDeviceThread;
+ @Value("${deviceMsgConfig.enableFake}")
+ private boolean enableFake;
@Autowired
private RedisUtil redisUtil;
@Autowired
@@ -74,7 +78,11 @@
}
private void initFakeThread(){
- ThreadHandler thread = new FakeNyShuttleThread(redisUtil, gatewayPort);
+ if (!enableFake) {
+ return;
+ }
+
+ ThreadHandler thread = new FakeNyShuttleThread(redisUtil, gatewayPort, enableFakeAndDeviceThread);
new Thread(thread).start();
ThreadHandler thread2 = new FakeZyForkLiftThread(redisUtil);
diff --git a/src/main/java/com/zy/core/thread/fake/FakeNyShuttleThread.java b/src/main/java/com/zy/core/thread/fake/FakeNyShuttleThread.java
index e6fed97..2333ccc 100644
--- a/src/main/java/com/zy/core/thread/fake/FakeNyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/fake/FakeNyShuttleThread.java
@@ -30,6 +30,7 @@
private JSONObject fakeStatusDemo = JSONObject.parseObject("{\"mode\":1,\"extend\":{\"countQuantity\":400,\"suspendState\":0,\"minCellVoltage\":3279,\"chargeCycleTimes\":0,\"maxCellVoltage\":3281,\"surplusQuantity\":204,\"voltage\":5248},\"hasLift\":false,\"hasPallet\":false,\"batteryVoltage\":5248,\"runDirection\":\"2\",\"currentCode\":\"{\\\"x\\\":19,\\\"y\\\":11,\\\"z\\\":2}\",\"errorCode\":\"0\",\"hasCharge\":false,\"batteryPower\":\"51\",\"speed\":0,\"deviceStatus\":1}");
private ServerSocket serverSocket;
private Integer gatewayPort;
+ private boolean enableFakeAndDeviceThread;
private ConcurrentHashMap<String, Thread> fakeThreadMap = new ConcurrentHashMap();
private ConcurrentHashMap<String, Socket> fakeServerMap = new ConcurrentHashMap();
private ConcurrentHashMap<String, JSONObject> fakeStatusMap = new ConcurrentHashMap();
@@ -37,9 +38,10 @@
private boolean fake = false;
- public FakeNyShuttleThread(RedisUtil redisUtil, Integer gatewayPort) {
+ public FakeNyShuttleThread(RedisUtil redisUtil, Integer gatewayPort, boolean enableFakeAndDeviceThread) {
this.redisUtil = redisUtil;
this.gatewayPort = gatewayPort;
+ this.enableFakeAndDeviceThread = enableFakeAndDeviceThread;
}
@Override
@@ -184,16 +186,18 @@
continue;
}
- NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getDeviceNo());
- if (shuttleThread == null) {
- // init
- NyShuttleThread thread = new NyShuttleThread(device, redisUtil);;
- new Thread(thread).start();
- SlaveConnection.put(SlaveType.Shuttle, device.getDeviceNo(), thread);
- }else {
- Socket socket = shuttleThread.getSocket();
- if(socket == null){
- continue;
+ if (enableFakeAndDeviceThread) {
+ NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getDeviceNo());
+ if (shuttleThread == null) {
+ // init
+ NyShuttleThread thread = new NyShuttleThread(device, redisUtil);;
+ new Thread(thread).start();
+ SlaveConnection.put(SlaveType.Shuttle, device.getDeviceNo(), thread);
+ }else {
+ Socket socket = shuttleThread.getSocket();
+ if(socket == null){
+ continue;
+ }
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index dc5d773..f567e48 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -28,4 +28,8 @@
# 缃戝叧缂栧彿
gatewayId: 1
# 缃戝叧绔彛
- gatewayPort: 8888
\ No newline at end of file
+ gatewayPort: 8888
+ # 鍚姩妯℃嫙鍣�
+ enableFake: true
+ # 鍚姩妯℃嫙鍣ㄦ椂骞跺惎鍔ㄨ澶囩嚎绋�
+ enableFakeAndDeviceThread: false
\ No newline at end of file
--
Gitblit v1.9.1