diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 102e2a3..df4ea60 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -178,7 +178,7 @@
mapper.put("设备安装时间", "installDateFmt");
mapper.put("网络类型", "networkType");
mapper.put("通信协议", "protocol");
- mapper.put("井权属单位名称", "deptName");
+ mapper.put("井权属单位代码", "deptId");
try {
try (InputStream in = file.getInputStream()) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 102e2a3..df4ea60 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -178,7 +178,7 @@
mapper.put("设备安装时间", "installDateFmt");
mapper.put("网络类型", "networkType");
mapper.put("通信协议", "protocol");
- mapper.put("井权属单位名称", "deptName");
+ mapper.put("井权属单位代码", "deptId");
try {
try (InputStream in = file.getInputStream()) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 7aeef12..1dcf311 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -40,7 +40,6 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.stream.Collectors;
/**
*
@@ -264,7 +263,8 @@
public List addDeviceBatch(List results) {
//读取全部组织信息
List deptList = permissionService.getAllDepts("");
- Map deptMaps = deptList.stream().collect(Collectors.toMap(Dept::getFullname, dept -> dept));
+ Map deptMaps = new HashMap<>();
+ deptList.forEach(dept -> deptMaps.put(Convert.toStr(dept.getId()), dept));
BeanPropertyBindingResult beanPropertyBindingResult = new BeanPropertyBindingResult(Device.class, "设备类型导入校验");
Map isAddConcentrator = new HashMap<>();
@@ -277,7 +277,7 @@
for (Device result : results) {
index[0]++;
//查询是否存在
- Dept dept = deptMaps.get(result.getDeptName());
+ Dept dept = deptMaps.get(result.getDeptId());
if (dept == null) {
wellInfoCodes.append(index[0]).append(",");
continue;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 102e2a3..df4ea60 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -178,7 +178,7 @@
mapper.put("设备安装时间", "installDateFmt");
mapper.put("网络类型", "networkType");
mapper.put("通信协议", "protocol");
- mapper.put("井权属单位名称", "deptName");
+ mapper.put("井权属单位代码", "deptId");
try {
try (InputStream in = file.getInputStream()) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 7aeef12..1dcf311 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -40,7 +40,6 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.stream.Collectors;
/**
*
@@ -264,7 +263,8 @@
public List addDeviceBatch(List results) {
//读取全部组织信息
List deptList = permissionService.getAllDepts("");
- Map deptMaps = deptList.stream().collect(Collectors.toMap(Dept::getFullname, dept -> dept));
+ Map deptMaps = new HashMap<>();
+ deptList.forEach(dept -> deptMaps.put(Convert.toStr(dept.getId()), dept));
BeanPropertyBindingResult beanPropertyBindingResult = new BeanPropertyBindingResult(Device.class, "设备类型导入校验");
Map isAddConcentrator = new HashMap<>();
@@ -277,7 +277,7 @@
for (Device result : results) {
index[0]++;
//查询是否存在
- Dept dept = deptMaps.get(result.getDeptName());
+ Dept dept = deptMaps.get(result.getDeptId());
if (dept == null) {
wellInfoCodes.append(index[0]).append(",");
continue;
diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx
index 0b87968..7a343e8 100644
--- a/casic-web/src/main/resources/config/temp/device_template.xlsx
+++ b/casic-web/src/main/resources/config/temp/device_template.xlsx
Binary files differ