From 79f33da4df32fc139c3855a8ecca6545723e0815 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 19 九月 2023 08:08:17 +0800
Subject: [PATCH] 删除不需要的代码，玻璃信息放入其他数据库 方便测试显示数据库连接的信息
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 e9dbca5..2ea5797 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
@@ -5,14 +5,17 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.ibatis.javassist.tools.framedump;
+
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
import com.example.springboot.mapper.HomeMapper;
+import com.example.springboot.service.JdbcConnections;
public class Plchome extends Thread {
private HomeMapper homeMapper;
-
+ private JdbcConnections dbserve;
@Override
public void run() {
while (this != null) {
@@ -49,7 +52,7 @@
List<String> addressList = new ArrayList<String>();
addressList.add("DB106.12");
addressList.add("DB106.0");
- List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
+ List<Short> paramlist= S7control.getinstance().ReadWord(addressList);
// List<Short> paramlists = new ArrayList<Short>();
// short para1 = 11111;
@@ -61,6 +64,21 @@
if(paramlist!=null){
jsonObject.append("params", paramlist);
}
+ List<Short> inglassInfo= S7control.getinstance().ReadWord("DB106.24",1);
+ if(inglassInfo!=null){
+ if(inglassInfo.size()>0)
+ jsonObject.append("loadglassheight", inglassInfo.get(0)*70);
+ }
+ dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
+ boolean dbconnected=false;
+ try {
+ dbserve.getConn();
+ dbconnected=true;
+ } catch (Exception e) {
+ // TODO: handle exception
+ dbconnected=false;
+ }
+ jsonObject.append("dbconnected", dbconnected);
// jsonObject.append("params", new short[] { 30, 40, });
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Home");
if (sendwServer != null) {
--
Gitblit v1.8.0