From 25eca015c9edb5a8ab3fd9d68a8fd785619c1372 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 28 二月 2022 11:24:48 +0800
Subject: [PATCH] 仓库状态温湿度阈值警报字段
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
index a12df41..2650e7a 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
@@ -290,6 +290,9 @@
}
valuesList.add(cellInfo);
}
+ if (valuesList.size() != 10){
+ break;
+ }
System.out.println("value : "+valuesList);
SysLaboratoryContainer sysLaboratoryContainer=new SysLaboratoryContainer();
sysLaboratoryContainer.setLaboratoryId(getLabId(sysLaboratories,valuesList.get(0)));
@@ -401,6 +404,7 @@
list = sysLaboratoryContainerService.getSysLaboratoryContainerList(laboratoryType,
laboratoryName,null,project,controllerName, first, pageSize);
}
+ selectedList = new ArrayList<> ();
} catch (Exception e) {
logger.error(e);
}
@@ -409,17 +413,17 @@
@Override
public SysLaboratoryContainer getRowData(String rowKey) {
- Iterator<SysLaboratoryContainer> iterator = this.iterator();
- if (iterator != null) {
- SysLaboratoryContainer su = null;
- while (iterator.hasNext()) {
- su = iterator.next();
- if (rowKey.equals(su.getId())) {
- return su;
- }
- }
- }
- return null;
+// Iterator<SysLaboratoryContainer> iterator = this.iterator();
+// if (iterator != null) {
+// SysLaboratoryContainer su = null;
+// while (iterator.hasNext()) {
+// su = iterator.next();
+// if (rowKey.equals(su.getId())) {
+// return su;
+// }
+// }
+// }
+ return sysLaboratoryContainerService.getSysLaboratoryContainer(rowKey);
}
};
}
@@ -471,8 +475,8 @@
}
public List<SysController> getControllers() {
- this.controllers = sysControllerService.getAllControllerList();
-
+ this.controllers = sysControllerService.getAllControllerList();
+
return controllers;
}
--
Gitblit v1.9.2