From 161c2226aa491e20a6d2547095d698d4c4854d90 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 17 六月 2024 10:48:59 +0800
Subject: [PATCH] 手动页面地址变更

---
 springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java |   54 +++++++-----------------------------------------------
 1 files changed, 7 insertions(+), 47 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 6181031..44b4021 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
@@ -13,7 +13,7 @@
 public class PLCAutoMes extends Thread {
 
     // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
-    private Configuration config;
+    
     private static InitUtil initUtil;
     // public static PlcParameterObject PlcMesObject;
     // public static PlcParameterObject PlcReadObject;
@@ -24,32 +24,13 @@
 
     // 鍗曚緥瀹炰緥
     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);
-
+    private static String PlcAlbania ="D:/Code/Albania_Mes/PlcAlbania.json";
+    //  PLCAutoMes.class.getResource("/JsonFile/PlcAlbania.json").getPath();
+    public static PlcParameterObject PlcMesObject = initUtil.initword(PlcAlbania);
+  
     // 绉佹湁鏋勯�犲嚱鏁�
     public PLCAutoMes() throws IOException {
-        config = new Configuration("config.properties");
+        //config = new Configuration("config.properties");
         initUtil = new InitUtil();
     }
 
@@ -70,29 +51,8 @@
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-
-            // System.out.println(jsonFilePath);
-
-            readAndUpdateWordValues(PlcReadObject);
+            List<Short> ss=S7control.getinstance().ReadWord("DB14.0", 1);
             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