From 75375a0f68c8b91799482dc1cd2ec7d7f211167f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 31 五月 2024 09:28:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index 7773370..c223eb0 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -23,24 +23,24 @@
@Override
public void run() {
- spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
- spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
-
- jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
+
while (this != null) {
try {
spianService.result=new ArrayList<>();
Thread.sleep(300);
// if (S7control.getinstance().CheckConnected() == false) {
+ spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
+ spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
+ jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
// 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�,鍗曠嫭鏁版嵁婧�
// try {
- // //spianService.selectAll(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X12345610102GV","",""));
- // north_glass_buffer1 aa=jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X12345610102GV","","");
- // spianMapper.UpdataAddCage2("123", "123", aa, 5, 1, 9, 2,2000.00);
- // } catch (SQLException e) {
- // // TODO Auto-generated catch block
+ // spianService.selectAll(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X22670914802GV","",""));
+ //north_glass_buffer1 aa=jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X12345610102GV","","");
+ //spianMapper.UpdataAddCage2("123", "123", aa, 5, 1, 9, 2,2000.00);
+ //} catch (SQLException e) {
+ // TODO Auto-generated catch block
// e.printStackTrace();
// }
// spianService.selectout2("X21942610602GV");
--
Gitblit v1.8.0