From ec14c7c0b9a5d8240cfc3f2c80a48dfe1176f13e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 28 十二月 2023 08:18:59 +0800
Subject: [PATCH] 测试更新
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index 0cae2f5..47b88f7 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -39,10 +39,7 @@
private Configuration config;
-
-
- private StorageCageService storageCageService;
-
+ private StorageCageService storageCageService;
public Plchome() throws IOException {
config = new Configuration("config.properties");
@@ -124,8 +121,11 @@
// 鑾峰彇杩涚墖杞︾姸鎬�
List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
1);// 鑾峰彇杩涚墖杞︾姸鎬�
- boolean exist1 = datas1ListState.contains((short) 0);
+ if(datas1ListState!=null){
+ boolean exist1 = datas1ListState.contains((short) 0);
jsonObject.append("zhuangtai", exist1);
+ }
+
// 鑾峰彇杩涚墖鐜荤拑淇℃伅
List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
if (inglassInfo != null) {
@@ -171,16 +171,18 @@
jsonObject.append("emergencystop", emergencystop);
}
- //缁堟缁х画鎸夐挳
+ // 缁堟缁х画鎸夐挳
List<String> niuanaddressList3 = Arrays.asList(config.getProperty("Parameter2.stop").split(","));
List<Boolean> anniuread = S7control.getinstance().readBits(niuanaddressList3);
-
+ // Boolean[] value4 = { false, false};
+ // List<Boolean> anniuread = new ArrayList<>(Arrays.asList(value4));
+ // Boolean[] value5 = { true};
+ // List<Boolean> resets = new ArrayList<>(Arrays.asList(value5));
short[] anniuparams = new short[anniuread.size()];
for (int i = 0; i < anniuread.size(); i++) {
boolean value = anniuread.get(i);
anniuparams[i] = value ? (short) 1 : (short) 0;
}
-
short[] resets2 = new short[resets.size()];
for (int i = 0; i < resets.size(); i++) {
@@ -188,17 +190,14 @@
resets2[i] = value ? (short) 1 : (short) 0;
}
-// System.out.println(resets);
for (short number : resets2) {
if (number == 1) {
- System.out.println(resets);
jsonObject.append("Abort", anniuparams);
}
}
-
// 閾濇绾夸氦浜�
@@ -242,15 +241,13 @@
if (webserver != null) {
-
List<String> messages = webserver.getMessages();
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
String lastMessage = messages.get(messages.size() - 1);
-// System.out.println("lastMessage锛�" + lastMessage);
+ // System.out.println("lastMessage锛�" + lastMessage);
JSONArray messageArray = new JSONArray(lastMessage);
-
try {
// 妫�鏌ョ储寮曟槸鍚︽湁鏁�
@@ -272,8 +269,8 @@
boolean val = "1".equals(cleanedValue.trim());
// 灏嗗竷灏斿�兼坊鍔犲埌甯冨皵鍊煎垪琛ㄤ腑
sValue.add(val);
- System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
-
+ System.out.println(
+ "messageValue: " + Arrays.asList(val) + " added to the list");
} catch (NumberFormatException e) {
// 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
@@ -281,7 +278,7 @@
}
}
}
-// 缁堟杩涚墖浠诲姟
+ // 缁堟杩涚墖浠诲姟
boolean Value1 = sValue.get(0);
boolean Value2 = sValue.get(1);
@@ -298,7 +295,8 @@
// 璋冪敤 S7control.getinstance().WriteBit 鏂规硶灏嗗竷灏斿�煎垪琛ㄥ啓鍏ュ湴鍧�鍒楄〃
S7control.getinstance().WriteBit(niuanaddressList3, sValue);
- System.out.println("Values " + sValue + " written to PLC at address " + niuanaddressList3);
+ System.out.println(
+ "Values " + sValue + " written to PLC at address " + niuanaddressList3);
}
}
} catch (Exception e) {
@@ -306,7 +304,6 @@
}
webserver.clearMessages();
}
-
}
--
Gitblit v1.8.0