From 8ceb6b26a49962448c51ca8c92b6ffcf9ed5ae33 Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期一, 18 九月 2023 20:33:59 +0800
Subject: [PATCH] 增加 连接客户ERP数据连接是否正常的判断
---
CanadaMes-ui/src/views/home/index.vue | 5 +++++
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 22 ++++++++++++++++++----
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index f335ded..4b3bb7f 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -458,6 +458,11 @@
this.tasklist2 = obj.tasklist2[0];
this.alarm = obj.alarmmg[0];
this.loadglassheight=obj.loadglassheight;
+
+ if(obj.dbconnected=="false")
+ {
+ //alert("DataBase Connection failed");
+ }
SelectCageInfo(this.cage).then(res => {
this.cageinfo = res.data.cageinfo;
});
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 4bdd946..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,10 +64,21 @@
if(paramlist!=null){
jsonObject.append("params", paramlist);
}
- List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24",1);
- if(inglassInfo!=null&inglassInfo.size()>0){
+ 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