From 0417fafe757f09bfb166b1dd1d9f096e966a30d8 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期六, 11 五月 2024 09:38:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plclog.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plclog.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plclog.java
index 0ae28f3..e42ef08 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plclog.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plclog.java
@@ -15,32 +15,34 @@
while (this != null) {
try {
Thread.sleep(10);
- } catch (InterruptedException e) {
- // \\ TODO Auto-generated catch block
- e.printStackTrace();
- }
- spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
+ spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
-
+ StringBuilder B01glassid = spianService.queGlassid("DB103.184", 14);// BO1鐨勭幓鐠僫d
+ StringBuilder B02glassid = spianService.queGlassid("DB103.212", 14);// B02鐨勭幓鐠僫d
boolean B01backs = spianService.listbool("DB106.60");// b01姹囨姤
boolean B02backs = spianService.listbool("DB106.62");// b01姹囨姤
if (b01 != B01backs) {
if (B01backs == true) {
- spianMapper.insertlog("BO1:1");
+ spianMapper.insertlog("BO1:1"+B01glassid);
} else {
- spianMapper.insertlog("BO1:0");
+ spianMapper.insertlog("BO1:0"+B01glassid);
}
b01 = B01backs;
}
if (b02 != B02backs) {
if (B02backs == true) {
- spianMapper.insertlog("BO2:1");
+ spianMapper.insertlog("BO2:1"+B02glassid);
} else {
- spianMapper.insertlog("BO2:0");
+ spianMapper.insertlog("BO2:0"+B02glassid);
}
b02 = B02backs;
}
+ } catch (InterruptedException e) {
+ // \\ TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
}
}
--
Gitblit v1.8.0