From 731d32992d51e945bbeb7402d1a9acd87ced9e9d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 08 九月 2023 17:25:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.150:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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..4ba4874 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,12 @@
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 {
@@ -24,6 +25,7 @@
JSONObject jsonObject = new JSONObject();
+ //娉ㄥ叆mapper
homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
// 绗煎瓙浣跨敤鎯呭喌
List<StorageCage> tableData = homeMapper.selectAll();
@@ -42,15 +44,18 @@
List<StorageCage> tasklist2=homeMapper.selectinout(3);
jsonObject.append("tasklist1", tasklist1);
jsonObject.append("tasklist2", tasklist2);
-
- //璇诲幓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);
-
- jsonObject.append("params", new short[] { 30, 40, });
+ //鏌ヨ鎶ヨ淇℃伅
+ List<alarmmg> alarmmg=homeMapper.SelectAlarmmgInfo();
+ jsonObject.append("alarmmg", alarmmg);
+ //璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
+ List<String> addressList = new ArrayList<String>();
+ addressList.add("DB100.DBW0");
+ addressList.add("DB100.DBW12");
+ List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
+ //灏嗛泦鍚堣浆涓烘暟缁�
+ Short[] paramlists = paramlist.toArray(new Short[0]);
+ jsonObject.append("params", paramlists);
+ // jsonObject.append("params", new short[] { 30, 40, });
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Home");
if (sendwServer != null) {
--
Gitblit v1.8.0