From 6fe09273a5e6aec17f6f2d5a58058e975bba5e63 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 19 一月 2024 08:21:16 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcInteractionState.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcInteractionState.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcInteractionState.java
index 416ae25..4da5ad7 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcInteractionState.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcInteractionState.java
@@ -59,6 +59,9 @@
List<String> addresses5 = Arrays.asList(config.getProperty("PlcInteractionState.MEStaskinformation").split(","));
List<String> arraylist5 = S7control.getinstance().readStringsandword(addresses5);
+ List<String> addresses6 = Arrays.asList(config.getProperty("PlcInteractionState.MEStaskinformation2").split(","));
+ List<String> arraylist6 = S7control.getinstance().readStringsandword(addresses6);
+
// String[] values = { ".x11","x21 ","x21 ","x21 ","x21 ","x21"};
// List<String> arraylist = new ArrayList<>(Arrays.asList(values));
@@ -68,8 +71,12 @@
// List<String> arraylist3 = new ArrayList<>(Arrays.asList(values3));
// String[] values4 = { ".x11 ","x21 ","x21 ","x21 "};
// List<String> arraylist4 = new ArrayList<>(Arrays.asList(values4));
-// String[] values5 = { ".x11 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 "};
+// String[] values5 = { ".x11 ","x21 ","x21 ","b02","x21 ","x21 "};
// List<String> arraylist5 = new ArrayList<>(Arrays.asList(values5));
+//
+// String[] values6 = { "x21 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 "};
+// List<String> arraylist6 = new ArrayList<>(Arrays.asList(values6));
+
JSONObject jsonObject = new JSONObject();
@@ -80,6 +87,7 @@
jsonArray.put(arraylist3);
jsonArray.put(arraylist4);
jsonArray.put(arraylist5);
+ jsonArray.put(arraylist6);
jsonObject.put("zuhe1", jsonArray);
--
Gitblit v1.8.0