From 720e0926fa1c94b952c26e111206c5d6e1ed5ba2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 21 四月 2026 15:59:49 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/zy-wcs-master
---
src/main/java/com/zy/core/network/ZyStationConnectDriver.java | 70 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/core/network/ZyStationConnectDriver.java b/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
index e2fac59..245216f 100644
--- a/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
+++ b/src/main/java/com/zy/core/network/ZyStationConnectDriver.java
@@ -10,16 +10,16 @@
import com.zy.core.network.entity.ZyStationStatusEntity;
import java.util.List;
import com.zy.core.network.fake.ZyStationFakeSegConnect;
-import com.zy.core.network.fake.ZyStationV4FakeSegConnect;
import com.zy.core.network.real.ZyStationRealConnect;
import com.zy.core.network.real.ZyStationV3RealConnect;
-import com.zy.core.network.real.ZyStationV4RealConnect;
+import com.zy.core.network.real.ZyStationV5RealConnect;
import lombok.extern.slf4j.Slf4j;
import java.util.Collections;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
+import java.util.UUID;
/**
* 杈撻�佺珯杩炴帴椹卞姩
@@ -28,9 +28,10 @@
public class ZyStationConnectDriver implements ThreadHandler {
private static final ZyStationFakeSegConnect zyStationFakeSegConnect = new ZyStationFakeSegConnect();
- private static final ZyStationV4FakeSegConnect zyStationV4FakeSegConnect = new ZyStationV4FakeSegConnect();
- private static final long SEND_LOCK_WARN_MS = 3_000L;
+ private static final long SEND_LOCK_WARN_MS = 500L;
private static final long SEND_COST_WARN_MS = 5_000L;
+ private static final long SEND_LOCK_POLL_MS = 20L;
+ private static final long SEND_LOCK_EXPIRE_SECONDS = 15L;
private volatile boolean connected = false;
private volatile boolean connecting = false;
@@ -71,27 +72,14 @@
if (deviceConfig.getFake() == 0) {
if ("ZyStationV3Thread".equals(deviceConfig.getThreadImpl())) {
connectApi = new ZyStationV3RealConnect(deviceConfig, redisUtil);
- } else if ("ZyStationV4Thread".equals(deviceConfig.getThreadImpl())
- || "ZyStationV5Thread".equals(deviceConfig.getThreadImpl())) {
- connectApi = new ZyStationV4RealConnect(deviceConfig, redisUtil);
+ } else if ("ZyStationV5Thread".equals(deviceConfig.getThreadImpl())) {
+ connectApi = new ZyStationV5RealConnect(deviceConfig, redisUtil);
} else {
connectApi = new ZyStationRealConnect(deviceConfig, redisUtil);
}
} else {
- if ("ZyStationV3Thread".equals(deviceConfig.getThreadImpl())) {
- zyStationFakeSegConnect.addFakeConnect(deviceConfig, redisUtil);
- connectApi = zyStationFakeSegConnect;
- } else if ("ZyStationV4Thread".equals(deviceConfig.getThreadImpl())
- || "ZyStationV5Thread".equals(deviceConfig.getThreadImpl())) {
- zyStationV4FakeSegConnect.addFakeConnect(deviceConfig, redisUtil);
- connectApi = zyStationV4FakeSegConnect;
- } else {
- fakeConfigUnsupported = true;
- zyStationConnectApi = null;
- log.error("鏃х増杈撻�佺珯 fake 宸茬Щ闄わ紝deviceNo={}, threadImpl={}, 璇峰垏鎹㈠埌 ZyStationV3Thread銆乑yStationV4Thread 鎴� ZyStationV5Thread",
- deviceConfig.getDeviceNo(), deviceConfig.getThreadImpl());
- return false;
- }
+ zyStationFakeSegConnect.addFakeConnect(deviceConfig, redisUtil);
+ connectApi = zyStationFakeSegConnect;
}
boolean connect = connectApi.connect();
@@ -162,37 +150,39 @@
if (!connected || connecting || connectApi == null) {
return new CommandResponse(false, "璁惧鏈繛鎺ワ紝鍛戒护涓嬪彂澶辫触");
}
+ String lockKey = buildStationExecuteLockKey();
+ String lockToken = UUID.randomUUID().toString();
long lockWaitStart = System.currentTimeMillis();
int waitRounds = 0;
- while (true) {
- Object lock = redisUtil.get(RedisKeyType.STATION_EXECUTE_COMMAND_LOCK.key);
- if(lock != null) {
+ if (redisUtil != null) {
+ while (true) {
+ if (redisUtil.trySetStringIfAbsent(lockKey, lockToken, SEND_LOCK_EXPIRE_SECONDS)) {
+ break;
+ }
waitRounds++;
try {
- Thread.sleep(500);
- }catch (Exception e) {
+ Thread.sleep(SEND_LOCK_POLL_MS);
+ } catch (Exception e) {
e.printStackTrace();
}
- }else {
- redisUtil.set(RedisKeyType.STATION_EXECUTE_COMMAND_LOCK.key, "lock", 60 * 5);
- break;
}
}
long lockWaitCost = System.currentTimeMillis() - lockWaitStart;
if (lockWaitCost >= SEND_LOCK_WARN_MS) {
- log.warn("杈撻�佸懡浠ょ瓑寰呭叏灞�鍙戦�侀攣瓒呮椂锛宒eviceNo={}, taskNo={}, stationId={}, targetStaNo={}, waitMs={}, waitRounds={}",
+ log.warn("杈撻�佸懡浠ょ瓑寰呰澶囧彂閫侀攣瓒呮椂锛宒eviceNo={}, taskNo={}, stationId={}, targetStaNo={}, waitMs={}, waitRounds={}, lockKey={}",
deviceConfig == null ? null : deviceConfig.getDeviceNo(),
command == null ? null : command.getTaskNo(),
command == null ? null : command.getStationId(),
command == null ? null : command.getTargetStaNo(),
lockWaitCost,
- waitRounds);
+ waitRounds,
+ lockKey);
}
long sendStart = System.currentTimeMillis();
try {
return connectApi.sendCommand(deviceConfig.getDeviceNo(), command);
} finally {
- redisUtil.del(RedisKeyType.STATION_EXECUTE_COMMAND_LOCK.key);
+ releaseDeviceSendLock(lockKey, lockToken);
long sendCostMs = System.currentTimeMillis() - sendStart;
if (sendCostMs >= SEND_COST_WARN_MS) {
log.warn("杈撻�佸懡浠ゅ簳灞傚彂閫佽�楁椂杩囬暱锛宒eviceNo={}, taskNo={}, stationId={}, targetStaNo={}, sendCostMs={}",
@@ -205,6 +195,22 @@
}
}
+ private String buildStationExecuteLockKey() {
+ Integer deviceNo = deviceConfig == null ? null : deviceConfig.getDeviceNo();
+ return RedisKeyType.STATION_EXECUTE_COMMAND_LOCK.key + ":" + deviceNo;
+ }
+
+ private void releaseDeviceSendLock(String lockKey, String lockToken) {
+ if (redisUtil == null || lockKey == null) {
+ return;
+ }
+ try {
+ redisUtil.compareAndDelete(lockKey, lockToken);
+ } catch (Exception e) {
+ log.warn("閲婃斁杈撻�佽澶囧彂閫侀攣澶辫触锛宭ockKey={}", lockKey, e);
+ }
+ }
+
public CommandResponse sendOriginCommand(String address, short[] data) {
ZyStationConnectApi connectApi = zyStationConnectApi;
if (!connected || connecting || connectApi == null) {
--
Gitblit v1.9.1