From 707d28bd18f8832ac3824af4ae6f50dc1a30ee41 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期三, 29 十一月 2023 11:02:50 +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 | 18 ++++++++++++++++--
1 files changed, 16 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..08e7f66 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,24 @@
// 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 +105,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 +137,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