From 376f9a04e2c2814d210e2c5177f0e27d115e1b5d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 23 二月 2024 09:46:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java | 112 ++++++++++++++++++++++++--------------------------------
1 files changed, 48 insertions(+), 64 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java
index 33a3c43..6181031 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java
@@ -1,11 +1,5 @@
package com.example.springboot.component;
-
-
-
-
-import com.example.springboot.entity.device.PlcParameterObject;
-
import com.example.springboot.entity.device.PlcBitObject;
import com.example.springboot.entity.device.PlcParameterObject;
@@ -13,19 +7,45 @@
import java.util.ArrayList;
import java.util.List;
+import static com.example.springboot.component.InitUtil.readAndUpdateBitValues;
+import static com.example.springboot.component.InitUtil.readAndUpdateWordValues;
+
public class PLCAutoMes extends Thread {
// 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
private Configuration config;
private static InitUtil initUtil;
- public static PlcParameterObject plcParameterObject;
+ // 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 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();
+
+ // 璋冪敤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(PlcMes);
+ public static PlcParameterObject PlcReadObject = initUtil.initword(PlcRead);
+ public static PlcParameterObject PlcframeObject = initUtil.initword(Plcframe);
// 绉佹湁鏋勯�犲嚱鏁�
public PLCAutoMes() throws IOException {
@@ -45,70 +65,34 @@
public void run() {
while (this != null) {
try {
- Thread.sleep(1000);
+ Thread.sleep(100);
} catch (InterruptedException e) {
e.printStackTrace();
}
- String jsonFilePath = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcParameter.json").getPath();
- // String jsonFilePath2 = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcSign.json").getPath();
- //String jsonFilePath4 = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcState.json").getPath();
- //System.out.println(jsonFilePath4);
- // 璋冪敤initword鏂规硶
- plcParameterObject = initUtil.initword(jsonFilePath);
-// List<String> addresses = new ArrayList<>();
-// addresses.add("conveyorVelocity(AutoFAST)");
-// addresses.add("A02ID");
-// addresses.add("conveyorVelocity(Manual)");
-//
-// PlcParameterObject paramObject = PLCAutomaticParameterSettingReview2.plcParameterObject;
-//
-//
-//
-// List<String> address = paramObject.getAddressListByCodeId(addresses);
-// System.out.println(address);
+ // System.out.println(jsonFilePath);
+ readAndUpdateWordValues(PlcReadObject);
+ readAndUpdateWordValues(PlcMesObject);
+ readAndUpdateWordValues(PlcframeObject);
+ // readAndUpdateWordValues(PlcframeObject);
- //PLCAutomaticParameterSettingReview2 plc ;
-
-// String jsonFilePath = PLCAutoMes.class.getResource("/JsonFile/PlcMes.json").getPath();
-//
-// String jsonFilePath2 = PLCAutoMes.class.getResource("/JsonFile/PlcRead.json").getPath();
-// // String jsonFilePath3 = PLCAutoMes.class.getResource("/JsonFile/Plcframe.json").getPath();
-// // System.out.println(jsonFilePath);
-//
-// // 璋冪敤initword鏂规硶
-// PlcMesObject= initUtil.initword(jsonFilePath);
-// // 璋冪敤initbit鏂规硶
-// PlcParameterObject PlcReadObject= initUtil.initword(jsonFilePath2);
- // // 璋冪敤initbit鏂规硶
- // PlcParameterObject PlcframeObject= initUtil.initword(jsonFilePath3);
-// readAndUpdateWordValues(PlcReadObject);
-// readAndUpdateWordValues(PlcMesObject);
- // 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");
+ 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));
-
-
-
+ System.out.println(PlcReadObject.getPlcParameterValues(addresses2));
}
}
--
Gitblit v1.8.0