From f3fea817e20a192b2831102a8356045f3d56aa73 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 24 一月 2024 13:32:24 +0800
Subject: [PATCH] 增加json文件
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 88 +++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 58 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 5601296..fce0526 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
@@ -122,35 +122,37 @@
// List<Short> listd17 = S7control.getinstance().ReadWord("DB17.0",10);
// String id=spianService.queGlassid("DB17.10", 14).toString();
//
- // // 閾濇绾夸氦浜�
+
+ // 閾濇绾夸氦浜�
// try {
- // if (CurrentFrame != null) {
- // spianService.outmesid(CurrentFrame.getBarCode(), "DB17.0");
- // }
- // List<Short> framerequests = S7control.getinstance().ReadWord("閾濇id璇锋眰瀛楀湴鍧�", 1);
- // for (Short framerequest : framerequests) {
- // if (framerequest == 1) {
- // // 閾濇id
- // String franmeno = spianService.queGlassid("DB17.10", 14).toString();
- // String position;
- // try {
- // position = dbserve.SelectPositionByFrameBarcode(franmeno);
- // } catch (SQLException e) {
- // // TODO Auto-generated catch block
- // position = "0";
- // e.printStackTrace();
- // }
- // Short send;
- // if (position == "0") {
- // send = 0;
- // } else {
- // send = 1;
- // }
- // S7control.getinstance().WriteWord("閾濇缈昏浆鍙戦�佸湴鍧�", (short) send);
- // }
- // }
+ // if (CurrentFrame != null) {
+ // spianService.outmesid(CurrentFrame.getBarCode(), "DB17.0");
+ // }
+
+ // List<Short> framerequests = S7control.getinstance().ReadWord("閾濇id璇锋眰瀛楀湴鍧�", 1);
+ // for (Short framerequest : framerequests) {
+ // if (framerequest == 1) {
+ // // 閾濇id
+ // String franmeno = spianService.queGlassid("DB17.10", 14).toString();
+ // String position;
+ // try {
+ // position = dbserve.SelectPositionByFrameBarcode(franmeno);
+ // } catch (SQLException e) {
+ // // TODO Auto-generated catch block
+ // position = "0";
+ // e.printStackTrace();
+ // }
+ // Short send;
+ // if (position == "0") {
+ // send = 0;
+ // } else {
+ // send = 1;
+ // }
+ // S7control.getinstance().WriteWord("閾濇缈昏浆鍙戦�佸湴鍧�", (short) send);
+ // }
+ // }
// } catch (Exception e) {
- // // TODO: handle exception
+ // // TODO: handle exception
// }
if (S7control.getinstance().CheckConnected() == true) {
@@ -171,7 +173,7 @@
jsonObject.append("DeviceList", DeviceList);
// 鑾峰彇D01-D06,A01,A02,B01,B02鐜荤拑id
List<String> GlassIdList = new ArrayList<String>();
- GlassIdList.add(spianService.queGlassid("DB103.40", 14).toString());
+ GlassIdList.add(spianService.queGlassid("DB103.44", 14).toString());
GlassIdList.add(spianService.queGlassid("DB103.58", 14).toString());
GlassIdList.add(spianService.queGlassid("DB103.184", 14).toString());
@@ -264,36 +266,6 @@
for (Boolean emergencystop : emergencystops) {
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++) {
- // boolean value = resets.get(i);
- // resets2[i] = value ? (short) 1 : (short) 0;
- // }
-
- // for (short number : resets2) {
-
- // if (number == 1) {
- // jsonObject.append("Abort", anniuparams);
-
- // }
-
- // }
}
storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
--
Gitblit v1.8.0