From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java
index a1c6c0f..ab1463e 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java
@@ -10,6 +10,7 @@
import com.nanometer.smartlab.entity.BaseMeta;
import com.nanometer.smartlab.entity.SysLaboratoryContainer;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import com.nanometer.smartlab.util.ExcelUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -37,8 +38,6 @@
SysControllerDao sysControllerDao;
@Resource(name = "sysLaboratoryContainerDao")
SysLaboratoryContainerDao sysLaboratoryContainerDao;
- @Resource(name = "sysControllerService")
- SysControllerService sysControllerService;
@Resource(name = "baseMetaService")
BaseMetaService baseMetaService;
@Override
@@ -61,7 +60,7 @@
throw new BusinessException(ExceptionEnumCode.DB_ERR,
MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), e);
}
-
+
}
@Override
@@ -101,7 +100,7 @@
}
@Override
- public int deleteSysControllers(List<Integer> ids) {
+ public int deleteSysControllers(List<Long> ids) {
try {
return this.sysControllerDao.deleteSysControllers(ids);
} catch (DataAccessException e) {
@@ -113,7 +112,7 @@
@Override
public void uploadFile(FileUploadEvent event) throws Exception{
- List<SysController> sysControllers=sysControllerService.getAllControllerList();
+ List<SysController> sysControllers=this.getAllControllerList();
List<BaseMeta> typeList=baseMetaService.getBaseMetaList("controller_type");
//主控名字和条码
HashSet<String> controllerInfo = new HashSet<>();
@@ -125,7 +124,7 @@
}
//主控类型
- Map<String, String> typeMap = new HashMap<>();
+ Map<String, Long> typeMap = new HashMap<>();
if (typeList != null && typeList.size() > 0) {
typeList.forEach(type->{
typeMap.put(type.getMetaValue(), type.getId());
@@ -172,6 +171,11 @@
}
valuesList.add(cellInfo);
}
+
+ if (valuesList.size() != 3){
+ break;
+ }
+
//重名判断
String controlName = valuesList.get(0);
if (controllerInfo.contains(controlName)){
@@ -195,13 +199,32 @@
sysController.setControllerCode(controlCode);
sysController.setControllerName(controlName);
sysController.setType(typeMap.get(controlType));
- sysControllerService.insertSysController(sysController);
+ this.insertSysController(sysController);
+ controllerInfo.add(controlName);
+ controllerInfo.add(controlCode);
}
}
- @Override
- public SysController getSysController(Integer id) {
+ @Override
+ public List<Map> exportExcelList(String name, String code) {
+ Map<String, String> params = new HashMap<>();
+ params.put("name", name);
+ params.put("code", code);
+ return sysControllerDao.exportExcelList(params);
+ }
+
+ @Override
+ public void export2Excel(List<Map> list) throws Exception {
+ Map<String, String> map = new LinkedHashMap<>();
+ map.put("name", "设备名称");
+ map.put("code", "设备代码");
+ map.put("type", "设备类型");
+ ExcelUtils.export2Excel(list,"主控设备信息",map);
+ }
+
+ @Override
+ public SysController getSysController(Long id) {
try {
return this.sysControllerDao.getSysController(id);
} catch (DataAccessException e) {
--
Gitblit v1.9.2