From 1c5e44cdff0f7900914a883056d93979265e306f Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 20 九月 2023 08:20:16 +0800
Subject: [PATCH] 删除不需要的代码，parameter、action页不需要输入密码
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 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 953fd91..0f48627 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,19 +5,22 @@
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) {
try {
- Thread.sleep(10000);
+ Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
@@ -34,12 +37,12 @@
List<StorageCage> cagelist3 = homeMapper.selectRack3();
List<StorageCage> cagelist4 = homeMapper.selectRack4();
jsonObject.append("cagelist1", cagelist1);
- jsonObject.append("cagelist2", cagelist2);
+ jsonObject.append("cagelist2", (Object)cagelist2);
jsonObject.append("cagelist3", cagelist3);
jsonObject.append("cagelist4", cagelist4);
// 杩涘嚭鐗囦换鍔�
- List<StorageCage> tasklist1 = homeMapper.selectinout(2);
- List<StorageCage> tasklist2 = homeMapper.selectinout(3);
+ List<StorageCage> tasklist1 = homeMapper.selectinout(3);
+ List<StorageCage> tasklist2 = homeMapper.selectinout(2);
jsonObject.append("tasklist1", tasklist1);
jsonObject.append("tasklist2", tasklist2);
// 鏌ヨ鎶ヨ淇℃伅
@@ -47,21 +50,38 @@
jsonObject.append("alarmmg", alarmmg);
// 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
List<String> addressList = new ArrayList<String>();
- addressList.add("DB106.0");
addressList.add("DB106.12");
- List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
-
+ addressList.add("DB106.0");
+ List<Short> paramlist= S7control.getinstance().ReadWord(addressList);
+ // 鑾峰彇杩涚墖杞︾姸鎬�
+ List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 鑾峰彇杩涚墖杞︾姸鎬�
+ boolean exist1 = datas1ListState.contains((short) 0);
+ jsonObject.append("zhuangtai",exist1);
// List<Short> paramlists = new ArrayList<Short>();
- // short para1 = 1;
- // short para2 = 2;
+ // short para1 = 11111;
+ // short para2 = 32000;
// paramlists.add(para1);
// paramlists.add(para2);
// System.out.println(paramlists);
if(paramlist!=null){
- // Short[] paramlists = paramlist.toArray(new Short[0]);
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