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/PlcParameter1.java | 48 +++++++++++++++++++++++-------------------------
1 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java
index 08b75b0..5e7007a 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java
@@ -66,20 +66,22 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
- // this.readValue();
- // String PlcAddress = this.name;
- // Integer Plccount = this.count;
+// this.readValue();
+// String PlcAddress = this.name;
+// Integer Plccount = this.count;
// System.out.println(stt);
- // List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
- // List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.8", 1);
- // List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.12", 1);
- Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
- List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
- Short[] fanzhuan = { 4 };
- List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
- Short[] xiaoche = { 5 };
- List<Short> xiaoche1 = new ArrayList<>(Arrays.asList(xiaoche));
+ List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
+ List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.8", 1);
+ List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.12", 1);
+// Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
+// List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+// Short[] fanzhuan = { 4 };
+// List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
+// Short[] xiaoche = {5};
+// List<Short> xiaoche1 = new ArrayList<>(Arrays.asList(xiaoche));
+
+
JSONObject jsonObject = new JSONObject();
// new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
@@ -90,16 +92,13 @@
jsonObject.append("xiaoche", xiaoche1);
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter1");
- // System.out.println(sendwServer);
if (sendwServer != null) {
sendwServer.sendMessage(jsonObject.toString());
}
WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Parameter1");
-
if (webSocketServer != null) {
List<String> messages = webSocketServer.getMessages();
- // System.out.println(messages);
String addressList1 = "DB100.0";
String addressList2 = "DB100.8";
String addressList3 = "DB100.12";
@@ -107,9 +106,9 @@
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
String lastMessage = messages.get(messages.size() - 1);
- // System.out.println("lastMessage锛�" + lastMessage);
+// System.out.println("lastMessage锛�" + lastMessage);
JSONArray messageArray = new JSONArray(lastMessage);
- // System.out.println(messageArray);
+
// 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
List<Short> mergedList = new ArrayList<>();
for (int i = 0; i < 3; i++) {
@@ -136,9 +135,8 @@
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
short sValue = Short.parseShort(cleanedValue.trim());
- // S7control.getinstance().WriteWord(addressList1, Arrays.asList(sValue));
- System.out
- .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList1);
+ S7control.getinstance().WriteWord(addressList1, Arrays.asList(sValue));
+ System.out.println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList1);
} catch (NumberFormatException e) {
// 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
@@ -153,9 +151,8 @@
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
short sValue = Short.parseShort(cleanedValue.trim());
- // S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
- System.out
- .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
+ S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
+ System.out.println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
} catch (NumberFormatException e) {
// 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
@@ -165,15 +162,16 @@
// 鍐欏叆绗笁涓湴鍧�
if (!mergedList.isEmpty()) {
- // S7control.getinstance().WriteWord(addressList3, mergedList);
+ S7control.getinstance().WriteWord(addressList3, mergedList);
System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList3);
}
// 娓呯┖娑堟伅鍒楄〃
webSocketServer.clearMessages();
}
+
- }
+ }
}
}
--
Gitblit v1.8.0