From 1de312a18d164c2fa3718a1a975b8c5804723bcf Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期一, 27 十一月 2023 13:46:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
index bfdf656..fc93c23 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
@@ -80,11 +80,23 @@
// System.out.println(stt);
// List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
// List<Short> state = S7control.getinstance().ReadWord("DB103.0", 10);
- Short[] values1 = { 1, 1, 1, 1, 1, 1, 2, 33, 2, 3, 4, 5 };
+ Short[] values1 = { 1231, 1, 1, 1, 1, 1, 2, 33, 2, 3, 4, 5 };
List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
Short[] values2 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
List<Short> state = new ArrayList<>(Arrays.asList(values2));
+
+ Boolean[] values = { false, true, true, true, true, true, true, true, true,
+ true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+ true, false, true };
+ List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
+
+ short[] sholist = new short[paramlist.size()];
+
+ for (int i = 0; i < paramlist.size(); i++) {
+ boolean value = paramlist.get(i);
+ sholist[i] = value ? (short) 1 : (short) 0;
+ }
JSONObject jsonObject = new JSONObject();
// new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
@@ -92,6 +104,7 @@
jsonObject.append("params", arraylist);
jsonObject.append("state", state);
+ jsonObject.append("action", sholist);
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter");
if (sendwServer != null) {
sendwServer.sendMessage(jsonObject.toString());
@@ -123,7 +136,7 @@
}
// 灏嗘秷鎭�煎啓鍏� PLC
- S7control.getinstance().WriteWord(addressList, messageValues);
+// S7control.getinstance().WriteWord(addressList, messageValues);
System.out.println("messageValues锛�" + messageValues);
System.out.println("addressList锛�" + addressList);
// 娓呯┖娑堟伅鍒楄〃
--
Gitblit v1.8.0