From 24385ce9fee382e9600ce03108a814a66990981c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 05 十二月 2023 08:10:09 +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 | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 152 insertions(+), 13 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 465dfe3..21ab755 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
@@ -79,7 +79,7 @@
e.printStackTrace();
}
-
+//A01缁勫悎涓湴鍧�琛ㄩ泦鍚�
List<String> addresses = new ArrayList<>();
addresses.add("DB103.32");
addresses.add("DB100.144");
@@ -95,7 +95,7 @@
// int insertIndex = 2;
// insertDataToList(arraylist, rangeAddress, insertIndex);
-
+//A02缁勫悎涓湴鍧�琛ㄩ泦鍚�
List<String> addresses2 = new ArrayList<>();
addresses2.add("DB103.26");
addresses2.add("DB100.188");
@@ -108,16 +108,23 @@
// int insertIndex2 = 4;
// insertDataToList(arraylist2, rangeAddress2, insertIndex2);
// System.out.println(arraylist2);
+
+ //A01缈昏浆鍦板潃
List<String> addresses3 = new ArrayList<>();
addresses3.add("DB103.42");
List<Short> arraylist3 = S7control.getinstance().readWords(addresses3);
+
+ //A02缈昏浆鍦板潃
List<String> addresses4 = new ArrayList<>();
addresses4.add("DB103.46");
List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);
-
+ //B01缁勫悎涓湴鍧�
List<Short> arraylist5 = S7control.getinstance().ReadWord("DB103.27", 2);
+ //B02缁勫悎鍦板潃
List<Short> arraylist6 = S7control.getinstance().ReadWord("DB103.29", 2);
+
+ // 鎵�鏈夋晠闅滄寜閽湴鍧�
List<String> addresses7 = new ArrayList<>();
addresses7.add("DB104.1.4");
addresses7.add("DB104.1.5");
@@ -127,13 +134,32 @@
addresses7.add("DB104.1.7");
List<Boolean> arraylist7 = S7control.getinstance().readBits(addresses7);
-
+// 鎵�鏈夋晠闅滄寜閽浆鎹负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;
}
+
+ // 鎵�鏈夊浣嶆寜閽湴鍧�
+ List<String> Reset = new ArrayList<>();
+ Reset.add("DB101.4.0");
+ Reset.add("DB101.4.3");
+ Reset.add("DB101.3.6");
+ Reset.add("DB101.4.1");
+ Reset.add("DB101.4.4");
+ Reset.add("DB101.4.6");
+ List<Boolean> Reset1 = S7control.getinstance().readBits(Reset);
+
+// 鎵�鏈夋晠闅滄寜閽浆鎹负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;
+ }
+
+ // 鎵�鏈夋湭鍥為浂鎸夐挳鍦板潃
List<String> addresses8 = new ArrayList<>();
addresses8.add("DB104.9.0");
addresses8.add("DB104.9.1");
@@ -148,8 +174,9 @@
params[i] = value ? (short) 1 : (short) 0;
}
-
+ // 杩涚墖id鍦板潃
StringBuilder queueid1 = queGlassid("DB100.148", 14);
+ // 瀛樼墖id鍦板潃
StringBuilder queueid2 = queGlassid("DB100.162", 14);
@@ -200,6 +227,7 @@
jsonObject.append("weihuiling", params);
jsonObject.append("jinpianid", queueid1);
jsonObject.append("qupianid", queueid2);
+ jsonObject.append("fuwei", rReset);
@@ -211,6 +239,7 @@
WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ServoManualone");
if (webSocketServer != null) {
List<String> messages = webSocketServer.getMessages();
+ // A01缁勫悎鍦板潃
List<String> waddresses1 = new ArrayList<>();
waddresses1.add("DB103.32");
waddresses1.add("DB100.144");
@@ -220,6 +249,7 @@
waddresses1.add("DB100.180");
waddresses1.add("DB100.182");
+ // A02缁勫悎鍦板潃
List<String> waddresses2 = new ArrayList<>();
waddresses2.add("DB103.26");
waddresses2.add("DB100.188");
@@ -227,6 +257,8 @@
waddresses2.add("DB100.146");
// waddresses2.add("DB100.162-175");
+
+ // 澶嶄綅鎸夐挳鍦板潃
List<String> waddresses3 = new ArrayList<>();
waddresses3.add("DB101.4.0");
waddresses3.add("DB101.4.3");
@@ -235,14 +267,12 @@
waddresses3.add("DB101.4.4");
waddresses3.add("DB101.4.6");
-
+ //鍥為浂鎸夐挳鍦板潃
List<String> waddresses4 = new ArrayList<>();
waddresses4.add("DB101.3.7");
waddresses4.add("DB101.4.2");
waddresses4.add("DB101.4.5");
waddresses4.add("DB101.4.7");
-
-
String waddresses5="DB100.148";
@@ -262,8 +292,8 @@
- // 鍐欏叆绗竴涓湴鍧�
- if (messageArray.getJSONArray(0).size() > 0) {
+ // 鍐欏叆AO1缁勫悎
+ if (messageArray.getJSONArray(0).size() > 0 ) {
JSONArray jsonArray = messageArray.getJSONArray(0);
List<Short> sValue = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
@@ -281,11 +311,21 @@
}
}
if (!sValue.isEmpty()) {
+
+
+
S7control.getinstance().WriteWord(waddresses1, sValue);
+ List<String> A01start = new ArrayList<>();
+ A01start.add("DB101.5.0");
+ Boolean[] a01values7 = { true};
+ List<Boolean> a01startval = new ArrayList<>(Arrays.asList(a01values7));
+ S7control.getinstance().WriteBit(A01start, a01startval);
System.out.println("Values " + sValue + " written to PLC at address " + waddresses1);
}
}
+
+ //// 鍐欏叆AO2缁勫悎
if (messageArray.getJSONArray(1).size() > 0) {
JSONArray jsonArray2 = messageArray.getJSONArray(1);
List<Short> sValue2 = new ArrayList<>();
@@ -305,12 +345,17 @@
}
if (!sValue2.isEmpty()) {
S7control.getinstance().WriteWord(waddresses2, sValue2);
+ List<String> A02start = new ArrayList<>();
+ A02start.add("DB101.5.1");
+ Boolean[] a02values7 = {true};
+ List<Boolean> a02startval = new ArrayList<>(Arrays.asList(a02values7));
+ S7control.getinstance().WriteBit(A02start, a02startval);
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses2);
}
}
-
+ // 澶嶄綅鎸夐挳鍐欏叆
if (messageArray.getJSONArray(2).size() > 0) {
JSONArray jsonArray3 = messageArray.getJSONArray(2);
List<Boolean> sValue3 = new ArrayList<>();
@@ -334,7 +379,7 @@
}
}
-
+ //鍥為浂鎸夐挳鍐欏叆
if (messageArray.getJSONArray(3).size() > 0) {
JSONArray jsonArray4 = messageArray.getJSONArray(3);
List<Boolean> sValue4 = new ArrayList<>();
@@ -358,6 +403,9 @@
}
}
+
+
+ //杩涚墖ID鍐欏叆
if (messageArray.getJSONArray(4).size() > 0) {
// JSONArray jsonArray5 = messageArray.getJSONArray(4);
String jsonArray5 = String.valueOf(messageArray.getJSONArray(4));
@@ -368,7 +416,7 @@
System.out.println("Values " + jsonArray5 + " written to PLC at address " + waddresses5);
}
}
-
+ // 瀛樼墖ID鍐欏叆
if (messageArray.getJSONArray(5).size() > 0) {
JSONArray jsonArray6 = messageArray.getJSONArray(5);
@@ -378,6 +426,97 @@
System.out.println("Values " + value2 + " written to PLC at address " + waddresses6);
}
}
+ if (messageArray.getJSONArray(6).size() > 0) {
+ JSONArray jsonArray4 = messageArray.getJSONArray(6);
+ List<Boolean> sValueb4 = new ArrayList<>();
+ for (int i = 0; i < jsonArray4.size(); i++) {
+ Object value = jsonArray4.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValueb4.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValueb4.isEmpty()) {
+
+ List<String> A01Bstart = new ArrayList<>();
+ A01Bstart.add("DB101.11.0");
+// Boolean[] a01values7 = {true};
+// List<Boolean> a01Bstartval = new ArrayList<>(Arrays.asList(a01values7));
+ S7control.getinstance().WriteBit(A01Bstart, sValueb4);
+ System.out.println("Values " + sValueb4 + " written to PLC at address " + A01Bstart);
+ }
+ }
+
+
+
+
+
+ if (messageArray.getJSONArray(7).size() > 0) {
+ JSONArray jsonArray4 = messageArray.getJSONArray(7);
+ List<Boolean> sValueb5 = new ArrayList<>();
+ for (int i = 0; i < jsonArray4.size(); i++) {
+ Object value = jsonArray4.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValueb5.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValueb5.isEmpty()) {
+
+ List<String> A02Bstart = new ArrayList<>();
+ A02Bstart.add("DB101.11.1");
+// Boolean[] a01values7 = {true};
+// List<Boolean> a01Bstartval = new ArrayList<>(Arrays.asList(a01values7));
+ S7control.getinstance().WriteBit(A02Bstart, sValueb5);
+ System.out.println("Values " + sValueb5 + " written to PLC at address " + A02Bstart);
+ }
+ }
+
+
+
+
+
+// if (messageArray.getJSONArray(6).size() > 0) {
+// JSONArray jsonArray6 = messageArray.getJSONArray(6);
+//
+// if (!jsonArray6.isEmpty()) {
+// String value2 = (String) jsonArray6.get(0);
+// List<String> A01Bstart = new ArrayList<>();
+// A01Bstart.add("DB101.11.0");
+// Boolean[] a01values7 = {true};
+// List<Boolean> a01Bstartval = new ArrayList<>(Arrays.asList(a01values7));
+// S7control.getinstance().WriteBit(A01Bstart, a01Bstartval);
+// System.out.println("Values " + value2 + " written to PLC at address " + waddresses6);
+// }
+// }
+
+// if (messageArray.getJSONArray(7).size() > 0) {
+// JSONArray jsonArray6 = messageArray.getJSONArray(7);
+//
+// if (!jsonArray6.isEmpty()) {
+// String value2 = (String) jsonArray6.get(0);
+// List<String> A02Bstart = new ArrayList<>();
+// A02Bstart.add("DB101.11.1");
+// Boolean[] a02values7 = {true};
+// List<Boolean> a02Bstartval = new ArrayList<>(Arrays.asList(a02values7));
+// S7control.getinstance().WriteBit(A02Bstart, a02Bstartval);
+// System.out.println("Values " + value2 + " written to PLC at address " + waddresses6);
+// }
+// }
// 娓呯┖娑堟伅鍒楄〃
webSocketServer.clearMessages();
--
Gitblit v1.8.0