From b4a4a24a65fa3f90b4d39a311918943f73e18d5d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 07 五月 2024 22:07:35 +0800
Subject: [PATCH] 联调代码修改：写入确认字
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PLCAutoMes.java | 65 ++++++--------------------------
1 files changed, 12 insertions(+), 53 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PLCAutoMes.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PLCAutoMes.java
index 06efda5..4e8fe38 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PLCAutoMes.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PLCAutoMes.java
@@ -1,53 +1,32 @@
package com.mes.common;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
import static com.mes.common.InitUtil.readAndUpdateWordValues;
public class PLCAutoMes extends Thread {
- // // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
- // private Configuration config;
+ private static final Logger log = LoggerFactory.getLogger(PLCAutoMes.class);
private static InitUtil initUtil;
- // public static PlcParameterObject PlcMesObject;
- // public static PlcParameterObject PlcReadObject;
- // public static PlcParameterObject PlcframeObject;
-
- // // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
- // MessageHandler customS7Control = new MessageHandler();
// 鍗曚緥瀹炰緥
private static PLCAutoMes instance;
- // private static String PlcMes = PLCAutoMes.class.getResource("/JsonFile/PlcMes.json").getPath();
- private static String PlcAlbania = PLCAutoMes.class.getResource("/JsonFile/PlcAlbania.json").getPath();
- // private static String PlcRead = PLCAutoMes.class.getResource("/JsonFile/PlcRead.json").getPath();
- // private static String Plcframe = PLCAutoMes.class.getResource("/JsonFile/Plcframe.json").getPath();
- // private static String PlcParameter = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcParameter.json").getPath();
-
- // private static String PlcSign = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcSign.json").getPath();
-
- // private static String PlcState = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcState.json").getPath();
-
- // private static String PlcAlarm = PLCAutoMes.class.getResource("/JsonFile/PlcAlarm.json").getPath();
- // private static String PlcTest = PLCAutoMes.class.getResource("/JsonFile/PlcTest.json").getPath();
+ private static String PlcAlbania;
- // 璋冪敤initword鏂规硶
- // public static PlcParameterObject plcParameterObject = initUtil.initword(PlcParameter);
- // public static PlcBitObject plcPlcTest = initUtil.initbit(PlcTest);
- // public static PlcBitObject plcBitObject = initUtil.initbit(PlcSign);
- // public static PlcParameterObject plcStateObject= initUtil.initword(PlcState);
- // public static PlcBitObject plcPlcAlarm = initUtil.initbit(PlcAlarm);
- public static PlcParameterObject PlcMesObject = InitUtil.initword(PlcAlbania);
- // public static PlcParameterObject PlcReadObject = initUtil.initword(PlcRead);
- // public static PlcParameterObject PlcframeObject = initUtil.initword(Plcframe);
-
+
+ public static PlcParameterObject PlcMesObject;
+
// 绉佹湁鏋勯�犲嚱鏁�
public PLCAutoMes() throws IOException {
- //config = new Configuration("config.properties");
+ PlcAlbania="D:\\SQL\\PlcCacheGlass.json";
+// PlcAlbania=PLCAutoMes.class.getResource("/JsonFile/PlcCacheGlass.json").getPath();
+ //log.info(PLCAutoMes.class.getResource("").getPath());
+ PlcMesObject = InitUtil.initword(PlcAlbania);
initUtil = new InitUtil();
}
@@ -69,28 +48,8 @@
e.printStackTrace();
}
- // System.out.println(jsonFilePath);
-
- //readAndUpdateWordValues(PlcReadObject);
readAndUpdateWordValues(PlcMesObject);
- //readAndUpdateWordValues(PlcframeObject);
- // readAndUpdateWordValues(PlcframeObject);
- // readAndUpdateWordValues(plcStateObject);
- // int index = PlcMesObject.getPlcParameter("AddStart").getAddressIndex();
- // // System.out.println(index);
- // PlcMesObject.getPlcParameter("AddStart").getAddress(index);
- // // System.out.println(PlcMesObject.getPlcParameter("AddStart").getAddress(index));
- // List<String> addresses = new ArrayList<>();
- // addresses.add("FeedID");
- // addresses.add("AddStart");
- // // System.out.println(addresses);
- // // System.out.println(PlcMesObject.getPlcParameterValues(addresses));
- // List<String> addresses2 = new ArrayList<>();
- // addresses2.add("FeedID");
- // addresses2.add("FeedCarStatus");
-
- //System.out.println(PlcReadObject.getPlcParameterValues(addresses2));
}
}
--
Gitblit v1.8.0