From 692c1a185d768a18c2007348806d775b2fbdeaa7 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 23 二月 2024 09:45:19 +0800
Subject: [PATCH] 增加MQ 示例

---
 springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java |   87 ++++++++++++++++++++++++++++---------------
 1 files changed, 56 insertions(+), 31 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 6e6ef8a..33a3c43 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,5 +1,11 @@
 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;
 
@@ -7,16 +13,16 @@
 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;
     // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
     MessageHandler customS7Control = new MessageHandler();
+;
+
 
     // 鍗曚緥瀹炰緥
     private static PLCAutoMes instance;
@@ -44,43 +50,62 @@
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-
-            
-                    
-            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);
-
+            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  PlcMesObject= initUtil.initword(jsonFilePath);
-            // 璋冪敤initbit鏂规硶
-             PlcParameterObject  PlcReadObject= initUtil.initword(jsonFilePath2);
+            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);
+
+
+            //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(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