From 560303799978bd141dc1e9553b7607012591fb42 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 17 六月 2025 17:02:53 +0800
Subject: [PATCH] 1.json文件优化  增加配置项:【1.触发点;2.逻辑线程时间间隔】 2.优化处理代码 【1.去除多余日志输出点;2.两个设备json文件进行根据codeId进行关联;3.调整代码先后顺序】 3.json文件路径提出jar包外,可在设备表上配置上配置路径。因原方式修改地址json 后需重新打包,实际调试中传递jar包比较浪费时间

---
 ShangHaiMesParent/moduleService/plcConnectModule/src/main/java/com/mes/model/entity/Machine.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ShangHaiMesParent/moduleService/plcConnectModule/src/main/java/com/mes/model/entity/Machine.java b/ShangHaiMesParent/moduleService/plcConnectModule/src/main/java/com/mes/model/entity/Machine.java
index 267d49c..af481a5 100644
--- a/ShangHaiMesParent/moduleService/plcConnectModule/src/main/java/com/mes/model/entity/Machine.java
+++ b/ShangHaiMesParent/moduleService/plcConnectModule/src/main/java/com/mes/model/entity/Machine.java
@@ -61,14 +61,29 @@
     private int port;
 
     /**
-     * 绔彛
+     * 鍙傛暟鏂囦欢璺緞
+     */
+    private String fileUrl;
+    /**
+     * 鍙傛暟鏂囦欢
      */
     private String machineFile;
 
     /**
-     * 绔彛
+     * 閫昏緫鏂囦欢
      */
     private String logicFile;
 
+    /**
+     * 寮�鍏�
+     */
+    private String open;
+
+    public String getMachineFile(){
+        return this.fileUrl+"\\"+this.machineFile;
+    }
+    public String getLogicFile(){
+        return this.fileUrl+"\\"+this.logicFile;
+    }
 
 }

--
Gitblit v1.8.0