From 94714af765326bc0567a336952b0811667b7be92 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期三, 27 十月 2021 16:59:27 +0800
Subject: [PATCH] 货柜预警接口:alarm 字典:alarm_type 01 主电掉电，备电工作 显示:名称+地点+柜号+内容
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java | 75 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
index 95e1f42..2650e7a 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
@@ -2,16 +2,13 @@
import java.io.InputStream;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import javax.annotation.Resource;
import com.nanometer.smartlab.entity.BaseMeta;
import com.nanometer.smartlab.entity.SysLaboratory;
-import com.nanometer.smartlab.service.SysLaboratoryService;
+import com.nanometer.smartlab.service.*;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -29,9 +26,6 @@
import com.nanometer.smartlab.entity.SysController;
import com.nanometer.smartlab.entity.SysLaboratoryContainer;
-import com.nanometer.smartlab.service.BaseMetaService;
-import com.nanometer.smartlab.service.SysControllerService;
-import com.nanometer.smartlab.service.SysLaboratoryContainerService;
import com.nanometer.smartlab.util.Constants;
import com.nanometer.smartlab.util.FacesUtils;
@@ -55,6 +49,8 @@
private BaseMetaService baseMetaService;
@Resource
private SysLaboratoryService sysLaboratoryService;
+ @Resource
+ private SysProjectService sysProjectService;
/**
* 数据源
*/
@@ -230,7 +226,7 @@
public void export2Excel(){
try {
- List<Map> list = sysLaboratoryContainerService.exportExcelList(laboratoryType, laboratoryName);
+ List<Map> list = sysLaboratoryContainerService.exportExcelList(laboratoryType, laboratoryName,project,controllerName);
sysLaboratoryContainerService.export2Excel(list);
}catch (Exception e){
e.printStackTrace();
@@ -294,18 +290,34 @@
}
valuesList.add(cellInfo);
}
+ if (valuesList.size() != 10){
+ break;
+ }
System.out.println("value : "+valuesList);
SysLaboratoryContainer sysLaboratoryContainer=new SysLaboratoryContainer();
sysLaboratoryContainer.setLaboratoryId(getLabId(sysLaboratories,valuesList.get(0)));
- sysLaboratoryContainer.setControllerCode(getConCode(sysControllers,valuesList.get(1)));
- sysLaboratoryContainer.setContainerCode(valuesList.get(2));
- sysLaboratoryContainer.setType(getBaseMetaId(typeList,valuesList.get(3)));
- sysLaboratoryContainer.setInfoCode(valuesList.get(4));
- sysLaboratoryContainer.setStructure(getBaseMetaId(struList,valuesList.get(5)));
- sysLaboratoryContainer.setName(valuesList.get(6));
- if(valuesList.get(3).equals("智能柜")){
- sysLaboratoryContainer.setCharacterLeft(getBaseMetaId(charList,valuesList.get(7)));
- sysLaboratoryContainer.setCharacterRight(getBaseMetaId(charList,valuesList.get(8)));
+ if (!valuesList.get(1).replace(" ","").isEmpty()){
+ List<String> projects = Arrays.asList(valuesList.get(1).split(","));
+ for (String project : projects) {
+ //不存再就直接推出
+ if (!sysProjectService.isExistProject(project)) {
+ throw new Exception("课题组不存在,（" + i + "行）");
+ }
+ }
+ //都存在就设置
+ sysLaboratoryContainer.setProject(valuesList.get(1).replace(" ",""));
+ }else{
+ sysLaboratoryContainer.setProject(null);
+ }
+ sysLaboratoryContainer.setControllerCode(getConCode(sysControllers,valuesList.get(2)));
+ sysLaboratoryContainer.setContainerCode(valuesList.get(3));
+ sysLaboratoryContainer.setType(getBaseMetaId(typeList,valuesList.get(4)));
+ sysLaboratoryContainer.setInfoCode(valuesList.get(5));
+ sysLaboratoryContainer.setStructure(getBaseMetaId(struList,valuesList.get(6)));
+ sysLaboratoryContainer.setName(valuesList.get(7));
+ if(valuesList.get(4).equals("智能柜")){
+ sysLaboratoryContainer.setCharacterLeft(getBaseMetaId(charList,valuesList.get(8)));
+ sysLaboratoryContainer.setCharacterRight(getBaseMetaId(charList,valuesList.get(9)));
}
sysLaboratoryContainers.add(sysLaboratoryContainer);
}
@@ -392,6 +404,7 @@
list = sysLaboratoryContainerService.getSysLaboratoryContainerList(laboratoryType,
laboratoryName,null,project,controllerName, first, pageSize);
}
+ selectedList = new ArrayList<> ();
} catch (Exception e) {
logger.error(e);
}
@@ -400,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);
}
};
}
@@ -462,10 +475,8 @@
}
public List<SysController> getControllers() {
- if(controllers == null)
- {
this.controllers = sysControllerService.getAllControllerList();
- }
+
return controllers;
}
--
Gitblit v1.9.2