From 31101f632c27c05d15f30ca3084e3ed3da2a29af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 08 十二月 2023 11:42:08 +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 | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 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 4366a77..3ee0b87 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
@@ -154,6 +154,12 @@
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);
@@ -225,7 +231,7 @@
jsonObject.append("qupianid", queueid2);
jsonObject.append("fuwei", rReset);
jsonObject.append("qidong", combinedBinaryShortArray);
- jsonObject.append("resumeTasks", resumeTasks);
+ jsonObject.append("resumeTasks", resumeTask);
@@ -441,29 +447,29 @@
}
}
- if (messageArray.getJSONArray(8).size() > 0) {
- JSONArray jsonArray5 = messageArray.getJSONArray(8);
- List<Boolean> sValueb5 = new ArrayList<>();
- for (int i = 0; i < jsonArray5.size(); i++) {
- Object value = jsonArray5.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()) {
-
- S7control.getinstance().WriteBit(abortresumeTasks, sValueb5);
- System.out.println("Values " + sValueb5 + " written to PLC at address " + A02Bstart);
- }
- }
+// if (messageArray.getJSONArray(8).size() > 0 ) {
+// JSONArray jsonArray5 = messageArray.getJSONArray(8);
+// List<Boolean> sValueb5 = new ArrayList<>();
+// for (int i = 0; i < jsonArray5.size(); i++) {
+// Object value = jsonArray5.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()) {
+//
+// S7control.getinstance().WriteBit(abortresumeTasks, sValueb5);
+// System.out.println("Values " + sValueb5 + " written to PLC at address " + A02Bstart);
+// }
+// }
// 娓呯┖娑堟伅鍒楄〃
--
Gitblit v1.8.0