From 5aa99c119f387d6f32a58dfc7190351f6f92ecf6 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 18 九月 2023 21:07:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 9 +++++++--
CanadaMes-ui/src/lang/locales/en-US.json | 3 ++-
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 22 ++++++++++++++++++----
CanadaMes-ui/src/lang/locales/zh-CN.json | 3 ++-
4 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index b1d598d..0e67c30 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -276,6 +276,7 @@
"Yes":"Yes",
"No":"No",
"Please enter the password":"Please enter the password",
- "Password error":"Password error"
+ "Password error":"Password error",
+ "DataBase Connection failed":"DataBase Connection failed"
}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 07c6c79..60bb7ed 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -280,5 +280,6 @@
"time-on": "寮�濮嬫椂闂�",
"End-Time": "缁撴潫鏃堕棿",
"Please enter the password":"璇疯緭鍏ュ瘑鐮�",
- "Password error":"瀵嗙爜閿欒"
+ "Password error":"瀵嗙爜閿欒",
+ "DataBase Connection failed":"鏁版嵁搴撹繛鎺ュけ璐�"
}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 59e3a03..d1c95f8 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -188,6 +188,7 @@
<div class="box" @click="dialogFormVisible2 = true">
<div class="text">
<!-- Alarm: -->
+ {{ this.text }}
<label v-for="item in this.alarm" :key="item['id']">
{{ item['content'] }}
</label>
@@ -415,7 +416,8 @@
cage: 0,
carlist: [],
loadglassheight: 0,
- password: 1
+ password: 1,
+ text: ""
};
},
created() {
@@ -462,6 +464,10 @@
this.tasklist2 = obj.tasklist2[0];
this.alarm = obj.alarmmg[0];
this.loadglassheight = obj.loadglassheight;
+
+ if (obj.dbconnected == "false") {
+ this.text = this.$t('DataBase Connection failed');
+ }
SelectCageInfo(this.cage).then(res => {
this.cageinfo = res.data.cageinfo;
});
@@ -619,7 +625,6 @@
message: this.$t('Operation canceled')
});
});
-
},
showcageinfo(cage) {
this.cage = cage;
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