diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 91dc311..793734c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -3,7 +3,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author cz @@ -124,28 +120,7 @@ */ @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { - List results = new ArrayList<>(); - //设置表头与字段映射,可通过反射获取 - Map mapper = new HashMap<>(); - //判断唯一 - mapper.put("管线编号", "pipelineCode"); - mapper.put("管线名称", "pipelineName"); - mapper.put("管线类型", "pipelineType"); - mapper.put("管径(mm)", "pipeDiameter"); - mapper.put("材质", "material"); - mapper.put("详细地址", "position"); - mapper.put("埋设方式", "buryMode"); - mapper.put("管线位置", "pipelinePosition"); - mapper.put("建设年代", "constructEra"); - mapper.put("权属单位代码", "deptid"); - mapper.put("起始地面高(mm)", "startGroundHeight"); - mapper.put("起始埋深(m)", "startBuryDeep"); - mapper.put("起始管顶高(mm)", "startPipecrownHeight"); - mapper.put("终止地面高(mm)", "endGroundHeight"); - mapper.put("终止埋深(m)", "endBuryDeep"); - mapper.put("终止管顶高(mm)", "endPipecrownHeight"); - mapper.put("设计压力(Mpa)", "designPressure"); - mapper.put("瞬时流量(m*m*m)", "instantaneousFlow"); + List results = null; try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusPipeline.class, file, null, null); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 91dc311..793734c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -3,7 +3,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author cz @@ -124,28 +120,7 @@ */ @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { - List results = new ArrayList<>(); - //设置表头与字段映射,可通过反射获取 - Map mapper = new HashMap<>(); - //判断唯一 - mapper.put("管线编号", "pipelineCode"); - mapper.put("管线名称", "pipelineName"); - mapper.put("管线类型", "pipelineType"); - mapper.put("管径(mm)", "pipeDiameter"); - mapper.put("材质", "material"); - mapper.put("详细地址", "position"); - mapper.put("埋设方式", "buryMode"); - mapper.put("管线位置", "pipelinePosition"); - mapper.put("建设年代", "constructEra"); - mapper.put("权属单位代码", "deptid"); - mapper.put("起始地面高(mm)", "startGroundHeight"); - mapper.put("起始埋深(m)", "startBuryDeep"); - mapper.put("起始管顶高(mm)", "startPipecrownHeight"); - mapper.put("终止地面高(mm)", "endGroundHeight"); - mapper.put("终止埋深(m)", "endBuryDeep"); - mapper.put("终止管顶高(mm)", "endPipecrownHeight"); - mapper.put("设计压力(Mpa)", "designPressure"); - mapper.put("瞬时流量(m*m*m)", "instantaneousFlow"); + List results = null; try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusPipeline.class, file, null, null); diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx new file mode 100644 index 0000000..2786cf8 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx Binary files differ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 91dc311..793734c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -3,7 +3,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author cz @@ -124,28 +120,7 @@ */ @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { - List results = new ArrayList<>(); - //设置表头与字段映射,可通过反射获取 - Map mapper = new HashMap<>(); - //判断唯一 - mapper.put("管线编号", "pipelineCode"); - mapper.put("管线名称", "pipelineName"); - mapper.put("管线类型", "pipelineType"); - mapper.put("管径(mm)", "pipeDiameter"); - mapper.put("材质", "material"); - mapper.put("详细地址", "position"); - mapper.put("埋设方式", "buryMode"); - mapper.put("管线位置", "pipelinePosition"); - mapper.put("建设年代", "constructEra"); - mapper.put("权属单位代码", "deptid"); - mapper.put("起始地面高(mm)", "startGroundHeight"); - mapper.put("起始埋深(m)", "startBuryDeep"); - mapper.put("起始管顶高(mm)", "startPipecrownHeight"); - mapper.put("终止地面高(mm)", "endGroundHeight"); - mapper.put("终止埋深(m)", "endBuryDeep"); - mapper.put("终止管顶高(mm)", "endPipecrownHeight"); - mapper.put("设计压力(Mpa)", "designPressure"); - mapper.put("瞬时流量(m*m*m)", "instantaneousFlow"); + List results = null; try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusPipeline.class, file, null, null); diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx new file mode 100644 index 0000000..2786cf8 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx new file mode 100644 index 0000000..205b270 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 91dc311..793734c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -3,7 +3,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author cz @@ -124,28 +120,7 @@ */ @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { - List results = new ArrayList<>(); - //设置表头与字段映射,可通过反射获取 - Map mapper = new HashMap<>(); - //判断唯一 - mapper.put("管线编号", "pipelineCode"); - mapper.put("管线名称", "pipelineName"); - mapper.put("管线类型", "pipelineType"); - mapper.put("管径(mm)", "pipeDiameter"); - mapper.put("材质", "material"); - mapper.put("详细地址", "position"); - mapper.put("埋设方式", "buryMode"); - mapper.put("管线位置", "pipelinePosition"); - mapper.put("建设年代", "constructEra"); - mapper.put("权属单位代码", "deptid"); - mapper.put("起始地面高(mm)", "startGroundHeight"); - mapper.put("起始埋深(m)", "startBuryDeep"); - mapper.put("起始管顶高(mm)", "startPipecrownHeight"); - mapper.put("终止地面高(mm)", "endGroundHeight"); - mapper.put("终止埋深(m)", "endBuryDeep"); - mapper.put("终止管顶高(mm)", "endPipecrownHeight"); - mapper.put("设计压力(Mpa)", "designPressure"); - mapper.put("瞬时流量(m*m*m)", "instantaneousFlow"); + List results = null; try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusPipeline.class, file, null, null); diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx new file mode 100644 index 0000000..2786cf8 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx new file mode 100644 index 0000000..205b270 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx new file mode 100644 index 0000000..4858800 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx Binary files differ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 91dc311..793734c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -3,7 +3,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author cz @@ -124,28 +120,7 @@ */ @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { - List results = new ArrayList<>(); - //设置表头与字段映射,可通过反射获取 - Map mapper = new HashMap<>(); - //判断唯一 - mapper.put("管线编号", "pipelineCode"); - mapper.put("管线名称", "pipelineName"); - mapper.put("管线类型", "pipelineType"); - mapper.put("管径(mm)", "pipeDiameter"); - mapper.put("材质", "material"); - mapper.put("详细地址", "position"); - mapper.put("埋设方式", "buryMode"); - mapper.put("管线位置", "pipelinePosition"); - mapper.put("建设年代", "constructEra"); - mapper.put("权属单位代码", "deptid"); - mapper.put("起始地面高(mm)", "startGroundHeight"); - mapper.put("起始埋深(m)", "startBuryDeep"); - mapper.put("起始管顶高(mm)", "startPipecrownHeight"); - mapper.put("终止地面高(mm)", "endGroundHeight"); - mapper.put("终止埋深(m)", "endBuryDeep"); - mapper.put("终止管顶高(mm)", "endPipecrownHeight"); - mapper.put("设计压力(Mpa)", "designPressure"); - mapper.put("瞬时流量(m*m*m)", "instantaneousFlow"); + List results = null; try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusPipeline.class, file, null, null); diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx new file mode 100644 index 0000000..2786cf8 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx new file mode 100644 index 0000000..205b270 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx new file mode 100644 index 0000000..4858800 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/config_template.xlsx b/casic-web/src/main/resources/config/temp/config_template.xlsx new file mode 100644 index 0000000..3af0e2b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/config_template.xlsx Binary files differ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 91dc311..793734c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -3,7 +3,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author cz @@ -124,28 +120,7 @@ */ @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { - List results = new ArrayList<>(); - //设置表头与字段映射,可通过反射获取 - Map mapper = new HashMap<>(); - //判断唯一 - mapper.put("管线编号", "pipelineCode"); - mapper.put("管线名称", "pipelineName"); - mapper.put("管线类型", "pipelineType"); - mapper.put("管径(mm)", "pipeDiameter"); - mapper.put("材质", "material"); - mapper.put("详细地址", "position"); - mapper.put("埋设方式", "buryMode"); - mapper.put("管线位置", "pipelinePosition"); - mapper.put("建设年代", "constructEra"); - mapper.put("权属单位代码", "deptid"); - mapper.put("起始地面高(mm)", "startGroundHeight"); - mapper.put("起始埋深(m)", "startBuryDeep"); - mapper.put("起始管顶高(mm)", "startPipecrownHeight"); - mapper.put("终止地面高(mm)", "endGroundHeight"); - mapper.put("终止埋深(m)", "endBuryDeep"); - mapper.put("终止管顶高(mm)", "endPipecrownHeight"); - mapper.put("设计压力(Mpa)", "designPressure"); - mapper.put("瞬时流量(m*m*m)", "instantaneousFlow"); + List results = null; try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusPipeline.class, file, null, null); diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx new file mode 100644 index 0000000..2786cf8 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx new file mode 100644 index 0000000..205b270 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx new file mode 100644 index 0000000..4858800 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/config_template.xlsx b/casic-web/src/main/resources/config/temp/config_template.xlsx new file mode 100644 index 0000000..3af0e2b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx new file mode 100644 index 0000000..0e0012f --- /dev/null +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 91dc311..793734c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -3,7 +3,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author cz @@ -124,28 +120,7 @@ */ @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { - List results = new ArrayList<>(); - //设置表头与字段映射,可通过反射获取 - Map mapper = new HashMap<>(); - //判断唯一 - mapper.put("管线编号", "pipelineCode"); - mapper.put("管线名称", "pipelineName"); - mapper.put("管线类型", "pipelineType"); - mapper.put("管径(mm)", "pipeDiameter"); - mapper.put("材质", "material"); - mapper.put("详细地址", "position"); - mapper.put("埋设方式", "buryMode"); - mapper.put("管线位置", "pipelinePosition"); - mapper.put("建设年代", "constructEra"); - mapper.put("权属单位代码", "deptid"); - mapper.put("起始地面高(mm)", "startGroundHeight"); - mapper.put("起始埋深(m)", "startBuryDeep"); - mapper.put("起始管顶高(mm)", "startPipecrownHeight"); - mapper.put("终止地面高(mm)", "endGroundHeight"); - mapper.put("终止埋深(m)", "endBuryDeep"); - mapper.put("终止管顶高(mm)", "endPipecrownHeight"); - mapper.put("设计压力(Mpa)", "designPressure"); - mapper.put("瞬时流量(m*m*m)", "instantaneousFlow"); + List results = null; try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusPipeline.class, file, null, null); diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx new file mode 100644 index 0000000..2786cf8 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx new file mode 100644 index 0000000..205b270 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx new file mode 100644 index 0000000..4858800 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/config_template.xlsx b/casic-web/src/main/resources/config/temp/config_template.xlsx new file mode 100644 index 0000000..3af0e2b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx new file mode 100644 index 0000000..0e0012f --- /dev/null +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/dig_config_template.xlsx b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx new file mode 100644 index 0000000..2ddc235 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx Binary files differ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 91dc311..793734c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -3,7 +3,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author cz @@ -124,28 +120,7 @@ */ @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { - List results = new ArrayList<>(); - //设置表头与字段映射,可通过反射获取 - Map mapper = new HashMap<>(); - //判断唯一 - mapper.put("管线编号", "pipelineCode"); - mapper.put("管线名称", "pipelineName"); - mapper.put("管线类型", "pipelineType"); - mapper.put("管径(mm)", "pipeDiameter"); - mapper.put("材质", "material"); - mapper.put("详细地址", "position"); - mapper.put("埋设方式", "buryMode"); - mapper.put("管线位置", "pipelinePosition"); - mapper.put("建设年代", "constructEra"); - mapper.put("权属单位代码", "deptid"); - mapper.put("起始地面高(mm)", "startGroundHeight"); - mapper.put("起始埋深(m)", "startBuryDeep"); - mapper.put("起始管顶高(mm)", "startPipecrownHeight"); - mapper.put("终止地面高(mm)", "endGroundHeight"); - mapper.put("终止埋深(m)", "endBuryDeep"); - mapper.put("终止管顶高(mm)", "endPipecrownHeight"); - mapper.put("设计压力(Mpa)", "designPressure"); - mapper.put("瞬时流量(m*m*m)", "instantaneousFlow"); + List results = null; try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusPipeline.class, file, null, null); diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx new file mode 100644 index 0000000..2786cf8 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx new file mode 100644 index 0000000..205b270 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx new file mode 100644 index 0000000..4858800 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/config_template.xlsx b/casic-web/src/main/resources/config/temp/config_template.xlsx new file mode 100644 index 0000000..3af0e2b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx new file mode 100644 index 0000000..0e0012f --- /dev/null +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/dig_config_template.xlsx b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx new file mode 100644 index 0000000..2ddc235 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx new file mode 100644 index 0000000..19af71a --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx Binary files differ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 91dc311..793734c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -3,7 +3,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author cz @@ -124,28 +120,7 @@ */ @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { - List results = new ArrayList<>(); - //设置表头与字段映射,可通过反射获取 - Map mapper = new HashMap<>(); - //判断唯一 - mapper.put("管线编号", "pipelineCode"); - mapper.put("管线名称", "pipelineName"); - mapper.put("管线类型", "pipelineType"); - mapper.put("管径(mm)", "pipeDiameter"); - mapper.put("材质", "material"); - mapper.put("详细地址", "position"); - mapper.put("埋设方式", "buryMode"); - mapper.put("管线位置", "pipelinePosition"); - mapper.put("建设年代", "constructEra"); - mapper.put("权属单位代码", "deptid"); - mapper.put("起始地面高(mm)", "startGroundHeight"); - mapper.put("起始埋深(m)", "startBuryDeep"); - mapper.put("起始管顶高(mm)", "startPipecrownHeight"); - mapper.put("终止地面高(mm)", "endGroundHeight"); - mapper.put("终止埋深(m)", "endBuryDeep"); - mapper.put("终止管顶高(mm)", "endPipecrownHeight"); - mapper.put("设计压力(Mpa)", "designPressure"); - mapper.put("瞬时流量(m*m*m)", "instantaneousFlow"); + List results = null; try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusPipeline.class, file, null, null); diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx new file mode 100644 index 0000000..2786cf8 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx new file mode 100644 index 0000000..205b270 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx new file mode 100644 index 0000000..4858800 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/config_template.xlsx b/casic-web/src/main/resources/config/temp/config_template.xlsx new file mode 100644 index 0000000..3af0e2b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx new file mode 100644 index 0000000..0e0012f --- /dev/null +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/dig_config_template.xlsx b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx new file mode 100644 index 0000000..2ddc235 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx new file mode 100644 index 0000000..19af71a --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx new file mode 100644 index 0000000..4df3416 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx Binary files differ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 91dc311..793734c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -3,7 +3,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author cz @@ -124,28 +120,7 @@ */ @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { - List results = new ArrayList<>(); - //设置表头与字段映射,可通过反射获取 - Map mapper = new HashMap<>(); - //判断唯一 - mapper.put("管线编号", "pipelineCode"); - mapper.put("管线名称", "pipelineName"); - mapper.put("管线类型", "pipelineType"); - mapper.put("管径(mm)", "pipeDiameter"); - mapper.put("材质", "material"); - mapper.put("详细地址", "position"); - mapper.put("埋设方式", "buryMode"); - mapper.put("管线位置", "pipelinePosition"); - mapper.put("建设年代", "constructEra"); - mapper.put("权属单位代码", "deptid"); - mapper.put("起始地面高(mm)", "startGroundHeight"); - mapper.put("起始埋深(m)", "startBuryDeep"); - mapper.put("起始管顶高(mm)", "startPipecrownHeight"); - mapper.put("终止地面高(mm)", "endGroundHeight"); - mapper.put("终止埋深(m)", "endBuryDeep"); - mapper.put("终止管顶高(mm)", "endPipecrownHeight"); - mapper.put("设计压力(Mpa)", "designPressure"); - mapper.put("瞬时流量(m*m*m)", "instantaneousFlow"); + List results = null; try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusPipeline.class, file, null, null); diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx new file mode 100644 index 0000000..2786cf8 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx new file mode 100644 index 0000000..205b270 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx new file mode 100644 index 0000000..4858800 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/config_template.xlsx b/casic-web/src/main/resources/config/temp/config_template.xlsx new file mode 100644 index 0000000..3af0e2b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx new file mode 100644 index 0000000..0e0012f --- /dev/null +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/dig_config_template.xlsx b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx new file mode 100644 index 0000000..2ddc235 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx new file mode 100644 index 0000000..19af71a --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx new file mode 100644 index 0000000..4df3416 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/methane_config_template.xlsx b/casic-web/src/main/resources/config/temp/methane_config_template.xlsx new file mode 100644 index 0000000..830059b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/methane_config_template.xlsx Binary files differ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 91dc311..793734c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -3,7 +3,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author cz @@ -124,28 +120,7 @@ */ @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { - List results = new ArrayList<>(); - //设置表头与字段映射,可通过反射获取 - Map mapper = new HashMap<>(); - //判断唯一 - mapper.put("管线编号", "pipelineCode"); - mapper.put("管线名称", "pipelineName"); - mapper.put("管线类型", "pipelineType"); - mapper.put("管径(mm)", "pipeDiameter"); - mapper.put("材质", "material"); - mapper.put("详细地址", "position"); - mapper.put("埋设方式", "buryMode"); - mapper.put("管线位置", "pipelinePosition"); - mapper.put("建设年代", "constructEra"); - mapper.put("权属单位代码", "deptid"); - mapper.put("起始地面高(mm)", "startGroundHeight"); - mapper.put("起始埋深(m)", "startBuryDeep"); - mapper.put("起始管顶高(mm)", "startPipecrownHeight"); - mapper.put("终止地面高(mm)", "endGroundHeight"); - mapper.put("终止埋深(m)", "endBuryDeep"); - mapper.put("终止管顶高(mm)", "endPipecrownHeight"); - mapper.put("设计压力(Mpa)", "designPressure"); - mapper.put("瞬时流量(m*m*m)", "instantaneousFlow"); + List results = null; try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusPipeline.class, file, null, null); diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx new file mode 100644 index 0000000..2786cf8 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx new file mode 100644 index 0000000..205b270 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx new file mode 100644 index 0000000..4858800 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/config_template.xlsx b/casic-web/src/main/resources/config/temp/config_template.xlsx new file mode 100644 index 0000000..3af0e2b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx new file mode 100644 index 0000000..0e0012f --- /dev/null +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/dig_config_template.xlsx b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx new file mode 100644 index 0000000..2ddc235 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx new file mode 100644 index 0000000..19af71a --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx new file mode 100644 index 0000000..4df3416 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/methane_config_template.xlsx b/casic-web/src/main/resources/config/temp/methane_config_template.xlsx new file mode 100644 index 0000000..830059b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/methane_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx b/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx new file mode 100644 index 0000000..70198ce --- /dev/null +++ b/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx Binary files differ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 91dc311..793734c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -3,7 +3,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author cz @@ -124,28 +120,7 @@ */ @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { - List results = new ArrayList<>(); - //设置表头与字段映射,可通过反射获取 - Map mapper = new HashMap<>(); - //判断唯一 - mapper.put("管线编号", "pipelineCode"); - mapper.put("管线名称", "pipelineName"); - mapper.put("管线类型", "pipelineType"); - mapper.put("管径(mm)", "pipeDiameter"); - mapper.put("材质", "material"); - mapper.put("详细地址", "position"); - mapper.put("埋设方式", "buryMode"); - mapper.put("管线位置", "pipelinePosition"); - mapper.put("建设年代", "constructEra"); - mapper.put("权属单位代码", "deptid"); - mapper.put("起始地面高(mm)", "startGroundHeight"); - mapper.put("起始埋深(m)", "startBuryDeep"); - mapper.put("起始管顶高(mm)", "startPipecrownHeight"); - mapper.put("终止地面高(mm)", "endGroundHeight"); - mapper.put("终止埋深(m)", "endBuryDeep"); - mapper.put("终止管顶高(mm)", "endPipecrownHeight"); - mapper.put("设计压力(Mpa)", "designPressure"); - mapper.put("瞬时流量(m*m*m)", "instantaneousFlow"); + List results = null; try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusPipeline.class, file, null, null); diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx new file mode 100644 index 0000000..2786cf8 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx new file mode 100644 index 0000000..205b270 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx new file mode 100644 index 0000000..4858800 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/config_template.xlsx b/casic-web/src/main/resources/config/temp/config_template.xlsx new file mode 100644 index 0000000..3af0e2b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx new file mode 100644 index 0000000..0e0012f --- /dev/null +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/dig_config_template.xlsx b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx new file mode 100644 index 0000000..2ddc235 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx new file mode 100644 index 0000000..19af71a --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx new file mode 100644 index 0000000..4df3416 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/methane_config_template.xlsx b/casic-web/src/main/resources/config/temp/methane_config_template.xlsx new file mode 100644 index 0000000..830059b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/methane_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx b/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx new file mode 100644 index 0000000..70198ce --- /dev/null +++ b/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/noise_config_template.xlsx b/casic-web/src/main/resources/config/temp/noise_config_template.xlsx new file mode 100644 index 0000000..f2386fe --- /dev/null +++ b/casic-web/src/main/resources/config/temp/noise_config_template.xlsx Binary files differ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 91dc311..793734c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -3,7 +3,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author cz @@ -124,28 +120,7 @@ */ @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { - List results = new ArrayList<>(); - //设置表头与字段映射,可通过反射获取 - Map mapper = new HashMap<>(); - //判断唯一 - mapper.put("管线编号", "pipelineCode"); - mapper.put("管线名称", "pipelineName"); - mapper.put("管线类型", "pipelineType"); - mapper.put("管径(mm)", "pipeDiameter"); - mapper.put("材质", "material"); - mapper.put("详细地址", "position"); - mapper.put("埋设方式", "buryMode"); - mapper.put("管线位置", "pipelinePosition"); - mapper.put("建设年代", "constructEra"); - mapper.put("权属单位代码", "deptid"); - mapper.put("起始地面高(mm)", "startGroundHeight"); - mapper.put("起始埋深(m)", "startBuryDeep"); - mapper.put("起始管顶高(mm)", "startPipecrownHeight"); - mapper.put("终止地面高(mm)", "endGroundHeight"); - mapper.put("终止埋深(m)", "endBuryDeep"); - mapper.put("终止管顶高(mm)", "endPipecrownHeight"); - mapper.put("设计压力(Mpa)", "designPressure"); - mapper.put("瞬时流量(m*m*m)", "instantaneousFlow"); + List results = null; try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusPipeline.class, file, null, null); diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx new file mode 100644 index 0000000..2786cf8 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx new file mode 100644 index 0000000..205b270 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx new file mode 100644 index 0000000..4858800 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/config_template.xlsx b/casic-web/src/main/resources/config/temp/config_template.xlsx new file mode 100644 index 0000000..3af0e2b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx new file mode 100644 index 0000000..0e0012f --- /dev/null +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/dig_config_template.xlsx b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx new file mode 100644 index 0000000..2ddc235 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx new file mode 100644 index 0000000..19af71a --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx new file mode 100644 index 0000000..4df3416 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/methane_config_template.xlsx b/casic-web/src/main/resources/config/temp/methane_config_template.xlsx new file mode 100644 index 0000000..830059b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/methane_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx b/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx new file mode 100644 index 0000000..70198ce --- /dev/null +++ b/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/noise_config_template.xlsx b/casic-web/src/main/resources/config/temp/noise_config_template.xlsx new file mode 100644 index 0000000..f2386fe --- /dev/null +++ b/casic-web/src/main/resources/config/temp/noise_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/pipeline_template.xlsx b/casic-web/src/main/resources/config/temp/pipeline_template.xlsx new file mode 100644 index 0000000..461cd52 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/pipeline_template.xlsx Binary files differ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 91dc311..793734c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -3,7 +3,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author cz @@ -124,28 +120,7 @@ */ @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { - List results = new ArrayList<>(); - //设置表头与字段映射,可通过反射获取 - Map mapper = new HashMap<>(); - //判断唯一 - mapper.put("管线编号", "pipelineCode"); - mapper.put("管线名称", "pipelineName"); - mapper.put("管线类型", "pipelineType"); - mapper.put("管径(mm)", "pipeDiameter"); - mapper.put("材质", "material"); - mapper.put("详细地址", "position"); - mapper.put("埋设方式", "buryMode"); - mapper.put("管线位置", "pipelinePosition"); - mapper.put("建设年代", "constructEra"); - mapper.put("权属单位代码", "deptid"); - mapper.put("起始地面高(mm)", "startGroundHeight"); - mapper.put("起始埋深(m)", "startBuryDeep"); - mapper.put("起始管顶高(mm)", "startPipecrownHeight"); - mapper.put("终止地面高(mm)", "endGroundHeight"); - mapper.put("终止埋深(m)", "endBuryDeep"); - mapper.put("终止管顶高(mm)", "endPipecrownHeight"); - mapper.put("设计压力(Mpa)", "designPressure"); - mapper.put("瞬时流量(m*m*m)", "instantaneousFlow"); + List results = null; try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusPipeline.class, file, null, null); diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx new file mode 100644 index 0000000..2786cf8 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx new file mode 100644 index 0000000..205b270 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx new file mode 100644 index 0000000..4858800 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/config_template.xlsx b/casic-web/src/main/resources/config/temp/config_template.xlsx new file mode 100644 index 0000000..3af0e2b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx new file mode 100644 index 0000000..0e0012f --- /dev/null +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/dig_config_template.xlsx b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx new file mode 100644 index 0000000..2ddc235 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx new file mode 100644 index 0000000..19af71a --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx new file mode 100644 index 0000000..4df3416 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/methane_config_template.xlsx b/casic-web/src/main/resources/config/temp/methane_config_template.xlsx new file mode 100644 index 0000000..830059b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/methane_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx b/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx new file mode 100644 index 0000000..70198ce --- /dev/null +++ b/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/noise_config_template.xlsx b/casic-web/src/main/resources/config/temp/noise_config_template.xlsx new file mode 100644 index 0000000..f2386fe --- /dev/null +++ b/casic-web/src/main/resources/config/temp/noise_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/pipeline_template.xlsx b/casic-web/src/main/resources/config/temp/pipeline_template.xlsx new file mode 100644 index 0000000..461cd52 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/pipeline_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx new file mode 100644 index 0000000..13720e4 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx Binary files differ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 91dc311..793734c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -3,7 +3,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author cz @@ -124,28 +120,7 @@ */ @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { - List results = new ArrayList<>(); - //设置表头与字段映射,可通过反射获取 - Map mapper = new HashMap<>(); - //判断唯一 - mapper.put("管线编号", "pipelineCode"); - mapper.put("管线名称", "pipelineName"); - mapper.put("管线类型", "pipelineType"); - mapper.put("管径(mm)", "pipeDiameter"); - mapper.put("材质", "material"); - mapper.put("详细地址", "position"); - mapper.put("埋设方式", "buryMode"); - mapper.put("管线位置", "pipelinePosition"); - mapper.put("建设年代", "constructEra"); - mapper.put("权属单位代码", "deptid"); - mapper.put("起始地面高(mm)", "startGroundHeight"); - mapper.put("起始埋深(m)", "startBuryDeep"); - mapper.put("起始管顶高(mm)", "startPipecrownHeight"); - mapper.put("终止地面高(mm)", "endGroundHeight"); - mapper.put("终止埋深(m)", "endBuryDeep"); - mapper.put("终止管顶高(mm)", "endPipecrownHeight"); - mapper.put("设计压力(Mpa)", "designPressure"); - mapper.put("瞬时流量(m*m*m)", "instantaneousFlow"); + List results = null; try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusPipeline.class, file, null, null); diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx new file mode 100644 index 0000000..2786cf8 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx new file mode 100644 index 0000000..205b270 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx new file mode 100644 index 0000000..4858800 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/config_template.xlsx b/casic-web/src/main/resources/config/temp/config_template.xlsx new file mode 100644 index 0000000..3af0e2b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx new file mode 100644 index 0000000..0e0012f --- /dev/null +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/dig_config_template.xlsx b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx new file mode 100644 index 0000000..2ddc235 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx new file mode 100644 index 0000000..19af71a --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx new file mode 100644 index 0000000..4df3416 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/methane_config_template.xlsx b/casic-web/src/main/resources/config/temp/methane_config_template.xlsx new file mode 100644 index 0000000..830059b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/methane_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx b/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx new file mode 100644 index 0000000..70198ce --- /dev/null +++ b/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/noise_config_template.xlsx b/casic-web/src/main/resources/config/temp/noise_config_template.xlsx new file mode 100644 index 0000000..f2386fe --- /dev/null +++ b/casic-web/src/main/resources/config/temp/noise_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/pipeline_template.xlsx b/casic-web/src/main/resources/config/temp/pipeline_template.xlsx new file mode 100644 index 0000000..461cd52 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/pipeline_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx new file mode 100644 index 0000000..13720e4 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/tempHumi_config_template.xlsx b/casic-web/src/main/resources/config/temp/tempHumi_config_template.xlsx new file mode 100644 index 0000000..cca284e --- /dev/null +++ b/casic-web/src/main/resources/config/temp/tempHumi_config_template.xlsx Binary files differ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 91dc311..793734c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -3,7 +3,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author cz @@ -124,28 +120,7 @@ */ @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { - List results = new ArrayList<>(); - //设置表头与字段映射,可通过反射获取 - Map mapper = new HashMap<>(); - //判断唯一 - mapper.put("管线编号", "pipelineCode"); - mapper.put("管线名称", "pipelineName"); - mapper.put("管线类型", "pipelineType"); - mapper.put("管径(mm)", "pipeDiameter"); - mapper.put("材质", "material"); - mapper.put("详细地址", "position"); - mapper.put("埋设方式", "buryMode"); - mapper.put("管线位置", "pipelinePosition"); - mapper.put("建设年代", "constructEra"); - mapper.put("权属单位代码", "deptid"); - mapper.put("起始地面高(mm)", "startGroundHeight"); - mapper.put("起始埋深(m)", "startBuryDeep"); - mapper.put("起始管顶高(mm)", "startPipecrownHeight"); - mapper.put("终止地面高(mm)", "endGroundHeight"); - mapper.put("终止埋深(m)", "endBuryDeep"); - mapper.put("终止管顶高(mm)", "endPipecrownHeight"); - mapper.put("设计压力(Mpa)", "designPressure"); - mapper.put("瞬时流量(m*m*m)", "instantaneousFlow"); + List results = null; try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusPipeline.class, file, null, null); diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx new file mode 100644 index 0000000..2786cf8 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx new file mode 100644 index 0000000..205b270 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx new file mode 100644 index 0000000..4858800 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/config_template.xlsx b/casic-web/src/main/resources/config/temp/config_template.xlsx new file mode 100644 index 0000000..3af0e2b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx new file mode 100644 index 0000000..0e0012f --- /dev/null +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/dig_config_template.xlsx b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx new file mode 100644 index 0000000..2ddc235 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx new file mode 100644 index 0000000..19af71a --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx new file mode 100644 index 0000000..4df3416 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/methane_config_template.xlsx b/casic-web/src/main/resources/config/temp/methane_config_template.xlsx new file mode 100644 index 0000000..830059b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/methane_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx b/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx new file mode 100644 index 0000000..70198ce --- /dev/null +++ b/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/noise_config_template.xlsx b/casic-web/src/main/resources/config/temp/noise_config_template.xlsx new file mode 100644 index 0000000..f2386fe --- /dev/null +++ b/casic-web/src/main/resources/config/temp/noise_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/pipeline_template.xlsx b/casic-web/src/main/resources/config/temp/pipeline_template.xlsx new file mode 100644 index 0000000..461cd52 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/pipeline_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx new file mode 100644 index 0000000..13720e4 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/tempHumi_config_template.xlsx b/casic-web/src/main/resources/config/temp/tempHumi_config_template.xlsx new file mode 100644 index 0000000..cca284e --- /dev/null +++ b/casic-web/src/main/resources/config/temp/tempHumi_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/wasteGas_config_template.xlsx b/casic-web/src/main/resources/config/temp/wasteGas_config_template.xlsx new file mode 100644 index 0000000..372e40e --- /dev/null +++ b/casic-web/src/main/resources/config/temp/wasteGas_config_template.xlsx Binary files differ diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 91dc311..793734c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -3,7 +3,6 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.druid.util.StringUtils; -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; @@ -29,10 +28,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author cz @@ -124,28 +120,7 @@ */ @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public Object batchImport(@RequestParam("file") MultipartFile file) throws Exception { - List results = new ArrayList<>(); - //设置表头与字段映射,可通过反射获取 - Map mapper = new HashMap<>(); - //判断唯一 - mapper.put("管线编号", "pipelineCode"); - mapper.put("管线名称", "pipelineName"); - mapper.put("管线类型", "pipelineType"); - mapper.put("管径(mm)", "pipeDiameter"); - mapper.put("材质", "material"); - mapper.put("详细地址", "position"); - mapper.put("埋设方式", "buryMode"); - mapper.put("管线位置", "pipelinePosition"); - mapper.put("建设年代", "constructEra"); - mapper.put("权属单位代码", "deptid"); - mapper.put("起始地面高(mm)", "startGroundHeight"); - mapper.put("起始埋深(m)", "startBuryDeep"); - mapper.put("起始管顶高(mm)", "startPipecrownHeight"); - mapper.put("终止地面高(mm)", "endGroundHeight"); - mapper.put("终止埋深(m)", "endBuryDeep"); - mapper.put("终止管顶高(mm)", "endPipecrownHeight"); - mapper.put("设计压力(Mpa)", "designPressure"); - mapper.put("瞬时流量(m*m*m)", "instantaneousFlow"); + List results = null; try { try (InputStream in = file.getInputStream()) { results = this.importExcel(BusPipeline.class, file, null, null); diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx new file mode 100644 index 0000000..2786cf8 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx new file mode 100644 index 0000000..205b270 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx new file mode 100644 index 0000000..4858800 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/config_template.xlsx b/casic-web/src/main/resources/config/temp/config_template.xlsx new file mode 100644 index 0000000..3af0e2b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx new file mode 100644 index 0000000..0e0012f --- /dev/null +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/dig_config_template.xlsx b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx new file mode 100644 index 0000000..2ddc235 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/dig_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx new file mode 100644 index 0000000..19af71a --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx new file mode 100644 index 0000000..4df3416 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/jobRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/methane_config_template.xlsx b/casic-web/src/main/resources/config/temp/methane_config_template.xlsx new file mode 100644 index 0000000..830059b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/methane_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx b/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx new file mode 100644 index 0000000..70198ce --- /dev/null +++ b/casic-web/src/main/resources/config/temp/nbDevice_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/noise_config_template.xlsx b/casic-web/src/main/resources/config/temp/noise_config_template.xlsx new file mode 100644 index 0000000..f2386fe --- /dev/null +++ b/casic-web/src/main/resources/config/temp/noise_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/pipeline_template.xlsx b/casic-web/src/main/resources/config/temp/pipeline_template.xlsx new file mode 100644 index 0000000..461cd52 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/pipeline_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx new file mode 100644 index 0000000..13720e4 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/tempHumi_config_template.xlsx b/casic-web/src/main/resources/config/temp/tempHumi_config_template.xlsx new file mode 100644 index 0000000..cca284e --- /dev/null +++ b/casic-web/src/main/resources/config/temp/tempHumi_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/wasteGas_config_template.xlsx b/casic-web/src/main/resources/config/temp/wasteGas_config_template.xlsx new file mode 100644 index 0000000..372e40e --- /dev/null +++ b/casic-web/src/main/resources/config/temp/wasteGas_config_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/wellcover_config_template.xlsx b/casic-web/src/main/resources/config/temp/wellcover_config_template.xlsx new file mode 100644 index 0000000..9e24182 --- /dev/null +++ b/casic-web/src/main/resources/config/temp/wellcover_config_template.xlsx Binary files differ