From ab389a5a6b329b15a655340ba7b87bce7fd7871d Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 24 十二月 2025 17:16:19 +0800
Subject: [PATCH] 添加新增设备自动生成编码
---
mes-processes/mes-plcSend/src/main/java/com/mes/plc/client/impl/S7PlcClient.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/plc/client/impl/S7PlcClient.java b/mes-processes/mes-plcSend/src/main/java/com/mes/plc/client/impl/S7PlcClient.java
index acefe46..c9b7849 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/plc/client/impl/S7PlcClient.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/plc/client/impl/S7PlcClient.java
@@ -9,6 +9,7 @@
import com.mes.s7.enhanced.EnhancedS7Serializer;
import lombok.extern.slf4j.Slf4j;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -70,12 +71,19 @@
}
static {
- // 鍒濆鍖朠LC绫诲瀷鏄犲皠
+ // 鍒濆鍖朠LC绫诲瀷鏄犲皠锛堟敮鎸佸绉嶆牸寮忥級
+ // S7_1200 鏍煎紡
PLC_TYPE_MAP.put("S7_1200", EPlcType.S1200);
PLC_TYPE_MAP.put("S7_1500", EPlcType.S1500);
PLC_TYPE_MAP.put("S7_200", EPlcType.S200);
PLC_TYPE_MAP.put("S7_300", EPlcType.S300);
PLC_TYPE_MAP.put("S7_400", EPlcType.S400);
+ // S1200 鏍煎紡锛堜笉甯︿笅鍒掔嚎锛�
+ PLC_TYPE_MAP.put("S1200", EPlcType.S1200);
+ PLC_TYPE_MAP.put("S1500", EPlcType.S1500);
+ PLC_TYPE_MAP.put("S200", EPlcType.S200);
+ PLC_TYPE_MAP.put("S300", EPlcType.S300);
+ PLC_TYPE_MAP.put("S400", EPlcType.S400);
}
/**
@@ -181,13 +189,13 @@
}
// 浣跨敤PlcDynamicDataService璇诲彇鎸囧畾瀛楁PLC鏁版嵁
- Map<String, Object> data = this.plcDynamicDataService.readPlcData(this.device, java.util.Arrays.asList(fields), this.s7Serializer);
+ Map<String, Object> data = this.plcDynamicDataService.readPlcData(this.device, Arrays.asList(fields), this.s7Serializer);
if (data == null) {
log.warn("PLC鍔ㄦ�佹暟鎹湇鍔¤繑鍥炵┖鏁版嵁: {}:{}", this.plcIp, this.plcPort);
return new HashMap<>();
}
- log.info("S7 PLC璇诲彇鎸囧畾瀛楁鏁版嵁鎴愬姛: {}:{}, fields={}", this.plcIp, this.plcPort, java.util.Arrays.toString(fields));
+ log.info("S7 PLC璇诲彇鎸囧畾瀛楁鏁版嵁鎴愬姛: {}:{}, fields={}", this.plcIp, this.plcPort, Arrays.toString(fields));
return data;
} catch (Exception e) {
log.error("S7 PLC璇诲彇鏁版嵁澶辫触: {}:{}", this.plcIp, this.plcPort, e);
--
Gitblit v1.8.0