From 31ba049dae12969df1c2ef33f7ec37fe5df3ed77 Mon Sep 17 00:00:00 2001 From: glj Date: Wed, 24 May 2023 18:18:50 +0800 Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vordm/entity/RemoteSensingSourceData.java | 10 ++ .../RemoteSensingSourceDataController.java | 10 ++ .../mapper/RemoteSensingSourceDataMapper.xml | 4 +- .../RemoteSensingSourceDataService.java | 3 + .../RemoteSensingSourceDataServiceImpl.java | 95 +++++++++++++------ 5 files changed, 94 insertions(+), 28 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java index f61fa97..cd6d658 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java @@ -170,6 +170,16 @@ public class RemoteSensingSourceData implements Serializable { */ private Long uploadId; + /** + * 1-Optical satellite, 2-Night light satellite, 3-Video satellite, 4-Hyperspectral satellite, 5-Radar satellite + */ + private Integer satelliteTypeSelect; + + /** + * 影像缩略图名称 用户批量添加缩略图区分 + */ + private String pictureName; + /** * 分辨率集合最大值 */ diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java index 88ee2e8..8b0e5af 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java @@ -92,4 +92,14 @@ public class RemoteSensingSourceDataController { public R fileExcelUpload(@RequestParam("file") MultipartFile file, @RequestParam("disasterId") Long disasterId) { return R.data(remoteSensingSourceDataService.importTemplate(file,disasterId)); } + + /** + * 导入 + * @param fileList + * @return + */ + @PostMapping({"/importTemplateImgList"}) + public R importTemplateImgList(@RequestParam("fileList") List fileList, @RequestParam("disasterId") Long disasterId) { + return R.data(remoteSensingSourceDataService.importTemplateImgList(fileList,disasterId)); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml index 1027544..c0c21f2 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml @@ -36,6 +36,8 @@ + + @@ -47,7 +49,7 @@ upper_left_lon,upper_right_lat,upper_right_lon, view_center_lat,view_center_lon,lower_right_lat, lower_right_lon,lower_left_lat,lower_left_lon, - disaster_id,create_time,download_url,source_organization,satellite_type,status,upload_id + disaster_id,create_time,download_url,source_organization,satellite_type,status,upload_id, satellite_type_select, picture_name