From 0417fafe757f09bfb166b1dd1d9f096e966a30d8 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期六, 11 五月 2024 09:38:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview.java | 219 +++++++++++++++++++++++++++---------------------------
1 files changed, 111 insertions(+), 108 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview.java
index 31a404a..f6e2f06 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview.java
@@ -26,9 +26,9 @@
this.storageCageService = storageCageService;
this.plcParameterObject = new PlcParameterObject();
this.plcBitObject = new PlcBitObject();
- // String jsonFilePath = "JsonFile/PlcParameter.json";
+ // String jsonFilePath = "/JsonFile/PlcParameter.json";
// InitUtil.initword(jsonFilePath); // 鍒濆鍖� PlcParameterObject
- // String jsonFilePath2 = "JsonFile/PlcSign.json";
+ // String jsonFilePath2 = "/JsonFile/PlcSign.json";
// InitUtil.initbit(jsonFilePath2); // 鍒濆鍖� PlcSign
@@ -49,18 +49,22 @@
e.printStackTrace();
}
+ byte[] getplcvlues = S7control.getinstance().ReadByte(plcParameterObject.getPlcAddressBegin(), plcParameterObject.getPlcAddressLength());
+
+ //byte[] getplcvlues = {0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02};
+
+ plcParameterObject.setPlcParameterList(getplcvlues);
-
- List<String> addresses = new ArrayList<>();
- addresses.add("A01turnAngle1");
- addresses.add("A01turnAngle2");
- addresses.add("A01turnAngle3");
- addresses.add("A01turnAngle4");
- addresses.add("A02turnAngle2");
- addresses.add("A02turnAngle3");
- addresses.add("A02turnAngle4");
- addresses.add("Minimumglasslength");
+// List<String> addresses = new ArrayList<>();
+// addresses.add("A01turnAngle1");
+// addresses.add("A01turnAngle2");
+// addresses.add("A01turnAngle3");
+// addresses.add("A01turnAngle4");
+// addresses.add("A02turnAngle2");
+// addresses.add("A02turnAngle3");
+// addresses.add("A02turnAngle4");
+// addresses.add("Minimumglasslength");
//Auto.addresses=DB100.0,DB100.2,DB100.4,DB100.6,DB100.26,DB100.28,DB100.30,DB100.32,DB100.34,DB100.36,DB100.38,DB100.40
@@ -73,7 +77,6 @@
Autoaddresses.add("A01A02conveyorVelocity(AutoFAST)");
Autoaddresses.add("A01A02conveyorVelocity(AutoSLOW)");
Autoaddresses.add("B01B02conveyorVelocity(Manual)");
-
Autoaddresses.add("B01B02conveyorVelocity(Max)");
Autoaddresses.add("B01B02conveyorVelocity(AutoFAST)");
Autoaddresses.add("B01B02conveyorVelocity(AutoSLOW)");
@@ -89,7 +92,7 @@
String addressList2 = "DB100.18";
String addressList3 = "DB100.22";
String addressList4 = "DB100.14";
-
+System.out.println(plcParameterObject.getPlcParameterValues(Autoaddresses));
@@ -108,104 +111,104 @@
JSONObject jsonObject = new JSONObject();
// new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
// new short[]{0,0, 0, 0, 0, 0, 0, 0, 0, 0}
-System.out.println(plcParameterObject.getPlcParameterValues(addresses));
- jsonObject.append("params", plcParameterObject.getPlcParameterValues(addresses));
- jsonObject.append("dache1", plcParameterObject.getPlcParameter("A01A02TRAVELPOSVelocityAUTO").getValue());
- jsonObject.append("xiaoche", plcParameterObject.getPlcParameter("B01B02TRAVELPOSVelocityAUTO").getValue());
- jsonObject.append("fanzhuan", plcParameterObject.getPlcParameter("A01A02TURNPOSVelocityAUTO").getValue());
- jsonObject.append("params2", plcParameterObject.getPlcParameterValues(Autoaddresses));
- jsonObject.append("fanzhuan2", plcParameterObject.getPlcParameter("A01A02TURNJOGVelocity").getValue());
- jsonObject.append("xiaoche2", plcParameterObject.getPlcParameter("B01B02TRAVELJOGVelocity").getValue());
+//System.out.println(plcParameterObject.getPlcParameterValues(addresses));
+ // jsonObject.append("params", plcParameterObject.getPlcParameterValues(addresses));
+// jsonObject.append("dache1", plcParameterObject.getPlcParameter("A01A02TRAVELPOSVelocityAUTO").getValue());
+// jsonObject.append("xiaoche", plcParameterObject.getPlcParameter("B01B02TRAVELPOSVelocityAUTO").getValue());
+// jsonObject.append("fanzhuan", plcParameterObject.getPlcParameter("A01A02TURNPOSVelocityAUTO").getValue());
+// jsonObject.append("params2", plcParameterObject.getPlcParameterValues(Autoaddresses));
+// jsonObject.append("fanzhuan2", plcParameterObject.getPlcParameter("A01A02TURNJOGVelocity").getValue());
+// jsonObject.append("xiaoche2", plcParameterObject.getPlcParameter("B01B02TRAVELJOGVelocity").getValue());
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- webserver.sendMessage(jsonObject.toString());
+// if (sendwServer != null) {
+// for (WebSocketServer webserver : sendwServer) {
+// webserver.sendMessage(jsonObject.toString());
// WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
- if (webserver != null) {
- List<String> messages = webserver.getMessages();
-
-
- if (!messages.isEmpty()) {
- // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
- String lastMessage = messages.get(messages.size() - 1);
- // System.out.println("lastMessage锛�" + lastMessage);
- JSONArray messageArray = new JSONArray(lastMessage);
-
- // 鏁村悎绗� 1 鍒� 2 涓暟缁勫苟鍘绘帀 null 鍏冪礌
- List<Short> mergedList = new ArrayList<>();
- for (int i = 0; i < 2; i++) {
- JSONArray sublist = messageArray.getJSONArray(i);
- for (int j = 0; j < sublist.size(); j++) {
- Object value = sublist.get(j);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short sValue = Short.parseShort(cleanedValue.trim());
- mergedList.add(sValue);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
- }
- System.out.println(messageArray);
- // 鍐欏叆绗竴涓湴鍧�
- customS7Control.WriteWordsToPLC(messageArray, addressList2,2);
- // 鍐欏叆绗簩涓湴鍧�
- customS7Control.WriteWordsToPLC(messageArray, addressList3,3);
- // 鍐欏叆绗笁涓湴鍧�
- customS7Control.WriteWordsToPLC(messageArray, addressList4,4);
- // 鍐欏叆绗洓涓湴鍧�
- if (!mergedList.isEmpty()) {
- S7control.getinstance().WriteWord(addressList1, mergedList);
- System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList1);
- }
-
- //List<String> waddresses1 = Arrays.asList(config.getProperty("Auto.shusong").split(","));
- String addressList22 = "DB100.8";
- String addressList33 = "DB100.12";
- if (!messages.isEmpty()) {
- // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
- // 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
- List<Short> mergedList2 = new ArrayList<>();
- for (int i = 5; i < 8; i++) {
- JSONArray sublist = messageArray.getJSONArray(i);
- for (int j = 0; j < sublist.size(); j++) {
- Object value = sublist.get(j);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short sValue = Short.parseShort(cleanedValue.trim());
- mergedList2.add(sValue);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
- }
-
- // 鍐欏叆绗紞涓湴鍧�
- customS7Control.WriteWordsToPLC(messageArray, addressList22,8);
- // 鍐欏叆绗叚涓湴鍧�
- customS7Control.WriteWordsToPLC(messageArray, addressList33,9);
- // 鍐欏叆绗竷涓湴鍧�
- // plcParameterObject.getPlcParameter("conveyorVelocity(AutoFAST)").getAddress(index)
- if (!mergedList2.isEmpty()) {
- //S7control.getinstance().WriteWord(plcParameterObject.getPlcParameter(Autoaddresses), mergedList2);
- // System.out.println("messageValue锛�" + mergedList2 + " written to PLC at address " + waddresses1);
- }
- // 娓呯┖娑堟伅鍒楄〃
- webserver.clearMessages();
- }
- }
- }
-
- }
- }
+// if (webserver != null) {
+// List<String> messages = webserver.getMessages();
+//
+//
+// if (!messages.isEmpty()) {
+// // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+// String lastMessage = messages.get(messages.size() - 1);
+// // System.out.println("lastMessage锛�" + lastMessage);
+// JSONArray messageArray = new JSONArray(lastMessage);
+//
+// // 鏁村悎绗� 1 鍒� 2 涓暟缁勫苟鍘绘帀 null 鍏冪礌
+// List<Short> mergedList = new ArrayList<>();
+// for (int i = 0; i < 2; i++) {
+// JSONArray sublist = messageArray.getJSONArray(i);
+// for (int j = 0; j < sublist.size(); j++) {
+// Object value = sublist.get(j);
+// if (value != null && !value.toString().equals("null")) {
+// try {
+// String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+// short sValue = Short.parseShort(cleanedValue.trim());
+// mergedList.add(sValue);
+// } catch (NumberFormatException e) {
+// // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+// System.err.println("Could not parse value: " + value);
+// }
+// }
+// }
+// }
+// System.out.println(messageArray);
+// // 鍐欏叆绗竴涓湴鍧�
+// customS7Control.WriteWordsToPLC(messageArray, addressList2,2);
+// // 鍐欏叆绗簩涓湴鍧�
+// customS7Control.WriteWordsToPLC(messageArray, addressList3,3);
+// // 鍐欏叆绗笁涓湴鍧�
+// customS7Control.WriteWordsToPLC(messageArray, addressList4,4);
+// // 鍐欏叆绗洓涓湴鍧�
+// if (!mergedList.isEmpty()) {
+// S7control.getinstance().WriteWord(addressList1, mergedList);
+// System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList1);
+// }
+//
+// //List<String> waddresses1 = Arrays.asList(config.getProperty("Auto.shusong").split(","));
+// String addressList22 = "DB100.8";
+// String addressList33 = "DB100.12";
+// if (!messages.isEmpty()) {
+// // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+// // 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
+// List<Short> mergedList2 = new ArrayList<>();
+// for (int i = 5; i < 8; i++) {
+// JSONArray sublist = messageArray.getJSONArray(i);
+// for (int j = 0; j < sublist.size(); j++) {
+// Object value = sublist.get(j);
+// if (value != null && !value.toString().equals("null")) {
+// try {
+// String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+// short sValue = Short.parseShort(cleanedValue.trim());
+// mergedList2.add(sValue);
+// } catch (NumberFormatException e) {
+// // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+// System.err.println("Could not parse value: " + value);
+// }
+// }
+// }
+// }
+//
+// // 鍐欏叆绗紞涓湴鍧�
+// customS7Control.WriteWordsToPLC(messageArray, addressList22,8);
+// // 鍐欏叆绗叚涓湴鍧�
+// customS7Control.WriteWordsToPLC(messageArray, addressList33,9);
+// // 鍐欏叆绗竷涓湴鍧�
+// // plcParameterObject.getPlcParameter("conveyorVelocity(AutoFAST)").getAddress(index)
+// if (!mergedList2.isEmpty()) {
+// //S7control.getinstance().WriteWord(plcParameterObject.getPlcParameter(Autoaddresses), mergedList2);
+// // System.out.println("messageValue锛�" + mergedList2 + " written to PLC at address " + waddresses1);
+// }
+// // 娓呯┖娑堟伅鍒楄〃
+// webserver.clearMessages();
+// }
+// }
+// }
+//
+// }
+// }
}
--
Gitblit v1.8.0