From be244a9e202ef069ccb57040ffbec59c89d40cfd Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 21 十一月 2023 10:32:24 +0800
Subject: [PATCH] 电气管理增加渲染变频器参数页面、大车笼子定位页面、小车笼子定位页面
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 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 06a6a0f..cf088ab 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
@@ -56,21 +56,32 @@
// 鏌ヨ鎶ヨ淇℃伅
List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
jsonObject.append("alarmmg", alarmmg);
- // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
- List<String> addressList = new ArrayList<String>();
- addressList.add("DB106.12");
- 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);
+ // // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
+ // List<String> addressList = new ArrayList<String>();
+ // addressList.add("DB106.12");
+ // addressList.add("DB106.0");
+ // List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
+ // if (paramlist != null) {
+ // jsonObject.append("params", paramlist);
+ // }
+ // // 鑾峰彇杩涚墖杞︾姸鎬�
+ // List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 鑾峰彇杩涚墖杞︾姸鎬�
+ // boolean exist1 = datas1ListState.contains((short) 0);
+ // jsonObject.append("zhuangtai", exist1);
+ //鑾峰彇杩涚墖鐜荤拑淇℃伅
+ // List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
+ // if (inglassInfo != null) {
+ // if (inglassInfo.size() > 0)
+ // jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
+ // }
// 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id
String queid = spianMapper.Selectqueueid();
+ String state = spianMapper.Selectqueuestate();
jsonObject.append("queid", queid);
+ jsonObject.append("state", state);
// 鑾峰彇鎵爜浣嶄笌涓婄墖浣嶇幓鐠冧俊鎭�
- List<Glass> form2 = homeMapper.GetQueueInfo(1);
- List<Glass> form3 = homeMapper.GetQueueInfo(2);
+ Glass form2 = homeMapper.GetQueueInfo(2);
+ Glass form3 = homeMapper.GetQueueInfo(1);
jsonObject.append("form2", form2);
jsonObject.append("form3", form3);
// List<Short> paramlists = new ArrayList<Short>();
@@ -80,14 +91,7 @@
// paramlists.add(para2);
// System.out.println(paramlists);
- if (paramlist != null) {
- 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 {
--
Gitblit v1.8.0