From 2a56224d947e7e2706c61d24b945e184bf4af15d Mon Sep 17 00:00:00 2001 From: glj Date: Tue, 30 Jan 2024 18:09:26 +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 --- .../com/kening/vordm/entity/DataUpload.java | 6 ++++ .../com/kening/vordm/entity/EntityData.java | 11 ++++++ .../com/kening/vordm/vo/EntityDataUserVo.java | 8 ++++- .../controller/DataUploadController.java | 6 ++++ .../controller/EntityDataController.java | 7 ++++ .../kening/vordm/mapper/DataUploadMapper.xml | 7 +++- .../kening/vordm/mapper/EntityDataMapper.xml | 6 +++- .../vordm/service/EntityDataService.java | 3 ++ .../service/impl/EntityDataServiceImpl.java | 36 ++++++++++++++++++- 9 files changed, 86 insertions(+), 4 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java index 1fd5642..3097873 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java @@ -29,4 +29,10 @@ public class DataUpload extends EntityData{ private String geometry; private String uploaderEmail; + + private Integer isDownload; + + private String account; + + private String password; } diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java index e6b9abc..92ce543 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java @@ -112,6 +112,17 @@ public class EntityData implements Serializable { */ private Integer isPublish; + /** + * 是否下载（0 未下载/1已下载） + */ + private Integer isDownload; + + + private String account; + + + private String password; + /** * 上传人姓名 */ diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java index 99e9a2d..a929cda 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java @@ -9,6 +9,12 @@ import java.util.List; @Data public class EntityDataUserVo { + + /** + * 数据产品的大小（byte） + */ + private Long id; + /** * 数据名称 */ @@ -17,7 +23,7 @@ public class EntityDataUserVo { /** * 数据产品的大小（byte） */ - private Long size; + private Integer size; /** * 数据类型（0-基础数据，1-减灾产品，2-制图产品） diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DataUploadController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DataUploadController.java index 62adf00..46ba49d 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DataUploadController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DataUploadController.java @@ -45,6 +45,12 @@ public class DataUploadController { */ @GetMapping("/pages") public R> pages(Query query, @RequestParam Map params){ + params.put("status",0); + return R.data(service.queryPage(Condition.getPage(query),params)); + } + + @GetMapping("/pagesAdmin") + public R> pagesAdmin(Query query, @RequestParam Map params){ return R.data(service.queryPage(Condition.getPage(query),params)); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java index 5865b38..ee30c06 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java @@ -52,6 +52,13 @@ public class EntityDataController { return R.data(entityDataService.saveEntityData(entityDataUserVo)); } + + @PostMapping("/updateEntityDataAdmin") + public R updateEntityDataAdmin(EntityDataUserVo entityDataUserVo) { + return R.data(entityDataService.updateEntityDataAdmin(entityDataUserVo)); + } + + @GetMapping("/updateByIdEntityDataStatus") public R updateByIdEntityDataStatus(Long id,Integer status,Long managerId) { EntityData entityData = new EntityData(); diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml index 6aab239..aa254ba 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml @@ -42,12 +42,17 @@ ed.status,ed.uploader_id,ed.manager_id, ed.review_time, ed.source_organization, ed.upload_type, + ed.is_download, + ed.account, + ed.password, bu.name as uploaderName, bu.email as uploaderEmail from entity_data ed left join blade_user bu on bu.id = ed.uploader_id - and ed.status = 0 + + ed.status = #{params.status} + and ed.disaster_id = #{params.disasterId} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml index c4fa98e..63c7408 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml @@ -24,6 +24,9 @@ + + + @@ -36,7 +39,8 @@ ed.visual_lon,ed.visual_lat, ed.status,ed.uploader_id,ed.manager_id, ed.review_time, ed.source_organization, - ed.upload_type, ed.is_deleted, ed.is_publish + ed.upload_type, ed.is_deleted, ed.is_publish, + ed.is_download, ed.account, ed.password