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/job/config/PlcAddressYmlConfig.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/job/config/PlcAddressYmlConfig.java b/mes-processes/mes-plcSend/src/main/java/com/mes/job/config/PlcAddressYmlConfig.java
new file mode 100644
index 0000000..949e7ac
--- /dev/null
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/job/config/PlcAddressYmlConfig.java
@@ -0,0 +1,36 @@
+package com.mes.job.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author huang
+ * @since 2025/10/31
+ */
+@Component
+@ConfigurationProperties(prefix = "plc.address")
+@Data
+public class PlcAddressYmlConfig {
+
+ /**
+ * key锛氶」鐩爣璇嗭紙姣斿YML涓殑 "vertical"锛�
+ * value锛氳椤圭洰鐨勬墍鏈塒LC閰嶇疆锛堝搴擸ML涓� "vertical" 涓嬬殑鎵�鏈夊瓧娈碉級
+ */
+ private Map<String, PlcAddressItem> projects;
+
+ /**
+ * 鍗曚釜椤圭洰鐨勯厤缃」锛堝搴擸ML涓� "projects" 涓嬫煇涓」鐩殑瀛愰厤缃級
+ * 瀛楁鍚嶅繀椤诲拰YML涓殑閰嶇疆椤瑰畬鍏ㄤ竴鑷达紙澶у皬鍐欐晱鎰燂級
+ */
+ @Data
+ public static class PlcAddressItem {
+ private String dbArea; // 瀵瑰簲YML涓殑 dbArea
+ private Integer beginIndex; // 瀵瑰簲YML涓殑 beginIndex
+ private String plcIp; // 瀵瑰簲YML涓殑 plcIp
+ private String plcType; // 瀵瑰簲YML涓殑 plcType
+ private Map<String, Integer> addressMapping; // 瀵瑰簲YML涓殑 addressMapping锛堝祵濂桵ap锛�
+ }
+}
--
Gitblit v1.8.0