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/PlcManualonePosition.java | 161 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 106 insertions(+), 55 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
index d0351de..0f643e0 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
@@ -39,7 +39,7 @@
JSONObject jsonObject = new JSONObject(str);
// 鑾峰彇json涓殑鍊�
- JSONArray address = jsonObject.getJSONArray("ServoManualone");
+ JSONArray address = jsonObject.getJSONArray("ManualonePosition");
for (int i = 0; i < address.size(); i++) {
JSONObject ress = (JSONObject) address.get(i);
@@ -73,26 +73,26 @@
List<String> addresses = new ArrayList<>();
addresses.add("DB100.108");
addresses.add("DB100.20");
- addresses.add("DB103.52");
+ addresses.add("DB103.32");
List<Short> arraylist = S7control.getinstance().readWords(addresses);
// System.out.println(arraylist);
List<String> addresses2 = new ArrayList<>();
addresses2.add("DB100.110");
addresses2.add("DB100.176");
- addresses2.add("DB103.54");
+ addresses2.add("DB103.34");
List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
List<String> addresses3 = new ArrayList<>();
addresses3.add("DB100.112");
addresses3.add("DB100.24");
- addresses3.add("DB103.56");
+ addresses3.add("DB103.36");
List<Short> arraylist3 = S7control.getinstance().readWords(addresses3);
List<String> addresses4 = new ArrayList<>();
addresses4.add("DB100.114");
addresses4.add("DB100.178");
- addresses4.add("DB103.60");
+ addresses4.add("DB103.40");
List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);
List<Short> arraylist5 = S7control.getinstance().ReadWord("DB103.40", 1);
@@ -100,13 +100,50 @@
List<Short> arraylist7 = S7control.getinstance().ReadWord("DB103.48", 1);
List<Short> arraylist8 = S7control.getinstance().ReadWord("DB103.50", 1);
List<String> addresses9 = new ArrayList<>();
- addresses9.add("DB104.24");
- addresses9.add("DB104.26");
- addresses9.add("DB104.20");
- addresses9.add("DB104.22");
- addresses9.add("DB104.28");
- addresses9.add("DB104.30");
- List<Short> arraylist9 = S7control.getinstance().readWords(addresses9);
+ addresses9.add("DB104.1.2");
+ addresses9.add("DB104.1.3");
+ addresses9.add("DB104.1.6");
+ addresses9.add("DB104.1.7");
+ List<Boolean> arraylist9 = S7control.getinstance().readBits(addresses9);
+
+ List<String> addresses10 = new ArrayList<>();
+ addresses10.add("DB104.9.4");
+ addresses10.add("DB104.9.5");
+ addresses10.add("DB104.9.4");
+ addresses10.add("DB104.9.5");
+ List<Boolean> arraylist10 = S7control.getinstance().readBits(addresses10);
+ // Short[] values1 = { 1, 2, 3 };
+ // List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+ // Short[] values2 = { 1, 2, 3 };
+ // List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
+ // Short[] values3 = { 1, 2, 3 };
+ // List<Short> arraylist3 = new ArrayList<>(Arrays.asList(values3));
+ // Short[] values4 = { 1, 2, 3 };
+ // List<Short> arraylist4 = new ArrayList<>(Arrays.asList(values4));
+ // Short[] values5 = { 5 };
+ // List<Short> arraylist5 = new ArrayList<>(Arrays.asList(values5));
+ // Short[] values6 = { 6 };
+ // List<Short> arraylist6 = new ArrayList<>(Arrays.asList(values6));
+ // Short[] values7 = { 7 };
+ // List<Short> arraylist7 = new ArrayList<>(Arrays.asList(values7));
+ // Short[] values8 = { 8 };
+ // List<Short> arraylist8 = new ArrayList<>(Arrays.asList(values8));
+ // Boolean[] values9 = { false, false, true, true };
+ // List<Boolean> arraylist9 = new ArrayList<>(Arrays.asList(values9));
+ short[] params2 = new short[arraylist9.size()];
+ for (int i = 0; i < arraylist9.size(); i++) {
+ boolean value = arraylist9.get(i);
+ params2[i] = value ? (short) 1 : (short) 0;
+ }
+
+ // Boolean[] values10 = { false, false, true, true };
+ // List<Boolean> arraylist10 = new ArrayList<>(Arrays.asList(values10));
+ short[] params3 = new short[arraylist10.size()];
+ for (int i = 0; i < arraylist10.size(); i++) {
+ boolean value = arraylist10.get(i);
+ params3[i] = value ? (short) 1 : (short) 0;
+ }
+ // List<Short> arraylist9 = S7control.getinstance().readWords(addresses9);
arraylist5.addAll(arraylist6);
arraylist5.addAll(arraylist7);
arraylist5.addAll(arraylist8);
@@ -118,7 +155,8 @@
jsonObject.append("zuhe3", arraylist3);
jsonObject.append("zuhe4", arraylist4);
jsonObject.append("shishi1", arraylist5);
- jsonObject.append("guzhang", arraylist9);
+ jsonObject.append("guzhang", params2);
+ jsonObject.append("weihuiling", params3);
// jsonObject.append("weihuiling", arraylist8);
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
@@ -132,27 +170,27 @@
List<String> waddresses1 = new ArrayList<>();
waddresses1.add("DB100.108");
waddresses1.add("DB100.20");
- waddresses1.add("DB103.52");
+ waddresses1.add("DB103.32");
List<String> waddresses2 = new ArrayList<>();
waddresses2.add("DB100.110");
waddresses2.add("DB100.176");
- waddresses2.add("DB103.54");
+ waddresses2.add("DB103.34");
List<String> waddresses3 = new ArrayList<>();
waddresses3.add("DB100.112");
waddresses3.add("DB100.24");
- waddresses3.add("DB103.56");
+ waddresses3.add("DB103.36");
List<String> waddresses4 = new ArrayList<>();
waddresses4.add("DB100.114");
waddresses4.add("DB100.178");
- waddresses4.add("DB103.60");
+ waddresses4.add("DB103.40");
// 鏁呴殰鍦板潃
List<String> waddresses5 = new ArrayList<>();
- waddresses5.add("DB103.244");
- waddresses5.add("DB103.250");
+ // waddresses5.add("DB103.244");
+ // waddresses5.add("DB103.250");
waddresses5.add("DB103.252");
waddresses5.add("DB103.254");
@@ -165,10 +203,12 @@
// 鍥為浂鍦板潃
List<String> waddresses7 = new ArrayList<>();
+
waddresses7.add("DB101.4.5");
waddresses7.add("DB101.4.7");
- System.out.println(messages.isEmpty());
+
+ // System.out.println(messages.isEmpty());
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
String lastMessage = messages.get(messages.size() - 1);
@@ -194,12 +234,18 @@
}
if (!sValue.isEmpty()) {
S7control.getinstance().WriteWord(waddresses1, sValue);
+ List<String> A01start = new ArrayList<>();
+ A01start.add("DB101.2.2");
+ 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);
}
}
// 鍐欏叆A02
- if (messageArray.getJSONArray(1).size() > 0) {
+
+ if ( messageArray.getJSONArray(1).size() > 0) {
JSONArray jsonArray = messageArray.getJSONArray(1);
List<Short> sValue2 = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
@@ -218,6 +264,11 @@
}
if (!sValue2.isEmpty()) {
S7control.getinstance().WriteWord(waddresses2, sValue2);
+ List<String> A02start = new ArrayList<>();
+ A02start.add("DB101.2.3");
+ Boolean[] a02values7 = { true};
+ List<Boolean> a01startval = new ArrayList<>(Arrays.asList(a02values7));
+ S7control.getinstance().WriteBit(A02start, a01startval);
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses2);
}
}
@@ -241,7 +292,12 @@
}
}
if (!sValue2.isEmpty()) {
- S7control.getinstance().WriteWord(waddresses2, sValue2);
+ S7control.getinstance().WriteWord(waddresses3, sValue2);
+ List<String> B01start = new ArrayList<>();
+ B01start.add("DB101.2.4");
+ Boolean[]B01values7 = { true};
+ List<Boolean> B01startval = new ArrayList<>(Arrays.asList(B01values7));
+ S7control.getinstance().WriteBit(B01start, B01startval);
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses3);
}
}
@@ -265,7 +321,12 @@
}
}
if (!sValue2.isEmpty()) {
- S7control.getinstance().WriteWord(waddresses2, sValue2);
+ S7control.getinstance().WriteWord(waddresses4, sValue2);
+ List<String> B02start = new ArrayList<>();
+ B02start.add("DB101.2.5");
+ Boolean[] B02values7 = { true};
+ List<Boolean> B02startval = new ArrayList<>(Arrays.asList(B02values7));
+ S7control.getinstance().WriteBit(B02start, B02startval);
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses4);
}
}
@@ -296,59 +357,49 @@
// 鍐欏叆澶嶄綅鍦板潃
if (messageArray.getJSONArray(5).size() > 0) {
- JSONArray jsonArray = messageArray.getJSONArray(5);
- List<Short> sValue2 = new ArrayList<>();
- List<Boolean> messageBooleans = new ArrayList<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- Object value = jsonArray.get(i);
+ JSONArray jsonArray3 = messageArray.getJSONArray(5);
+ List<Boolean> sValue3 = new ArrayList<>();
+ for (int i = 0; i < jsonArray3.size(); i++) {
+ Object value = jsonArray3.get(i);
if (value != null && !value.toString().equals("null")) {
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short val = Short.parseShort(cleanedValue.trim());
- sValue2.add(val);
- // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
- for (short values : sValue2) {
- messageBooleans.add(values == 1 ? true : false);
- }
- System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue3.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
} catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
}
}
}
- if (!messageBooleans.isEmpty()) {
- // S7control.getinstance().WriteWord(waddresses6, messageBooleans);
- System.out.println("Values " + messageBooleans + " written to PLC at address " + waddresses6);
+ if (!sValue3.isEmpty()) {
+ S7control.getinstance().WriteBit(waddresses6, sValue3);
+ System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses6);
}
}
// 鍐欏叆鍥為浂鍦板潃
if (messageArray.getJSONArray(6).size() > 0) {
- JSONArray jsonArray = messageArray.getJSONArray(6);
- List<Short> sValue2 = new ArrayList<>();
- List<Boolean> messageBooleans = new ArrayList<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- Object value = jsonArray.get(i);
+ JSONArray jsonArray3 = messageArray.getJSONArray(6);
+ List<Boolean> sValue3 = new ArrayList<>();
+ for (int i = 0; i < jsonArray3.size(); i++) {
+ Object value = jsonArray3.get(i);
if (value != null && !value.toString().equals("null")) {
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short val = Short.parseShort(cleanedValue.trim());
- sValue2.add(val);
- // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
- for (short values : sValue2) {
- messageBooleans.add(values == 1 ? true : false);
- }
- System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue3.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
} catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
}
}
}
- if (!messageBooleans.isEmpty()) {
- S7control.getinstance().WriteBit(waddresses7, messageBooleans);
- System.out.println("Values " + messageBooleans + " written to PLC at address " + waddresses7);
+ if (!sValue3.isEmpty()) {
+ S7control.getinstance().WriteBit(waddresses7, sValue3);
+ System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses7);
}
}
--
Gitblit v1.8.0