From 6384d2fc361207ecf4697d17be08f5c22ce57597 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 24 八月 2020 13:33:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 857c326..0a5d393 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -19,7 +19,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Random;
/**
* 杈撻�佽澶囨帴鍙�
@@ -64,13 +63,21 @@
@ManagerAuth(memo = "杈撻�佽澶噋lc寮傚父淇℃伅琛�")
public R plcErrorTable(){
List<PlcErrorTableVo> list = new ArrayList<>();
- for (int i = 0; i<new Random().nextInt(13); i++){
- PlcErrorTableVo table = new PlcErrorTableVo();
- table.setNo(String.valueOf(i));
- table.setError("寮傚父淇℃伅");
- table.setPlcDesc("plc寮傚父鎻忚堪");
- list.add(table);
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ Map<Integer, StaProtocol> station = devpThread.getStation();
+
+ for(Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+
+ vo.setPlcDesc(""); // todo:luxiaotao plc閿欒鎻忚堪
+ vo.setError(""); // todo:luxiaotao 寮傚父淇℃伅
+ list.add(vo);
+ }
+
}
+
list.sort((o1, o2) -> {
if (o1.getNo().compareTo(o2.getNo()) > 0){
return 1;
--
Gitblit v1.9.1