From 9914665c07159fc0e4b9a3c88fb2db67548da44f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 07 九月 2023 17:12:23 +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 | 175 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 93 insertions(+), 82 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 b7c1ae4..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,82 +1,93 @@
-package com.example.springboot.component;
-
-import cn.hutool.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PlcParameter extends Thread {
- private static final int SEND_INTERVAL = 10000;
- private static final int WRITE_INTERVAL = 100;
-
- @Override
-
- public void run() {
- try {
- // 鍙戦�佷竴娆℃秷鎭�
- sendMessages();
-
- // 寤惰繜涓�娈垫椂闂�
- Thread.sleep(SEND_INTERVAL);
-
- while (true) {
- // 鍐欏叆PLC
- writeToPlc();
- Thread.sleep(WRITE_INTERVAL);
-
- // 鍙戦�佹秷鎭�
- sendMessages();
- Thread.sleep(SEND_INTERVAL);
- }
-
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- 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});
- sendwServer.sendMessage(jsonObject.toString());
- }
- }
-
- private void writeToPlc() {
- WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Parameter");
- if (webSocketServer != null) {
- List<String> messages = webSocketServer.getMessages();
-
- String addressList = "DB100.DBW0";
-
- if (!messages.isEmpty()) {
- // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
- String lastMessage = messages.get(messages.size() - 1);
- System.out.println("messages锛�" + messages);
- String[] parts = lastMessage.split(",");
- List<Short> messageValues = new ArrayList<>();
- for (String part : parts) {
- try {
- // 浣跨敤姝ｅ垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
- String cleanedPart = part.replaceAll("[^0-9-]", "");
- short value = Short.parseShort(cleanedPart.trim());
- messageValues.add(value);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- e.printStackTrace();
- }
- }
-
- // 灏嗘秷鎭�煎啓鍏� PLC
- S7control.getinstance().WriteWord(addressList, messageValues);
- System.out.println("messageValues锛�" + messageValues);
- System.out.println("addressList锛�" + addressList);
- // 娓呯┖娑堟伅鍒楄〃
- webSocketServer.clearMessages();
- }
- }
- }
-}
+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 = 1000;
+ private static final int WRITE_INTERVAL = 100;
+
+ 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();
+
+ // 寤惰繜涓�娈垫椂闂�
+
+
+ while (true) {
+ // 鍐欏叆PLC
+ writeToPlc();
+ Thread.sleep(WRITE_INTERVAL);
+
+ // 鍙戦�佹秷鎭�
+ sendMessages();
+ Thread.sleep(SEND_INTERVAL);
+ }
+
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private void sendMessages() {
+ WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter");
+ if (sendwServer != null) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("params", params);
+ sendwServer.sendMessage(jsonObject.toString());
+ }
+ }
+
+ private void writeToPlc() {
+ WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Parameter");
+ if (webSocketServer != null) {
+ List<String> messages = webSocketServer.getMessages();
+
+ String addressList = "DB100.DBW0";
+
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
+ System.out.println("messages锛�" + messages);
+ String[] parts = lastMessage.split(",");
+ List<Short> messageValues = new ArrayList<>();
+ for (String part : parts) {
+ try {
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
+ String cleanedPart = part.replaceAll("[^0-9-]", "");
+ short value = Short.parseShort(cleanedPart.trim());
+ messageValues.add(value);
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ e.printStackTrace();
+ }
+ }
+
+ // 鏇挎崲鍒濆鍙橀噺鐨勫��
+ 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);
+ System.out.println("addressList锛�" + addressList);
+ // 娓呯┖娑堟伅鍒楄〃
+ webSocketServer.clearMessages();
+ }
+ }
+ }
+}
--
Gitblit v1.8.0