From 09c655782b6f9996bc084e6f0c9721d0f2574aa8 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 14 九月 2023 16:32:11 +0800
Subject: [PATCH] 1、解决vuex切换页面样式混乱 2、修改plc地址
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 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 6450dc5..cc53b99 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
@@ -2,11 +2,11 @@
import cn.hutool.json.JSONObject;
+import java.util.ArrayList;
import java.util.List;
-import org.springframework.context.ConfigurableApplicationContext;
-
import com.example.springboot.entity.StorageCage;
+import com.example.springboot.entity.alarmmg;
import com.example.springboot.mapper.HomeMapper;
public class Plchome extends Thread {
@@ -17,18 +17,18 @@
public void run() {
while (this != null) {
try {
- Thread.sleep(10000);
+ Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
-
JSONObject jsonObject = new JSONObject();
-
+
+ // 娉ㄥ叆mapper
homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
// 绗煎瓙浣跨敤鎯呭喌
List<StorageCage> tableData = homeMapper.selectAll();
jsonObject.append("tableData", tableData);
- //鏍肩悊鐗囩鏍煎瓙鐘舵��
+ // 鏍肩悊鐗囩鏍煎瓙鐘舵��
List<StorageCage> cagelist1 = homeMapper.selectRack1();
List<StorageCage> cagelist2 = homeMapper.selectRack2();
List<StorageCage> cagelist3 = homeMapper.selectRack3();
@@ -37,33 +37,36 @@
jsonObject.append("cagelist2", 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(2);
+ List<StorageCage> tasklist2 = homeMapper.selectinout(3);
jsonObject.append("tasklist1", tasklist1);
jsonObject.append("tasklist2", tasklist2);
+ // 鏌ヨ鎶ヨ淇℃伅
+ List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
+ 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);
- //璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃�
- // List<String> addressList = new ArrayList<>();
- // addressList.add("DB100.DBW0");
- // addressList.add("DB100.DBW2");
- // List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
- // jsonObject.append("params", paramlist);
+ // List<Short> paramlists = new ArrayList<Short>();
+ // short para1 = 1;
+ // short para2 = 2;
+ // paramlists.add(para1);
+ // paramlists.add(para2);
+ // System.out.println(paramlists);
- jsonObject.append("params", new short[] { 30, 40, });
+ if(paramlist!=null){
+ // Short[] paramlists = paramlist.toArray(new Short[0]);
+ jsonObject.append("params", paramlist);
+ }
+ // jsonObject.append("params", new short[] { 30, 40, });
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Home");
-
if (sendwServer != null) {
sendwServer.sendMessage(jsonObject.toString());
}
-
- // JSONObject jsonObject = new JSONObject();
- // jsonObject.append("params", new short[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
- // 11, });
- // WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Home");
- // if (sendwServer != null) {
- // sendwServer.sendMessage(jsonObject.toString());
- // }
}
}
--
Gitblit v1.8.0