From 9ecf9412567ad052ec304d99be8810a8badebb98 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 18 九月 2023 16:54:35 +0800
Subject: [PATCH] 新增笼子表状态判断

---
 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 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 cc53b99..4bdd946 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
@@ -47,21 +47,24 @@
             jsonObject.append("alarmmg", alarmmg);
             // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
             List<String> addressList = new ArrayList<String>();
-            addressList.add("DB106.0");
             addressList.add("DB106.12");
+            addressList.add("DB106.0");
             List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
 
             // 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&inglassInfo.size()>0){
+            jsonObject.append("loadglassheight", inglassInfo.get(0)*70);
+            }
             // jsonObject.append("params", new short[] { 30, 40, });
             WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Home");
             if (sendwServer != null) {

--
Gitblit v1.8.0