From 9e62d4c6dfcebf8510580d9141a8141f6b158818 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 26 十二月 2023 09:34:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
index 76ba5f6..3532c83 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
@@ -34,36 +34,36 @@
// System.out.println(stt);
-// List<Short> arraylist = S7control.getinstance().ReadWord("DB100.120", 8);
-// List<Short> dache1 = S7control.getinstance().ReadWord("DB100.18", 1);
-// List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.22", 1);
-// List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.14", 1);
-//
-// List<String> addresses = Arrays.asList(config.getProperty("Auto.addresses").split(","));
-//
-// List<Short> arraylist2 = S7control.getinstance().readWords(addresses);
-// //System.out.println("lastMessage锛�" + arraylist2);
-//
-////缈昏浆
-// List<Short> fanzhuan2 = S7control.getinstance().ReadWord("DB100.8", 1);
-// List<Short> xiaoche2 = S7control.getinstance().ReadWord("DB100.12", 1);
+ List<Short> arraylist = S7control.getinstance().ReadWord("DB100.120", 8);
+ List<Short> dache1 = S7control.getinstance().ReadWord("DB100.18", 1);
+ List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.22", 1);
+ List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.14", 1);
+
+ List<String> addresses = Arrays.asList(config.getProperty("Auto.addresses").split(","));
+
+ List<Short> arraylist2 = S7control.getinstance().readWords(addresses);
+ //System.out.println("lastMessage锛�" + arraylist2);
+
+//缈昏浆
+ List<Short> fanzhuan2 = S7control.getinstance().ReadWord("DB100.8", 1);
+ List<Short> xiaoche2 = S7control.getinstance().ReadWord("DB100.12", 1);
- Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8 };
- List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
- Short[] fanzhuan = { 4 };
- List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
- Short[] dache = { 5 };
- List<Short> dache1 = new ArrayList<>(Arrays.asList(dache));
- Short[] xiaoche = { 6 };
- List<Short> xiaoche1 = new ArrayList<>(Arrays.asList(xiaoche));
-
- Short[] values2 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
- List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
- Short[] fanzhuan22 = { 4 };
- List<Short> fanzhuan2 = new ArrayList<>(Arrays.asList(fanzhuan22));
- Short[] xiaoche22 = {5};
- List<Short> xiaoche2 = new ArrayList<>(Arrays.asList(xiaoche22));
+// Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8 };
+// List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+// Short[] fanzhuan = { 4 };
+// List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
+// Short[] dache = { 5 };
+// List<Short> dache1 = new ArrayList<>(Arrays.asList(dache));
+// Short[] xiaoche = { 6 };
+// List<Short> xiaoche1 = new ArrayList<>(Arrays.asList(xiaoche));
+//
+// Short[] values2 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
+// List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
+// Short[] fanzhuan22 = { 4 };
+// List<Short> fanzhuan2 = new ArrayList<>(Arrays.asList(fanzhuan22));
+// Short[] xiaoche22 = {5};
+// List<Short> xiaoche2 = new ArrayList<>(Arrays.asList(xiaoche22));
JSONObject jsonObject = new JSONObject();
// new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
--
Gitblit v1.8.0