From e76f0739e647fe8a7e0e2618914e2faff554b1b7 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 17 十一月 2025 17:33:23 +0800
Subject: [PATCH] 解决冲突
---
mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcTestWriteService.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcTestWriteService.java b/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcTestWriteService.java
index d5181bc..9e53e9f 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcTestWriteService.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcTestWriteService.java
@@ -2,8 +2,8 @@
import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
-import com.mes.config.PlcAddressMappingConfig;
import com.mes.entity.PlcBaseData;
+import com.mes.entity.PlcAddress;
import com.mes.s7.enhanced.EnhancedS7Serializer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -16,7 +16,7 @@
* PLC娴嬭瘯鍐欏叆鏈嶅姟
* 妯℃嫙PLC琛屼负锛屽悜PLC鍐欏叆娴嬭瘯鏁版嵁锛岀敤浜庢祴璇昅ES绋嬪簭
*
- * @author zhoush
+ * @author huang
* @date 2025/10/29
*/
@Slf4j
@@ -24,13 +24,13 @@
public class PlcTestWriteService {
@Resource
- private PlcAddressMappingService plcAddressMappingService;
+ private PlcAddressService plcAddressService;
private static final int ON = 1;
private static final int OFF = 0;
// 褰撳墠浣跨敤鐨勯」鐩爣璇�
- private String currentProjectId = "shuttle";
+ private String currentProjectId = "vertical";
// 缂撳瓨涓嶅悓椤圭洰鐨凷7Serializer瀹炰緥
private final ConcurrentMap<String, EnhancedS7Serializer> serializerCache = new ConcurrentHashMap<>();
@@ -47,8 +47,8 @@
*/
public boolean simulatePlcRequest(String projectId) {
try {
- // 鑾峰彇椤圭洰閰嶇疆
- PlcAddressMappingConfig.ProjectPlcConfig config = plcAddressMappingService.getProjectConfig(projectId);
+ // 鑾峰彇椤圭洰閰嶇疆锛堟暟鎹簱瀹炰綋锛�
+ PlcAddress config = plcAddressService.getProjectConfigWithMapping(projectId);
// 鑾峰彇瀵瑰簲鐨凷7Serializer
EnhancedS7Serializer s7Serializer = getSerializerForProject(projectId, config);
@@ -88,8 +88,8 @@
*/
public boolean simulatePlcReport(String projectId) {
try {
- // 鑾峰彇椤圭洰閰嶇疆
- PlcAddressMappingConfig.ProjectPlcConfig config = plcAddressMappingService.getProjectConfig(projectId);
+ // 鑾峰彇椤圭洰閰嶇疆锛堟暟鎹簱瀹炰綋锛�
+ PlcAddress config = plcAddressService.getProjectConfigWithMapping(projectId);
// 鑾峰彇瀵瑰簲鐨凷7Serializer
EnhancedS7Serializer s7Serializer = getSerializerForProject(projectId, config);
@@ -127,8 +127,8 @@
*/
public boolean simulateOnlineStatus(int onlineState, String projectId) {
try {
- // 鑾峰彇椤圭洰閰嶇疆
- PlcAddressMappingConfig.ProjectPlcConfig config = plcAddressMappingService.getProjectConfig(projectId);
+ // 鑾峰彇椤圭洰閰嶇疆锛堟暟鎹簱瀹炰綋锛�
+ PlcAddress config = plcAddressService.getProjectConfigWithMapping(projectId);
// 鑾峰彇瀵瑰簲鐨凷7Serializer
EnhancedS7Serializer s7Serializer = getSerializerForProject(projectId, config);
@@ -161,8 +161,8 @@
*/
public boolean resetPlc(String projectId) {
try {
- // 鑾峰彇椤圭洰閰嶇疆
- PlcAddressMappingConfig.ProjectPlcConfig config = plcAddressMappingService.getProjectConfig(projectId);
+ // 鑾峰彇椤圭洰閰嶇疆锛堟暟鎹簱瀹炰綋锛�
+ PlcAddress config = plcAddressService.getProjectConfigWithMapping(projectId);
// 鑾峰彇瀵瑰簲鐨凷7Serializer
EnhancedS7Serializer s7Serializer = getSerializerForProject(projectId, config);
@@ -203,8 +203,8 @@
*/
public PlcBaseData readPlcStatus(String projectId) {
try {
- // 鑾峰彇椤圭洰閰嶇疆
- PlcAddressMappingConfig.ProjectPlcConfig config = plcAddressMappingService.getProjectConfig(projectId);
+ // 鑾峰彇椤圭洰閰嶇疆锛堟暟鎹簱瀹炰綋锛�
+ PlcAddress config = plcAddressService.getProjectConfigWithMapping(projectId);
// 鑾峰彇瀵瑰簲鐨凷7Serializer
EnhancedS7Serializer s7Serializer = getSerializerForProject(projectId, config);
@@ -238,11 +238,11 @@
* @param config 椤圭洰閰嶇疆
* @return S7Serializer瀹炰緥
*/
- private EnhancedS7Serializer getSerializerForProject(String projectId, PlcAddressMappingConfig.ProjectPlcConfig config) {
+ private EnhancedS7Serializer getSerializerForProject(String projectId, PlcAddress config) {
return serializerCache.computeIfAbsent(projectId, id -> {
// 瑙ｆ瀽PLC绫诲瀷
EPlcType plcType = EPlcType.S1200; // 榛樿鍊�
- if (config.getPlcType() != null) {
+ if (config != null && config.getPlcType() != null) {
try {
plcType = EPlcType.valueOf(config.getPlcType());
} catch (IllegalArgumentException e) {
@@ -251,7 +251,7 @@
}
// 鍒涘缓S7PLC瀹炰緥
- String plcIp = config.getPlcIp() != null ? config.getPlcIp() : "192.168.10.21";
+ String plcIp = (config != null && config.getPlcIp() != null) ? config.getPlcIp() : "192.168.10.21";
S7PLC s7Plc = new S7PLC(plcType, plcIp);
// 鍒涘缓骞惰繑鍥濫nhancedS7Serializer瀹炰緥
--
Gitblit v1.8.0