From 75375a0f68c8b91799482dc1cd2ec7d7f211167f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 31 五月 2024 09:28:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java | 427 ++++++++++++++++++++++++++--------------------------
1 files changed, 212 insertions(+), 215 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
index 1388c26..a7545da 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
@@ -2,6 +2,8 @@
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+
import com.google.common.primitives.Bytes;
import org.apache.commons.io.FileUtils;
@@ -9,9 +11,8 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-
+@Slf4j
public class PlcServoManualone extends Thread {
-
// 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
private Configuration config;
@@ -19,12 +20,11 @@
// 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
MessageHandler customS7Control = new MessageHandler();
-
public PlcServoManualone() throws IOException {
config = new Configuration("config.properties");
}
- //灏嗗竷灏斿垪琛ㄨ浆鎹负浜岃繘鍒剁殑 short 鏁扮粍
+ // 灏嗗竷灏斿垪琛ㄨ浆鎹负浜岃繘鍒剁殑 short 鏁扮粍
public static class PLCBooleanConverter {
public static short[] convertListsToBinaryShortArray(List<Boolean>... lists) {
@@ -52,7 +52,7 @@
}
}
- //璇诲彇id
+ // 璇诲彇id
public StringBuilder queGlassid(String address, int count) {
StringBuilder writedstrIdOut = new StringBuilder();
byte[] writedglassidbytesOut = S7control.getinstance().ReadByte(address, count);
@@ -65,226 +65,223 @@
return writedstrIdOut;
}
-
@Override
public void run() {
while (this != null) {
try {
Thread.sleep(1000);
+ // A01缁勫悎涓湴鍧�琛ㄩ泦鍚�
+ List<String> addresses = Arrays.asList(config.getProperty("A01.addresses").split(","));
+ // System.out.println(addresses);
+ List<Short> arraylist = S7control.getinstance().readWords(addresses);
+
+ // A02缁勫悎涓湴鍧�琛ㄩ泦鍚�
+ List<String> addresses2 = Arrays.asList(config.getProperty("A02.addresses").split(","));
+ List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
+
+ // A01缈昏浆鍦板潃
+ List<String> addresses3 = Arrays.asList(config.getProperty("A01.flipAddress"));
+ List<Short> arraylist3 = S7control.getinstance().readWords(addresses3);
+
+ // A02缈昏浆鍦板潃
+ List<String> addresses4 = Arrays.asList(config.getProperty("A02.flipAddress"));
+
+ List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);
+ // B01缁勫悎涓湴鍧�
+ String b01Address = config.getProperty("B01.address");
+ List<Short> arraylist5 = S7control.getinstance().ReadWord(b01Address, 2);
+ // B02缁勫悎鍦板潃
+ String b02Address = config.getProperty("B02.address");
+ List<Short> arraylist6 = S7control.getinstance().ReadWord(b02Address, 2);
+ // System.out.println(b02Address);
+ // 鎵�鏈夋晠闅滄寜閽湴鍧�
+ List<String> addresses7 = Arrays.asList(config.getProperty("faultButtonAddresses").split(","));
+ List<Boolean> arraylist7 = S7control.getinstance().readBits(addresses7);
+
+ // A01鍚姩鍦板潃
+ List<String> A01start = Arrays.asList(config.getProperty("A01start"));
+ // A02鍚姩鍦板潃
+ List<String> A02start = Arrays.asList(config.getProperty("A02start"));
+ // A01鍗婅嚜鍔ㄥ湴鍧�
+ List<String> A01Bstart = Arrays.asList(config.getProperty("A01Bstart"));
+ // A02鍗婅嚜鍔ㄥ湴鍧�
+ List<String> A02Bstart = Arrays.asList(config.getProperty("A02Bstart"));
+ //
+ List<String> abortresumeTasks = Arrays.asList(config.getProperty("abortresumeTasks"));
+ // 鍥為浂鎸夐挳鍦板潃
+ List<String> waddresses4 = Arrays.asList(config.getProperty("HomedButtonAddresses").split(","));
+ // 鎵�鏈夊浣嶆寜閽湴鍧�
+ List<String> Reset = Arrays.asList(config.getProperty("resetButtonAddresses").split(","));
+ // System.out.println(Reset);
+ // 鎵�鏈夋湭鍥為浂鎸夐挳鍦板潃
+ List<String> addresses8 = Arrays.asList(config.getProperty("notHomedButtonAddresses").split(","));
+ // 杩涚墖id鍦板潃
+ String inputGlassIdAddress = config.getProperty("inputGlassIdAddress");
+ String outputGlassIdAddress = config.getProperty("outputGlassIdAddress");
+ StringBuilder queueid1 = queGlassid(inputGlassIdAddress, 14);
+ // 瀛樼墖id鍦板潃
+ StringBuilder queueid2 = queGlassid(outputGlassIdAddress, 14);
+ // A01 A02鍚姩 鍗婅嚜鍔ㄥ惎鍔�
+ List<Boolean> A01readstart = S7control.getinstance().readBits(A01start);
+ List<Boolean> A02readstart = S7control.getinstance().readBits(A02start);
+ List<Boolean> A01readBstart = S7control.getinstance().readBits(A01Bstart);
+ List<Boolean> A02readsBtart = S7control.getinstance().readBits(A02Bstart);
+
+ List<Boolean> resumeTasks = S7control.getinstance().readBits(abortresumeTasks);
+
+ short[] combinedBinaryShortArray = PLCBooleanConverter.convertListsToBinaryShortArray(
+ A01readBstart, A01readstart, A02readsBtart, A02readstart);
+
+ // 鍥為浂鍦板潃
+
+ List<Boolean> readhuiling = S7control.getinstance().readBits(waddresses4);
+ short[] huiling7 = PlcManualonePosition.PLCBooleanConverter.convertListsToBinaryShortArray(readhuiling);
+
+ // System.out.println(A01readBstart);
+
+ // 鎵�鏈夋晠闅滄寜閽浆鎹负1鍜�0
+ short[] params2 = new short[arraylist7.size()];
+ for (int i = 0; i < arraylist7.size(); i++) {
+ boolean value = arraylist7.get(i);
+ params2[i] = value ? (short) 1 : (short) 0;
+ }
+
+ // 鎬ュ仠涓鎸夐挳
+ short[] resumeTask = new short[resumeTasks.size()];
+ for (int i = 0; i < resumeTasks.size(); i++) {
+ boolean value = resumeTasks.get(i);
+ resumeTask[i] = value ? (short) 1 : (short) 0;
+ }
+
+ List<Boolean> Reset1 = S7control.getinstance().readBits(Reset);
+ // System.out.println(Reset1);
+ // 鎵�鏈夋晠闅滄寜閽浆鎹负1鍜�0
+ short[] rReset = new short[Reset1.size()];
+ for (int i = 0; i < Reset1.size(); i++) {
+ boolean value = Reset1.get(i);
+ rReset[i] = value ? (short) 1 : (short) 0;
+ }
+
+ // 鎵�鏈夋湭鍥為浂鎸夐挳杞崲涓�1鍜�0
+ List<Boolean> arraylist8 = S7control.getinstance().readBits(addresses8);
+ short[] params = new short[arraylist8.size()];
+ for (int i = 0; i < arraylist8.size(); i++) {
+ boolean value = arraylist8.get(i);
+ params[i] = value ? (short) 1 : (short) 0;
+ }
+
+ // Short[] values1 = { 1, 2, 3, 4, 5, 6, 7};
+ // List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+ // Short[] values2 = { 1, 2, 3, 4, 5};
+ // List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
+ //
+ // Short[] values3 = {1};
+ // List<Short> arraylist3 = new ArrayList<>(Arrays.asList(values3));
+ // Short[] values4 = {2};
+ // List<Short> arraylist4 = new ArrayList<>(Arrays.asList(values4));
+ // Short[] values5 = {3,3};
+ // List<Short> arraylist5 = new ArrayList<>(Arrays.asList(values5));
+ // Short[] values6 = { 4,4};
+ // List<Short> arraylist6 = new ArrayList<>(Arrays.asList(values6));
+ // Boolean[] values7 = { false, true, true, true, true, true};
+ // List<Boolean> arraylist7 = new ArrayList<>(Arrays.asList(values7));
+ // Boolean[] values8 = { false, true, true, true, true, true};
+ // List<Boolean> arraylist8 = new ArrayList<>(Arrays.asList(values8));
+ //
+ // String queueid1 = "x1234567890123";
+ // String queueid2 = "x1234567890123";
+ //
+ // short[] params2 = new short[arraylist7.size()];
+ // for (int i = 0; i < arraylist7.size(); i++) {
+ // boolean value = arraylist7.get(i);
+ // params2[i] = value ? (short) 1 : (short) 0;
+ // }
+ //
+ //
+ // short[] params = new short[arraylist8.size()];
+ // for (int i = 0; i < arraylist8.size(); i++) {
+ // boolean value = arraylist8.get(i);
+ // params[i] = value ? (short) 1 : (short) 0;
+ // }
+
+ JSONObject jsonObject = new JSONObject();
+
+ jsonObject.append("zuhe1", arraylist);
+ jsonObject.append("zuhe2", arraylist2);
+ jsonObject.append("zuhe3", arraylist3);
+ jsonObject.append("zuhe4", arraylist4);
+ jsonObject.append("zuhe5", arraylist5);
+ jsonObject.append("zuhe6", arraylist6);
+ jsonObject.append("guzhang", params2);
+ jsonObject.append("weihuiling", params);
+ jsonObject.append("jinpianid", queueid1);
+ jsonObject.append("qupianid", queueid2);
+ jsonObject.append("fuwei", rReset);
+ jsonObject.append("qidong", combinedBinaryShortArray);
+ jsonObject.append("huiling", huiling7);
+
+ jsonObject.append("resumeTasks", resumeTask);
+
+ // WebSocketServer sendwServer =
+ // WebSocketServer.sessionMap.get("ServoManualone");
+ // if (sendwServer != null) {
+ // sendwServer.sendMessage(jsonObject.toString());
+ // }
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("ServoManualone");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+
+
+ if (webserver != null&&webserver.session.isOpen()) {
+ webserver.sendMessage(jsonObject.toString());
+ List<String> messages = webserver.getMessages();
+
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
+ // System.out.println("lastMessage锛�" + lastMessage);
+ JSONArray messageArray = new JSONArray(lastMessage);
+
+ // 鍐欏叆AO1缁勫悎
+ customS7Control.WriteWordToPLC(messageArray, addresses, 0);
+
+ // 鍐欏叆AO2缁勫悎
+ customS7Control.WriteWordToPLC(messageArray, addresses2, 1);
+
+ // 澶嶄綅鎸夐挳鍐欏叆
+ customS7Control.writeBitToPLC(messageArray, Reset, 2);
+
+ // 鍥為浂鎸夐挳鍐欏叆
+ customS7Control.writeBitToPLC(messageArray, waddresses4, 3);
+
+ // 杩涚墖ID鍐欏叆
+ customS7Control.writeStringToPLC(messageArray, inputGlassIdAddress, 4);
+ // 鍙栫墖ID鍐欏叆
+ customS7Control.writeStringToPLC(messageArray, outputGlassIdAddress, 5);
+
+ // A01鍗婅嚜鍔�
+ customS7Control.writeBitToPLC(messageArray, A01Bstart, 6);
+ // A02鍗婅嚜鍔�
+ customS7Control.writeBitToPLC(messageArray, A02Bstart, 7);
+ // A01鍗婅嚜鍔ㄥ惎鍔�
+ customS7Control.writeBitToPLC(messageArray, A01start, 8);
+ // A02鍗婅嚜鍔ㄥ惎鍔�
+ customS7Control.writeBitToPLC(messageArray, A02start, 9);
+
+ // 娓呯┖娑堟伅鍒楄〃
+ webserver.clearMessages();
+ }
+ }else{
+ log.info("ServoManualone is closed");
+ }
+ }
+ }
} catch (InterruptedException e) {
e.printStackTrace();
}
-
-//A01缁勫悎涓湴鍧�琛ㄩ泦鍚�
- List<String> addresses = Arrays.asList(config.getProperty("A01.addresses").split(","));
- //System.out.println(addresses);
-
- List<Short> arraylist = S7control.getinstance().readWords(addresses);
-
-//A02缁勫悎涓湴鍧�琛ㄩ泦鍚�
- List<String> addresses2 = Arrays.asList(config.getProperty("A02.addresses").split(","));
- List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
-
- //A01缈昏浆鍦板潃
- List<String> addresses3 = Arrays.asList(config.getProperty("A01.flipAddress"));
- List<Short> arraylist3 = S7control.getinstance().readWords(addresses3);
-
- //A02缈昏浆鍦板潃
- List<String> addresses4 = Arrays.asList(config.getProperty("A02.flipAddress"));
-
- List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);
- //B01缁勫悎涓湴鍧�
- String b01Address = config.getProperty("B01.address");
- List<Short> arraylist5 = S7control.getinstance().ReadWord(b01Address, 2);
- //B02缁勫悎鍦板潃
- String b02Address = config.getProperty("B02.address");
- List<Short> arraylist6 = S7control.getinstance().ReadWord(b02Address, 2);
-// System.out.println(b02Address);
- // 鎵�鏈夋晠闅滄寜閽湴鍧�
- List<String> addresses7 = Arrays.asList(config.getProperty("faultButtonAddresses").split(","));
- List<Boolean> arraylist7 = S7control.getinstance().readBits(addresses7);
-
- //A01鍚姩鍦板潃
- List<String> A01start = Arrays.asList(config.getProperty("A01start"));
- //A02鍚姩鍦板潃
- List<String> A02start = Arrays.asList(config.getProperty("A02start"));
-//A01鍗婅嚜鍔ㄥ湴鍧�
- List<String> A01Bstart = Arrays.asList(config.getProperty("A01Bstart"));
- //A02鍗婅嚜鍔ㄥ湴鍧�
- List<String> A02Bstart = Arrays.asList(config.getProperty("A02Bstart"));
- //
- List<String> abortresumeTasks = Arrays.asList(config.getProperty("abortresumeTasks"));
- //鍥為浂鎸夐挳鍦板潃
- List<String> waddresses4 = Arrays.asList(config.getProperty("HomedButtonAddresses").split(","));
- // 鎵�鏈夊浣嶆寜閽湴鍧�
- List<String> Reset = Arrays.asList(config.getProperty("resetButtonAddresses").split(","));
-// System.out.println(Reset);
- // 鎵�鏈夋湭鍥為浂鎸夐挳鍦板潃
- List<String> addresses8 = Arrays.asList(config.getProperty("notHomedButtonAddresses").split(","));
- // 杩涚墖id鍦板潃
- String inputGlassIdAddress = config.getProperty("inputGlassIdAddress");
- String outputGlassIdAddress = config.getProperty("outputGlassIdAddress");
- StringBuilder queueid1 = queGlassid(inputGlassIdAddress, 14);
- // 瀛樼墖id鍦板潃
- StringBuilder queueid2 = queGlassid(outputGlassIdAddress, 14);
-//A01 A02鍚姩 鍗婅嚜鍔ㄥ惎鍔�
- List<Boolean> A01readstart = S7control.getinstance().readBits(A01start);
- List<Boolean> A02readstart = S7control.getinstance().readBits(A02start);
- List<Boolean> A01readBstart = S7control.getinstance().readBits(A01Bstart);
- List<Boolean> A02readsBtart = S7control.getinstance().readBits(A02Bstart);
-
- List<Boolean> resumeTasks = S7control.getinstance().readBits(abortresumeTasks);
-
- short[] combinedBinaryShortArray = PLCBooleanConverter.convertListsToBinaryShortArray(
- A01readBstart, A01readstart, A02readsBtart, A02readstart
- );
-
-// System.out.println(A01readBstart);
-
-// 鎵�鏈夋晠闅滄寜閽浆鎹负1鍜�0
- short[] params2 = new short[arraylist7.size()];
- for (int i = 0; i < arraylist7.size(); i++) {
- boolean value = arraylist7.get(i);
- params2[i] = value ? (short) 1 : (short) 0;
- }
-
-//鎬ュ仠涓鎸夐挳
- short[] resumeTask = new short[resumeTasks.size()];
- for (int i = 0; i < resumeTasks.size(); i++) {
- boolean value = resumeTasks.get(i);
- resumeTask[i] = value ? (short) 1 : (short) 0;
- }
-
- List<Boolean> Reset1 = S7control.getinstance().readBits(Reset);
- // System.out.println(Reset1);
-// 鎵�鏈夋晠闅滄寜閽浆鎹负1鍜�0
- short[] rReset = new short[Reset1.size()];
- for (int i = 0; i < Reset1.size(); i++) {
- boolean value = Reset1.get(i);
- rReset[i] = value ? (short) 1 : (short) 0;
- }
-
-
-//鎵�鏈夋湭鍥為浂鎸夐挳杞崲涓�1鍜�0
- List<Boolean> arraylist8 = S7control.getinstance().readBits(addresses8);
- short[] params = new short[arraylist8.size()];
- for (int i = 0; i < arraylist8.size(); i++) {
- boolean value = arraylist8.get(i);
- params[i] = value ? (short) 1 : (short) 0;
- }
-
-
-// Short[] values1 = { 1, 2, 3, 4, 5, 6, 7};
-// List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
-// Short[] values2 = { 1, 2, 3, 4, 5};
-// List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
-//
-// Short[] values3 = {1};
-// List<Short> arraylist3 = new ArrayList<>(Arrays.asList(values3));
-// Short[] values4 = {2};
-// List<Short> arraylist4 = new ArrayList<>(Arrays.asList(values4));
-// Short[] values5 = {3,3};
-// List<Short> arraylist5 = new ArrayList<>(Arrays.asList(values5));
-// Short[] values6 = { 4,4};
-// List<Short> arraylist6 = new ArrayList<>(Arrays.asList(values6));
-// Boolean[] values7 = { false, true, true, true, true, true};
-// List<Boolean> arraylist7 = new ArrayList<>(Arrays.asList(values7));
-// Boolean[] values8 = { false, true, true, true, true, true};
-// List<Boolean> arraylist8 = new ArrayList<>(Arrays.asList(values8));
-//
-// String queueid1 = "x1234567890123";
-// String queueid2 = "x1234567890123";
-//
-// short[] params2 = new short[arraylist7.size()];
-// for (int i = 0; i < arraylist7.size(); i++) {
-// boolean value = arraylist7.get(i);
-// params2[i] = value ? (short) 1 : (short) 0;
-// }
-//
-//
-// short[] params = new short[arraylist8.size()];
-// for (int i = 0; i < arraylist8.size(); i++) {
-// boolean value = arraylist8.get(i);
-// params[i] = value ? (short) 1 : (short) 0;
-// }
-
- JSONObject jsonObject = new JSONObject();
-
- jsonObject.append("zuhe1", arraylist);
- jsonObject.append("zuhe2", arraylist2);
- jsonObject.append("zuhe3", arraylist3);
- jsonObject.append("zuhe4", arraylist4);
- jsonObject.append("zuhe5", arraylist5);
- jsonObject.append("zuhe6", arraylist6);
- jsonObject.append("guzhang", params2);
- jsonObject.append("weihuiling", params);
- jsonObject.append("jinpianid", queueid1);
- jsonObject.append("qupianid", queueid2);
- jsonObject.append("fuwei", rReset);
- jsonObject.append("qidong", combinedBinaryShortArray);
- jsonObject.append("resumeTasks", resumeTask);
-
-
-// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ServoManualone");
-// if (sendwServer != null) {
-// sendwServer.sendMessage(jsonObject.toString());
-// }
-
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("ServoManualone");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- webserver.sendMessage(jsonObject.toString());
-
-
- if (webserver != null) {
- List<String> messages = webserver.getMessages();
-
-
- if (!messages.isEmpty()) {
- // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
- String lastMessage = messages.get(messages.size() - 1);
-// System.out.println("lastMessage锛�" + lastMessage);
- JSONArray messageArray = new JSONArray(lastMessage);
-
-
- // 鍐欏叆AO1缁勫悎
- customS7Control.WriteWordToPLC(messageArray, addresses, 0);
-
-
- // 鍐欏叆AO2缁勫悎
- customS7Control.WriteWordToPLC(messageArray, addresses2, 1);
-
-
- // 澶嶄綅鎸夐挳鍐欏叆
- customS7Control.writeBitToPLC(messageArray, Reset, 2);
-
- //鍥為浂鎸夐挳鍐欏叆
- customS7Control.writeBitToPLC(messageArray, waddresses4, 3);
-
- // 杩涚墖ID鍐欏叆
- customS7Control.writeStringToPLC(messageArray, inputGlassIdAddress, 4);
- //鍙栫墖ID鍐欏叆
- customS7Control.writeStringToPLC(messageArray, outputGlassIdAddress, 5);
-
- //A01鍗婅嚜鍔�
- customS7Control.writeBitToPLC(messageArray, A01Bstart, 6);
- //A02鍗婅嚜鍔�
- customS7Control.writeBitToPLC(messageArray, A02Bstart, 7);
- //A01鍗婅嚜鍔ㄥ惎鍔�
- customS7Control.writeBitToPLC(messageArray, A01start, 8);
- //A02鍗婅嚜鍔ㄥ惎鍔�
- customS7Control.writeBitToPLC(messageArray, A02start, 9);
-
-
-
- // 娓呯┖娑堟伅鍒楄〃
- webserver.clearMessages();
- }
- }
- }
- }
}
}
}
--
Gitblit v1.8.0