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 | 166 ++++++++++++++++++++++++++++--------------------------
1 files changed, 86 insertions(+), 80 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 4eb6072..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
@@ -51,85 +51,91 @@
}
- 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.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> addresses8 = new ArrayList<>();
- 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));
+// List<String> addresses = new ArrayList<>();
+// addresses.add("DB103.25");
+// addresses.add("DB100.144");
//
-// 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));
+// 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("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));
JSONObject jsonObject = new JSONObject();
@@ -140,8 +146,8 @@
jsonObject.append("zuhe4", arraylist4);
jsonObject.append("zuhe5", arraylist5);
jsonObject.append("zuhe6", arraylist6);
- jsonObject.append("guzhang", arraylist7);
- jsonObject.append("weihuiling", params);
+// jsonObject.append("guzhang", params2);
+// jsonObject.append("weihuiling", params);
--
Gitblit v1.8.0