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 a1cf417..a4450a8 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 @@ -71,4 +71,8 @@ public class CrawlInfo implements Serializable { @TableField(exist = false) private static final long serialVersionUID = 1L; + private String startDate; + private String endDate; + + } 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..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 @@ -23,4 +23,8 @@ public class DataUpload extends EntityData{ private Date disasterTime; private Long disasterId; + + private String vordmId; + + private String geometry; } 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..1719c3e 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; /** * 上传人姓名 @@ -132,6 +136,12 @@ public class EntityData implements Serializable { @TableField(exist = false) private String msName; + /** + * 灾害区域地理字段 + */ + @TableField(exist = false) + private String geometry; + @TableField(exist = false) private static final long serialVersionUID = 1L; 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..889ce2b 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,9 +18,13 @@ public class OtherData{ private String type; + private String title; + private String remark; private Long disasterId; private Integer visualFlag; + + private String sourceOrganization; } 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/controller/MapServerController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/MapServerController.java new file mode 100644 index 0000000..bd0d057 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/MapServerController.java @@ -0,0 +1,35 @@ +package com.kening.vordm.controller; + +import com.kening.vordm.entity.MapServer; +import com.kening.vordm.service.MapServerService; +import com.kening.vordm.vo.UserVo; +import lombok.RequiredArgsConstructor; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/ui/mapServer") +public class MapServerController { + + + //邮箱发送服务 + private final MapServerService mapServerService; + + /** + * 新增基础地理数据 + * + * @param mapServer + * @return + */ +// @PostMapping("/saveMapServer") +// public R saveMapServer(@RequestBody MapServer mapServer) { +// return mapServerService.saveMapServer(mapServer); +// } + + +} + 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 9984257..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; @@ -31,6 +32,7 @@ public class WordCloudsController { */ @GetMapping("/wordCount") public R>> wordCount(@RequestParam Long disasterId){ - return R.data(service.wordCount(disasterId)); + Map> stringListMap = service.wordCount(disasterId); + return R.data(stringListMap); } } 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 8b46832..fdaa0fd 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 @@ -182,7 +182,7 @@ u.email, u.research_field, u.organization, - d.id, + d.id AS disasterId, d.disaster_type, d.disaster_time, d.disaster_keyword, @@ -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 @@ -369,7 +370,7 @@ 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/OtherDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/OtherDataMapper.xml index 936a778..7d5429a 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/OtherDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/OtherDataMapper.xml @@ -19,12 +19,14 @@ select - DATE_FORMAT(create_time,'%Y-%m-%d') date, + date, frequency value, word name, type @@ -35,5 +35,6 @@ and disaster_id = #{disasterId} + ORDER BY date DESC 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 5652da0..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 @@ -102,12 +102,14 @@ public class OtherDataServiceImpl extends ServiceImpl -implements PictureInfoService { + implements PictureInfoService { /** * 对象存储模块 @@ -33,6 +33,7 @@ implements PictureInfoService { /** * 修改图片信息 + * * @param pictureInfo * @return */ @@ -44,7 +45,7 @@ implements PictureInfoService { picture.setLink(bladeFile.getLink()); picture.setName(bladeFile.getOriginalName()); picture.setSize(multipartFile.getSize()); - picture.setType(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().indexOf(".")+1)); + picture.setType(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().indexOf(".") + 1)); picture.setIsMain(pictureInfo.getIsMain()); picture.setId(pictureInfo.getId()); return updateById(picture); @@ -52,21 +53,26 @@ implements PictureInfoService { /** * 上传图片 + * * @param otherData * @return */ @Override public boolean uploadData(OtherData otherData) { - log.info("上传数据:{}",otherData); + log.info("上传数据:{}", otherData); List pictureInfoList = new ArrayList<>(); for (MultipartFile multipartFile : otherData.getFile()) { BladeFile bladeFile = minioTemplate.putFile(multipartFile); PictureInfo pictureInfo = new PictureInfo(); pictureInfo.setLink(bladeFile.getLink()); pictureInfo.setDisasterId(otherData.getDisasterId()); - pictureInfo.setName(bladeFile.getOriginalName()); + if (otherData.getTitle() != null) { + pictureInfo.setName(otherData.getTitle()); + } else { + pictureInfo.setName(bladeFile.getName()); + } pictureInfo.setSize(multipartFile.getSize()); - pictureInfo.setType(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().indexOf(".")+1)); + pictureInfo.setType(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().indexOf(".") + 1)); pictureInfo.setIsMain(otherData.getIsMain()); pictureInfoList.add(pictureInfo); }