From cdc594d12e46b7dd2e37c7a2071c133f8404f9be Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 12 九月 2023 18:25:55 +0800
Subject: [PATCH] 测试代码，部分代码进行优化
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 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 258556f..953fd91 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
@@ -5,7 +5,6 @@
import java.util.ArrayList;
import java.util.List;
-
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
import com.example.springboot.mapper.HomeMapper;
@@ -18,19 +17,18 @@
public void run() {
while (this != null) {
try {
- Thread.sleep(5000);
+ Thread.sleep(10000);
} catch (InterruptedException e) {
e.printStackTrace();
}
-
JSONObject jsonObject = new JSONObject();
-
- //娉ㄥ叆mapper
+
+ // 娉ㄥ叆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();
@@ -39,23 +37,30 @@
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();
+ // 鏌ヨ鎶ヨ淇℃伅
+ List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
jsonObject.append("alarmmg", alarmmg);
- //璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
+ // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
List<String> addressList = new ArrayList<String>();
- addressList.add("DB105.DBW0");
- addressList.add("DB105.DBW12");
+ addressList.add("DB106.0");
+ addressList.add("DB106.12");
List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
- //灏嗛泦鍚堣浆涓烘暟缁�
+
+ // List<Short> paramlists = new ArrayList<Short>();
+ // short para1 = 1;
+ // short para2 = 2;
+ // paramlists.add(para1);
+ // paramlists.add(para2);
+ // System.out.println(paramlists);
+
if(paramlist!=null){
- Short[] paramlists = paramlist.toArray(new Short[0]);
- jsonObject.append("params", paramlists);
+ // Short[] paramlists = paramlist.toArray(new Short[0]);
+ jsonObject.append("params", paramlist);
}
// jsonObject.append("params", new short[] { 30, 40, });
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Home");
--
Gitblit v1.8.0