From 32abb9d83e0f63e5c04f719626ed5d7b5a50f7e4 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 30 十一月 2023 09:38:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java | 282 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 179 insertions(+), 103 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
index 70b6ea5..9a45abc 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
@@ -18,42 +18,25 @@
return FileUtils.readFileToString(file, "UTF-8");
}
- public void readValue() {
- String str = "";
- BufferedReader bufferedReader = null;
- FileInputStream fileInputStream;
- try {
- // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
- fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/address.json");
- // 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙ｇ爜涓哄瓧绗�
- InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
- // 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
- bufferedReader = new BufferedReader(inputStreamReader);
- String line = null;
- // 灏� bufferedReader 鍐呭涓�琛屼竴琛岃祴鍊肩粰str
- while ((line = bufferedReader.readLine()) != null) {
- str += line;
+
+
+
+ public void insertDataToList(List<Short> list, String rangeAddress, int insertIndex) {
+ if (list.size() >= insertIndex + 14) {
+ List<Short> rangeData = new ArrayList<>();
+ byte[] byteData = S7control.getinstance().ReadByte(rangeAddress, 14);
+ if (byteData != null && byteData.length == 14) {
+ for (byte b : byteData) {
+ rangeData.add((short) b);
+ }
+ } else {
+ // 璇诲彇鏁版嵁澶辫触锛屾坊鍔犻粯璁ゅ��
+ for (int i = 0; i < 14; i++) {
+ rangeData.add((short) -1);
+ }
}
- // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
- JSONObject jsonObject = new JSONObject(str);
-
- // 鑾峰彇json涓殑鍊�
- JSONArray address = jsonObject.getJSONArray("ServoManualone");
- for (int i = 0; i < address.size(); i++) {
- JSONObject ress = (JSONObject) address.get(i);
-
- this.name = ress.getStr("name");
- this.count = ress.getInt("count");
-
- }
-
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
+ list.addAll(insertIndex, rangeData);
}
}
@@ -61,77 +44,98 @@
public void run() {
while (this != null) {
try {
- Thread.sleep(500);
+ Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
-// this.readValue();
-// String PlcAddress = this.name;
-// Integer Plccount = this.count;
- List<String> addresses = new ArrayList<>();
- addresses.add("DB103.25");
- addresses.add("DB100.144");
- addresses.add("DB100.148-161");
- addresses.add("DB100.184");
- addresses.add("DB100.186");
- addresses.add("DB100.180");
- addresses.add("DB100.182");
-
- List<Short> arraylist = S7control.getinstance().readWords(addresses);
-
- List<String> addresses2 = new ArrayList<>();
- addresses2.add("DB103.26");
- addresses2.add("DB100.188");
- addresses2.add("DB100.190");
- addresses2.add("DB100.146");
- addresses2.add("DB100.162-175");
- List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
-
- List<String> addresses3 = new ArrayList<>();
- addresses3.add("DB103.42");
- List<Short> arraylist3 = S7control.getinstance().readWords(addresses3);
-
- List<String> addresses4 = new ArrayList<>();
- addresses4.add("DB103.46");
- List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);
-
- List<Short> arraylist5 = S7control.getinstance().ReadWord("DB103.27", 2);
- List<Short> arraylist6 = S7control.getinstance().ReadWord("DB103.29", 2);
- List<String> addresses7 = new ArrayList<>();
- addresses7.add("DB104.24");
- addresses7.add("DB104.26");
- addresses7.add("DB104.20");
- addresses7.add("DB104.22");
- addresses7.add("DB104.28");
- addresses7.add("DB104.30");
- List<Short> arraylist7 = S7control.getinstance().readWords(addresses7);
+// List<String> addresses = new ArrayList<>();
+// addresses.add("DB103.25");
+// addresses.add("DB100.144");
+//
+// addresses.add("DB100.184");
+// addresses.add("DB100.186");
+// addresses.add("DB100.180");
+// addresses.add("DB100.182");
+//
+// List<Short> arraylist = S7control.getinstance().readWords(addresses);
+//
+//// String rangeAddress = "DB100.148-161";
+// String rangeAddress = "DB100.148";
+// int insertIndex = 2;
+// insertDataToList(arraylist, rangeAddress, insertIndex);
+//
+//
+// List<String> addresses2 = new ArrayList<>();
+// addresses2.add("DB103.26");
+// addresses2.add("DB100.188");
+// addresses2.add("DB100.190");
+// addresses2.add("DB100.146");
+//// addresses2.add("DB100.162-175");
+// List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
+//// String rangeAddress2 = "DB100.148-161";
+// String rangeAddress2 = "DB100.162";
+// int insertIndex2 = 4;
+// insertDataToList(arraylist2, rangeAddress2, insertIndex2);
+//// System.out.println(arraylist2);
+// List<String> addresses3 = new ArrayList<>();
+// addresses3.add("DB103.42");
+// List<Short> arraylist3 = S7control.getinstance().readWords(addresses3);
+//
+// List<String> addresses4 = new ArrayList<>();
+// addresses4.add("DB103.46");
+// List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);
+//
+// List<Short> arraylist5 = S7control.getinstance().ReadWord("DB103.27", 2);
+// List<Short> arraylist6 = S7control.getinstance().ReadWord("DB103.29", 2);
+// List<String> addresses7 = new ArrayList<>();
+// addresses7.add("DB104.1.4");
+// addresses7.add("DB104.1.5");
+// addresses7.add("DB104.1.2");
+// addresses7.add("DB104.1.3");
+// addresses7.add("DB104.1.6");
+// addresses7.add("DB104.1.7");
+// List<Boolean> arraylist7 = S7control.getinstance().readBits(addresses7);
+//
+//
+// short[] params2 = new short[arraylist7.size()];
+// for (int i = 0; i < arraylist7.size(); i++) {
+// boolean value = arraylist7.get(i);
+// params2[i] = value ? (short) 1 : (short) 0;
+// }
+//
// List<String> addresses8 = new ArrayList<>();
-// addresses8.add("DB103.26");
-// addresses8.add("DB103.26");
-// addresses8.add("DB103.26");
-// addresses8.add("DB103.26");
-// List<Short> arraylist8 = S7control.getinstance().readWords(addresses8);
+// addresses8.add("DB101.3.7");
+// addresses8.add("DB101.4.2");
+// addresses8.add("DB101.4.5");
+// addresses8.add("DB101.4.7");
+// List<Boolean> arraylist8 = S7control.getinstance().readBits(addresses8);
+// short[] params = new short[arraylist8.size()];
+// for (int i = 0; i < arraylist8.size(); i++) {
+// boolean value = arraylist8.get(i);
+// params[i] = value ? (short) 1 : (short) 0;
+// }
-// Short[] values1 = { 1, 2, 3, 4, 5, 6, 7};
-// List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
-// Short[] values2 = { 1, 2, 3, 4, 5};
-// List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
-// Short[] values3 = {1};
-// List<Short> arraylist3 = new ArrayList<>(Arrays.asList(values3));
-// Short[] values4 = {2};
-// List<Short> arraylist4 = new ArrayList<>(Arrays.asList(values4));
-// Short[] values5 = {3,3};
-// List<Short> arraylist5 = new ArrayList<>(Arrays.asList(values5));
-// Short[] values6 = { 4,4};
-// List<Short> arraylist6 = new ArrayList<>(Arrays.asList(values6));
-// Short[] values7 = { 1,1,1,1,1,1};
-// List<Short> arraylist7 = new ArrayList<>(Arrays.asList(values7));
-// Short[] values8 = { 1,1,1,1,1,1};
-// List<Short> arraylist8 = new ArrayList<>(Arrays.asList(values8));
+ Short[] values1 = { 1, 2, 3, 4, 5, 6, 7};
+ List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+ Short[] values2 = { 1, 2, 3, 4, 5};
+ List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
+
+ Short[] values3 = {1};
+ List<Short> arraylist3 = new ArrayList<>(Arrays.asList(values3));
+ Short[] values4 = {2};
+ List<Short> arraylist4 = new ArrayList<>(Arrays.asList(values4));
+ Short[] values5 = {3,3};
+ List<Short> arraylist5 = new ArrayList<>(Arrays.asList(values5));
+ Short[] values6 = { 4,4};
+ List<Short> arraylist6 = new ArrayList<>(Arrays.asList(values6));
+ Short[] values7 = { 1,1,1,1,1,1};
+ List<Short> arraylist7 = new ArrayList<>(Arrays.asList(values7));
+ Short[] values8 = { 1,1,1,1,1,1};
+ List<Short> arraylist8 = new ArrayList<>(Arrays.asList(values8));
JSONObject jsonObject = new JSONObject();
@@ -142,8 +146,8 @@
jsonObject.append("zuhe4", arraylist4);
jsonObject.append("zuhe5", arraylist5);
jsonObject.append("zuhe6", arraylist6);
- jsonObject.append("guzhang", arraylist7);
-// jsonObject.append("weihuiling", arraylist8);
+// jsonObject.append("guzhang", params2);
+// jsonObject.append("weihuiling", params);
@@ -170,6 +174,29 @@
waddresses2.add("DB100.190");
waddresses2.add("DB100.146");
waddresses2.add("DB100.162-175");
+
+ List<String> waddresses3 = new ArrayList<>();
+ waddresses3.add("DB101.4.0");
+ waddresses3.add("DB101.4.3");
+ waddresses3.add("DB101.3.6");
+ waddresses3.add("DB101.4.1");
+ waddresses3.add("DB101.4.4");
+ waddresses3.add("DB101.4.6");
+
+
+ List<String> waddresses4 = new ArrayList<>();
+ waddresses4.add("DB101.3.7");
+ waddresses4.add("DB101.4.2");
+ waddresses4.add("DB101.4.5");
+ waddresses4.add("DB101.4.7");
+
+
+
+
+
+
+
+
@@ -201,16 +228,16 @@
}
}
if (!sValue.isEmpty()) {
- S7control.getinstance().WriteWord(waddresses1, sValue);
+ S7control.getinstance().WriteWord(waddresses1, sValue);
System.out.println("Values " + sValue + " written to PLC at address " + waddresses1);
}
}
if (messageArray.getJSONArray(1).size() > 0) {
- JSONArray jsonArray = messageArray.getJSONArray(1);
+ JSONArray jsonArray2 = messageArray.getJSONArray(1);
List<Short> sValue2 = new ArrayList<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- Object value = jsonArray.get(i);
+ for (int i = 0; i < jsonArray2.size(); i++) {
+ Object value = jsonArray2.get(i);
if (value != null && !value.toString().equals("null")) {
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
@@ -224,11 +251,60 @@
}
}
if (!sValue2.isEmpty()) {
- S7control.getinstance().WriteWord(waddresses2, sValue2);
+ S7control.getinstance().WriteWord(waddresses2, sValue2);
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses2);
}
}
+
+
+ if (messageArray.getJSONArray(2).size() > 0) {
+ JSONArray jsonArray3 = messageArray.getJSONArray(2);
+ List<Boolean> sValue3 = new ArrayList<>();
+ for (int i = 0; i < jsonArray3.size(); i++) {
+ Object value = jsonArray3.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue3.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue3.isEmpty()) {
+ S7control.getinstance().WriteBit(waddresses3, sValue3);
+ System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses3);
+ }
+ }
+
+
+ if (messageArray.getJSONArray(3).size() > 0) {
+ JSONArray jsonArray4 = messageArray.getJSONArray(3);
+ List<Boolean> sValue4 = new ArrayList<>();
+ for (int i = 0; i < jsonArray4.size(); i++) {
+ Object value = jsonArray4.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue4.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue4.isEmpty()) {
+ S7control.getinstance().WriteBit(waddresses4, sValue4);
+ System.out.println("Values " + sValue4 + " written to PLC at address " + waddresses4);
+ }
+ }
+
// 娓呯┖娑堟伅鍒楄〃
webSocketServer.clearMessages();
}
--
Gitblit v1.8.0