From c87738a78f57e6f68a0111d68ef3748b29dc1eda Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 23 六月 2021 12:21:59 +0800
Subject: [PATCH] 修改试剂排序
---
src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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..4a1b80d 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
@@ -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<>();
@@ -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);
}
--
Gitblit v1.9.2