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 fec1c4c..d0d5c05 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 @@ -23,4 +23,6 @@ public class DataUpload extends EntityData{ private Date disasterTime; private Long disasterId; + + private String vordmId; } 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 985f1d9..f60627d 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 @@ -107,6 +107,10 @@ public class EntityData implements Serializable { */ private Integer isDeleted; + /** + * 是否发布(0未发布/1已发布) + */ + private Integer isPublish; /** * 上传人姓名 diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java index 4195787..88b5fca 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java @@ -76,10 +76,6 @@ public class Hotspot implements Serializable { @ExcelIgnore private Date reviewTime; - /** - * 是否删除 0未删除 1已删除 - */ - private Integer isDeleted; @ExcelIgnore @TableField(exist = false) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java index deb9653..2bb7457 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java @@ -18,6 +18,8 @@ public class OtherData{ private String type; + private String title; + private String remark; private Long disasterId; diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java index ac46f70..3af04e0 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java @@ -67,4 +67,12 @@ public class CallForHelpVo extends DisasterInfo { * 受灾国家 */ private String disasterCountry; + + /** + * 受灾国家 + */ + private String vordmId; + + + private Date reviewTime; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java index 3761a4f..cd32db5 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java @@ -11,6 +11,6 @@ import org.springframework.cloud.client.SpringCloudApplication; @SpringCloudApplication public class VoRdmApplication { public static void main(String[] args) { - BladeApplication.run("gljNew-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); + BladeApplication.run(CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java index 982ed30..5d6061b 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java @@ -33,7 +33,6 @@ public class AdminManagerController { */ @GetMapping("/pages") public R pages(Query query, @RequestParam Map params){ - return R.data(guestManageDisasterRefService.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 9d70501..dcb1031 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 @@ -61,5 +61,16 @@ public class EntityDataController { entityData.setReviewTime(new Date()); return R.data(entityDataService.updateById(entityData)); } + + + /** + * 修改实体数据 + * @param entityData + * @return + */ + @PostMapping("/updateEntityData") + public R updateEntityData(@RequestBody EntityData entityData) { + return R.data(entityDataService.updateById(entityData)); + } } 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 e8bbf53..d08f310 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 @@ -28,42 +28,47 @@ public class RemoteSensingSourceDataController { /** * 根据页码和灾害信息查出遥感影像源数据,可多个灾害 + * * @param disasterInfo * @param query * @return */ @GetMapping("/SourceData") - public R> getRemoteSensingSourceData(DisasterInfo disasterInfo, Query query){ + public R> getRemoteSensingSourceData(DisasterInfo disasterInfo, Query query) { List disasterIds = disasterInfoService.getDisasterId(disasterInfo); - if (disasterIds.isEmpty()){ + if (disasterIds.isEmpty()) { return R.data(null); } - return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),new QueryWrapper().in("disaster_id",disasterIds))); + return R.data(remoteSensingSourceDataService.page(Condition.getPage(query), new QueryWrapper().in("disaster_id", disasterIds))); } /** * 实体数据列表信息 + * * @param optionsJson 实体数据条件信息 - * @param query current当前页 size 每页数据量 + * @param query current当前页 size 每页数据量 * @return */ @GetMapping("/Condition") - public R> getRemoteSensingSourceDataByCondition( String optionsJson, Query query) { + public R> getRemoteSensingSourceDataByCondition(String optionsJson, Query query) { RemoteSensingSourceData remoteSensingSourceData = new RemoteSensingSourceData(); - if (optionsJson!=null){ - remoteSensingSourceData = (RemoteSensingSourceData)JSON.parseObject(optionsJson, RemoteSensingSourceData.class); + if (optionsJson != null) { + remoteSensingSourceData = (RemoteSensingSourceData) JSON.parseObject(optionsJson, RemoteSensingSourceData.class); } return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByCondition(Condition.getPage(query), remoteSensingSourceData)); } /** * 实体数据列表信息 - * @param params - * @param query - * @return + * + * @param disasterId + * @param query + * @return */ @GetMapping("/PagesData") - public R> Pages(@RequestParam Map params, Query query){ - return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),Condition.getQueryWrapper(params,RemoteSensingSourceData.class))); + public R> pages(Query query, String disasterId) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("disaster_id", disasterId); + return R.data(remoteSensingSourceDataService.page(Condition.getPage(query), qw)); } } 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 f42a1a9..7cc30fe 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 @@ -21,13 +21,15 @@ di.disaster_keyword, bdb.dict_value as disasterType, di.id as disasterId, + di.vordm_id AS vordmId, di.disaster_time as disasterTime, di.disaster_country as disasterCountry from entity_data ed - left join blade_user bu on bu.id = ed.uploader_id - left join disaster_info di on di.id = ed.disaster_id - left join blade_dict_biz bdb on di.disaster_type = dict_key + left join blade_user bu on bu.id = ed.uploader_id + left join disaster_info di on di.id = ed.disaster_id + left join blade_dict_biz bdb on di.disaster_type = dict_key where ed.disaster_id is not null + AND di.disaster_keyword IS NOT NUll group by di.id,bdb.dict_value diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml index d9c0aff..14d7961 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml @@ -37,9 +37,7 @@ - d - . - disaster_type + d.disaster_type ,d.disaster_time,d.disaster_country, m.organization @@ -130,15 +128,18 @@ @@ -40,8 +44,8 @@ ms.vordm_id, ms.name AS msName from entity_data ed - inner join guest_info gi on gi.id = ed.uploader_id - inner join map_server ms on ms.disaster_id = ed.disaster_id + left join guest_info gi on gi.id = ed.uploader_id + left join map_server ms on ms.disaster_id = ed.disaster_id ed.disaster_id = #{entityData.disasterId} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml index 41dd933..fb8f788 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml @@ -26,8 +26,8 @@ update blade_user t set t.password = #{password} where t.email = #{email} - + update blade_user t set t.name = #{name}, t.real_name = #{realName}, t.organization = #{organization}, t.research_field = #{researchField}, t.occupation = #{occupation}, t.code = #{country} where t.id = #{id} @@ -39,6 +39,7 @@ email = #{email} + select di.disaster_keyword, + di.vordm_id, bdb.dict_value as disasterType, di.id as disasterId, di.disaster_time as disasterTime, di.disaster_country as disasterCountry from disaster_info di - left join blade_dict_biz bdb on di.disaster_type = dict_key + left join blade_dict_biz bdb on di.disaster_type = dict_key