From db0b4745458fd22b6552912b0572a89b2af09564 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 07 九月 2023 17:12:12 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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..c6ce249 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
@@ -7,6 +7,7 @@
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 {
@@ -42,7 +43,9 @@
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<>();
// addressList.add("DB100.DBW0");
--
Gitblit v1.8.0