| docs/WCS部署手册.md | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| docs/WCS部署手册.pdf | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| docs/i18n-language-pack.md | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/ServerBootstrap.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/network/ZyStationConnectDriver.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/network/real/ZyStationV5RealConnect.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/thread/impl/ZyStationV4Thread.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
docs/WCS²¿ÊðÊÖ²á.md
File was deleted docs/WCS²¿ÊðÊÖ²á.pdfBinary files differ
docs/i18n-language-pack.md
File was deleted src/main/java/com/zy/core/ServerBootstrap.java
@@ -146,8 +146,6 @@ thread = new ZyStationThread(deviceConfig, redisUtil); } else if (deviceConfig.getThreadImpl().equals("ZyStationV3Thread")) { thread = new ZyStationV3Thread(deviceConfig, redisUtil); } else if (deviceConfig.getThreadImpl().equals("ZyStationV4Thread")) { thread = new ZyStationV4Thread(deviceConfig, redisUtil); } else if (deviceConfig.getThreadImpl().equals("ZyStationV5Thread")) { thread = new ZyStationV5Thread(deviceConfig, redisUtil); } else { src/main/java/com/zy/core/network/ZyStationConnectDriver.java
@@ -13,7 +13,7 @@ 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; @@ -74,9 +74,8 @@ 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); } @@ -84,14 +83,13 @@ if ("ZyStationV3Thread".equals(deviceConfig.getThreadImpl())) { zyStationFakeSegConnect.addFakeConnect(deviceConfig, redisUtil); connectApi = zyStationFakeSegConnect; } else if ("ZyStationV4Thread".equals(deviceConfig.getThreadImpl()) || "ZyStationV5Thread".equals(deviceConfig.getThreadImpl())) { } else if ("ZyStationV5Thread".equals(deviceConfig.getThreadImpl())) { zyStationV4FakeSegConnect.addFakeConnect(deviceConfig, redisUtil); connectApi = zyStationV4FakeSegConnect; } else { fakeConfigUnsupported = true; zyStationConnectApi = null; log.error("æ§çè¾éç« fake 已移é¤ï¼deviceNo={}, threadImpl={}, è¯·åæ¢å° ZyStationV3ThreadãZyStationV4Thread æ ZyStationV5Thread", log.error("æ§çè¾éç« fake 已移é¤ï¼deviceNo={}, threadImpl={}, è¯·åæ¢å° ZyStationV3Thread æ ZyStationV5Thread", deviceConfig.getDeviceNo(), deviceConfig.getThreadImpl()); return false; } src/main/java/com/zy/core/network/real/ZyStationV5RealConnect.java
File was renamed from src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java @@ -38,7 +38,7 @@ * è¾éç«çå®è¿æ¥ï¼PLCï¼ */ @Slf4j public class ZyStationV4RealConnect implements ZyStationConnectApi { public class ZyStationV5RealConnect implements ZyStationConnectApi { private static final int TASK_AREA_LENGTH = 48; private static final int TASK_AREA_SLOT_SIZE = 12; @@ -79,7 +79,7 @@ private DeviceConfig deviceConfig; private RedisUtil redisUtil; public ZyStationV4RealConnect(DeviceConfig deviceConfig, RedisUtil redisUtil) { public ZyStationV5RealConnect(DeviceConfig deviceConfig, RedisUtil redisUtil) { this.deviceConfig = deviceConfig; this.redisUtil = redisUtil; } src/main/java/com/zy/core/thread/impl/ZyStationV4Thread.java
File was deleted