From be5351fe3cc2714756ae43ab272cf8813cb0fe98 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 13 九月 2023 14:47:40 +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 | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 c2a74e1..f45e84f 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
@@ -1,15 +1,24 @@
package com.example.springboot.component;
+import java.sql.SQLException;
import java.util.List;
-import com.example.springboot.service.SpianService;
-import com.example.springboot.mapper.AlarmMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.example.springboot.service.JdbcConnections;
+import com.example.springboot.service.SpianService;
+import com.example.springboot.entity.Glass;
+import com.example.springboot.mapper.AlarmMapper;
public class PlcHold extends Thread {
private AlarmMapper alarmMapper;
+ @Autowired
+ private JdbcConnections jdbcConnections;
+
private SpianService spianService;
+
@Override
public void run() {
@@ -19,12 +28,24 @@
Thread.sleep(500);
} catch (InterruptedException e) {
- // TODO Auto-generated catch block
+ //\\ TODO Auto-generated catch block
e.printStackTrace();
}
spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
- //spianService.selectout("112");
+ jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
+
+ //鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�
+ try {
+ Glass glass=jdbcConnections.selectGlass(112);
+ //System.out.println(glass.getOrderId());
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+
+ spianService.selectout("11");
//鍒ゆ柇杩涚墖璇锋眰
List<Short> datas1List=S7control.getinstance().ReadWord("DB106.24", 1);
List<Short> datas1ListState=S7control.getinstance().ReadWord("DB106.8", 1);
@@ -41,6 +62,7 @@
List<Short> datas1ListID=S7control.getinstance().ReadWord("DB106.26", 13);
//鑾峰彇鐜荤拑id
for(Short list1:datas1ListID){
+
spianService.selectAll((short)list1);
}
}
@@ -60,4 +82,5 @@
}
}
+
}
--
Gitblit v1.8.0