From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Mon, 01 Jul 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java
index 4c5aa0e..ab1463e 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java
@@ -38,8 +38,6 @@
SysControllerDao sysControllerDao;
@Resource(name = "sysLaboratoryContainerDao")
SysLaboratoryContainerDao sysLaboratoryContainerDao;
- @Resource(name = "sysControllerService")
- SysControllerService sysControllerService;
@Resource(name = "baseMetaService")
BaseMetaService baseMetaService;
@Override
@@ -62,7 +60,7 @@
throw new BusinessException(ExceptionEnumCode.DB_ERR,
MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), e);
}
-
+
}
@Override
@@ -102,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) {
@@ -114,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<>();
@@ -126,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());
@@ -173,6 +171,11 @@
}
valuesList.add(cellInfo);
}
+
+ if (valuesList.size() != 3){
+ break;
+ }
+
//重名判断
String controlName = valuesList.get(0);
if (controllerInfo.contains(controlName)){
@@ -196,7 +199,7 @@
sysController.setControllerCode(controlCode);
sysController.setControllerName(controlName);
sysController.setType(typeMap.get(controlType));
- sysControllerService.insertSysController(sysController);
+ this.insertSysController(sysController);
controllerInfo.add(controlName);
controllerInfo.add(controlCode);
}
@@ -221,7 +224,7 @@
}
@Override
- public SysController getSysController(Integer id) {
+ public SysController getSysController(Long id) {
try {
return this.sysControllerDao.getSysController(id);
} catch (DataAccessException e) {
--
Gitblit v1.9.2