From 64352b45add6bee426c2d3042fd141e33106abc2 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 07 四月 2021 09:43:54 +0800
Subject: [PATCH] 去除导入空白行
---
src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java | 5 +++++
src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java | 3 +++
src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java | 6 ++++++
src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java | 5 +++--
src/main/java/com/nanometer/smartlab/service/SysSupplierServiceImpl.java | 3 +++
src/main/java/com/nanometer/smartlab/controller/UserMngController.java | 3 +++
src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java | 4 ++++
src/main/java/com/nanometer/smartlab/service/DangerousEncodeServiceImpl.java | 3 +++
8 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
index 5534258..8744fd6 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)));
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
index 50578ee..0238a7f 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
@@ -151,8 +151,9 @@
}
valuesList.add(cellInfo);
-
-
+ }
+ if (valuesList.size() != 8){
+ break;
}
System.out.println("value : "+valuesList);
SysLaboratory laboratory=new SysLaboratory();
diff --git a/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java b/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java
index 66eeb1d..9321228 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java
@@ -598,6 +598,9 @@
}
}
+ if (valuesList.size() != 6){
+ break;
+ }
System.out.println("value : "+valuesList);
sysReagent.setName(valuesList.get(0));//试剂名称
sysReagent.setProductHome(valuesList.get(1));//厂家
@@ -751,6 +754,9 @@
valuesList.add(cellInfo);
}
}
+ if (valuesList.size() != 13){
+ break;
+ }
System.out.println("value : "+valuesList);
sysReagent.setProductSn(valuesList.get(0));//产品编号
diff --git a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
index 8c21388..48c079b 100644
--- a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
@@ -198,6 +198,9 @@
}
System.out.println("size : "+valuesList.size());
System.out.println("value : "+valuesList);
+ if (valuesList.size() != 14){
+ break;
+ }
SysUser sysUser=new SysUser();
sysUser.setCompany(valuesList.get(0));//单位
sysUser.setDepartment(valuesList.get(1));//部门
diff --git a/src/main/java/com/nanometer/smartlab/service/DangerousEncodeServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/DangerousEncodeServiceImpl.java
index fe1814c..7a014b9 100644
--- a/src/main/java/com/nanometer/smartlab/service/DangerousEncodeServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/DangerousEncodeServiceImpl.java
@@ -111,6 +111,9 @@
}
valuesList.add(cellInfo);
}
+ if (valuesList.size() != 12){
+ break;
+ }
//柜号 试剂名称码 试剂名称 CAS号 备注 性状 特性 相忌 状态 灭火器 随机码 编码
DangerousEncode dangerousEncode = new DangerousEncode();
dangerousEncode.setContainerNumber(valuesList.get(0));
diff --git a/src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java
index 5a6321b..4a1b80d 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java
@@ -171,6 +171,11 @@
}
valuesList.add(cellInfo);
}
+
+ if (valuesList.size() != 3){
+ break;
+ }
+
//重名判断
String controlName = valuesList.get(0);
if (controllerInfo.contains(controlName)){
diff --git a/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
index dd9d421..806cfef 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
@@ -213,6 +213,10 @@
valuesList.add(cellInfo);
}
+ if (valuesList.size() != 4){
+ break;
+ }
+
if (userMap.get(valuesList.get(2)) == null) {
throw new Exception("课题负责人不存在");
}
diff --git a/src/main/java/com/nanometer/smartlab/service/SysSupplierServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysSupplierServiceImpl.java
index 60f2897..f194a80 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysSupplierServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysSupplierServiceImpl.java
@@ -218,6 +218,9 @@
}
valuesList.add(cellInfo);
}
+ if (valuesList.size() != 4){
+ break;
+ }
SysSupplier sysSupplier = new SysSupplier();
//这一行有供应商是数据库里的就跳过
--
Gitblit v1.9.2