From db0b4745458fd22b6552912b0572a89b2af09564 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 07 九月 2023 17:12:12 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
index 601fd7e..dd51397 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
@@ -1,23 +1,29 @@
 package com.example.springboot.component;
 
 import cn.hutool.json.JSONObject;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class PlcParameter extends Thread {
-    private static final int SEND_INTERVAL = 10000;
+    private static final int SEND_INTERVAL = 1000;
     private static final int WRITE_INTERVAL = 100;
 
-    @Override
+    private short[] params = new short[]{1111, 121, 3232, 0, 1, 0, 1, 0, 1, 0, 1, 0};
+    List<Short> paramList = S7control.getinstance().ReadWord("DB100.DBW", 12);
 
+// 灏嗗垪琛ㄤ腑鐨勫�煎鍒跺埌 params 鏁扮粍涓�
+
+
+    @Override
     public void run() {
         try {
             // 鍙戦�佷竴娆℃秷鎭�
-            sendMessages();
+//            sendMessages();
 
             // 寤惰繜涓�娈垫椂闂�
-            Thread.sleep(SEND_INTERVAL);
+
 
             while (true) {
                 // 鍐欏叆PLC
@@ -37,10 +43,8 @@
     private void sendMessages() {
         WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter");
         if (sendwServer != null) {
-            List<Short> paramlist = S7control.getinstance().ReadWord("DB100.DBW", 12);
             JSONObject jsonObject = new JSONObject();
-//            new short[]{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0}
-            jsonObject.append("params", new short[]{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0});
+            jsonObject.append("params", params);
             sendwServer.sendMessage(jsonObject.toString());
         }
     }
@@ -70,6 +74,13 @@
                     }
                 }
 
+                // 鏇挎崲鍒濆鍙橀噺鐨勫��
+                for (int i = 0; i < messageValues.size(); i++) {
+                    if (i < params.length) {
+                        params[i] = messageValues.get(i);
+                    }
+                }
+
                 // 灏嗘秷鎭�煎啓鍏� PLC
                 S7control.getinstance().WriteWord(addressList, messageValues);
                 System.out.println("messageValues锛�" + messageValues);

--
Gitblit v1.8.0