From 3b1a203af05de0cceff8fdff66c5027e945c37cd Mon Sep 17 00:00:00 2001 From: yyhouc <792163605@qq.com> Date: Tue, 25 Apr 2023 17:34:58 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=88=AC=E8=99=AB?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=88=AC=E8=99=AB=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kening/vordm/entity/CrawlInfo.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/CrawlInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/CrawlInfo.java index 5526eea..bb96674 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/CrawlInfo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/CrawlInfo.java @@ -69,5 +69,8 @@ public class CrawlInfo implements Serializable { @TableField(exist = false) private static final long serialVersionUID = 1L; + private String startDate; + private String endDate; + } From 2a46da88c6462a504884fc6f16b2303000886024 Mon Sep 17 00:00:00 2001 From: glj Date: Tue, 25 Apr 2023 18:34:35 +0800 Subject: [PATCH 2/6] =?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 | 2 ++ .../com/kening/vordm/entity/EntityData.java | 4 ++++ .../java/com/kening/vordm/entity/Hotspot.java | 4 ---- .../com/kening/vordm/entity/OtherData.java | 2 ++ .../com/kening/vordm/vo/CallForHelpVo.java | 3 +++ .../controller/AdminManagerController.java | 1 - .../controller/EntityDataController.java | 11 +++++++++ .../kening/vordm/mapper/DataUploadMapper.xml | 8 ++++--- .../vordm/mapper/DisasterInfoMapper.xml | 1 + .../kening/vordm/mapper/EntityDataMapper.xml | 6 ++++- .../mapper/GuestManageDisasterRefMapper.xml | 2 +- .../kening/vordm/mapper/OtherDataMapper.xml | 5 ++-- .../kening/vordm/mapper/VisualDataMapper.xml | 1 + .../service/impl/OtherDataServiceImpl.java | 1 + .../service/impl/PictureInfoServiceImpl.java | 24 ++++++++++++------- 15 files changed, 54 insertions(+), 21 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 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 b903d5a..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 @@ -72,4 +72,7 @@ public class CallForHelpVo extends DisasterInfo { * 受灾国家 */ private String vordmId; + + + private Date reviewTime; } 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/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 ba8aabc..d4b2aa7 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 @@ -191,6 +191,7 @@ d.upload_time, d.geometry, d.respond_status, + ud.review_time AS reviewTime, bdb.dict_value as dictValue From guest_manage_disaster_ref ud join 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 3b8cf9b..bc6f8f8 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 @@ -21,6 +21,9 @@ + + + @@ -29,7 +32,8 @@ ed.upload_time,ed.disaster_id,ed.visual_flag, ed.visual_lon,ed.visual_lat, ed.status,ed.uploader_id,ed.manager_id, - ed.review_time, ed.source_organization + ed.review_time, ed.source_organization, + ed.upload_type, ed.is_deleted, ed.is_publish 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 select , - gi.username AS uploaderName, - ms.layer_name, - ms.vordm_id, - ms.name AS msName + gi.username AS uploaderName, + di.vordm_id, + di.geometry from entity_data ed left join guest_info gi on gi.id = ed.uploader_id - left join map_server ms on ms.disaster_id = ed.disaster_id + LEFT JOIN disaster_info di on di.id = ed.disaster_id ed.disaster_id = #{entityData.disasterId} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml index 81708aa..62075b2 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml @@ -24,7 +24,7 @@ diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java index d28ecc9..ab44c48 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java @@ -109,6 +109,7 @@ public class OtherDataServiceImpl extends ServiceImpl Date: Wed, 26 Apr 2023 18:31:39 +0800 Subject: [PATCH 6/6] =?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 --- .../src/main/java/com/kening/vordm/entity/DataUpload.java | 2 +- .../java/com/kening/vordm/controller/WordCloudsController.java | 3 ++- 2 files changed, 3 insertions(+), 2 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 3bf1d54..95ac2d9 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 @@ -25,6 +25,6 @@ public class DataUpload extends EntityData{ private Long disasterId; private String vordmId; - + private String geometry; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WordCloudsController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WordCloudsController.java index 50243fa..5b2a190 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WordCloudsController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WordCloudsController.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -32,6 +33,6 @@ public class WordCloudsController { @GetMapping("/wordCount") public R>> wordCount(@RequestParam Long disasterId){ Map> stringListMap = service.wordCount(disasterId); - return R.data(service.wordCount(disasterId)); + return R.data(stringListMap); } }