diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6619d81..41cd226 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -101,9 +101,6 @@ net.sf.ehcache ehcache-core - - - org.apache.poi ooxml-schemas diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6619d81..41cd226 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -101,9 +101,6 @@ net.sf.ehcache ehcache-core - - - org.apache.poi ooxml-schemas 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 16259bc..988f6a3 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 @@ -151,12 +151,13 @@ List results = new ArrayList<>(); //设置表头与字段映射,可通过反射获取 Map mapper = new HashMap<>(); - mapper.put("设备编号", "devcode");//判断唯一 + //判断唯一 + mapper.put("设备编号", "devcode"); mapper.put("设备名称", "deviceName"); - mapper.put("设备类型", "deviceTypeName");//需要转换 - mapper.put("设备型号", "modelName");//需要转换 - mapper.put("井编号", "wellCode");//需要转换 - mapper.put("数据集中器编号", "concenCode");//需要转换 + mapper.put("设备类型", "deviceTypeName"); + mapper.put("设备型号", "modelName"); + mapper.put("井编号", "wellCode"); + mapper.put("数据集中器编号", "concenCode"); mapper.put("设备安装时间", "installDateFmt"); try { try (InputStream in = file.getInputStream()) { diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6619d81..41cd226 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -101,9 +101,6 @@ net.sf.ehcache ehcache-core - - - org.apache.poi ooxml-schemas 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 16259bc..988f6a3 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 @@ -151,12 +151,13 @@ List results = new ArrayList<>(); //设置表头与字段映射,可通过反射获取 Map mapper = new HashMap<>(); - mapper.put("设备编号", "devcode");//判断唯一 + //判断唯一 + mapper.put("设备编号", "devcode"); mapper.put("设备名称", "deviceName"); - mapper.put("设备类型", "deviceTypeName");//需要转换 - mapper.put("设备型号", "modelName");//需要转换 - mapper.put("井编号", "wellCode");//需要转换 - mapper.put("数据集中器编号", "concenCode");//需要转换 + mapper.put("设备类型", "deviceTypeName"); + mapper.put("设备型号", "modelName"); + mapper.put("井编号", "wellCode"); + mapper.put("数据集中器编号", "concenCode"); mapper.put("设备安装时间", "installDateFmt"); try { try (InputStream in = file.getInputStream()) { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index c314e9b..d028e07 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -32,7 +32,7 @@ #flowable数据源和多数据源配置 casic: - kaptcha-open: true #是否开启登录时验证码 (true/false) + kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha/base64,/config/baseConfig,/route/mockToken,/job/updateSinkJob,/route/sync,/websocket/*