From 6420deef37bbfad35e309dff3e2842f8561fec0c Mon Sep 17 00:00:00 2001 From: zxh <599622719@qq.com> Date: Wed, 5 Apr 2023 15:47:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=BD=B1=E5=83=8F?= =?UTF-8?q?=E7=9A=84=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=80=E5=8D=8A=E7=9A=84=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kening/vordm/entity/DisasterInfo.java | 3 + .../vordm/entity/RemoteSensingSourceData.java | 8 ++ .../com/kening/vordm/vo/HomeDisasterInfo.java | 8 ++ .../controller/DisasterInfoController.java | 82 +++++++++++++++++++ .../vordm/mapper/DisasterInfoMapper.java | 9 +- .../vordm/mapper/DisasterInfoMapper.xml | 15 ++++ .../kening/vordm/mapper/EntityDataMapper.xml | 1 + .../mapper/RemoteSensingSourceDataMapper.xml | 4 +- .../vordm/service/DisasterInfoService.java | 5 ++ .../service/impl/DisasterInfoServiceImpl.java | 19 +++++ 10 files changed, 152 insertions(+), 2 deletions(-) create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/HomeDisasterInfo.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java index cc109c3..5358ef0 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java @@ -96,6 +96,9 @@ public class DisasterInfo implements Serializable { */ private Date respondTime; + @TableField(exist = false) + private String name; + @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/RemoteSensingSourceData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java index e2a328b..61e3709 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 @@ -145,6 +145,14 @@ public class RemoteSensingSourceData implements Serializable { * 数据条目创建时间 */ private Date createTime; + /** + * 下载链接 + */ + private String downloadUrl; + /** + * 来源机构 + */ + private String sourceOrganization; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/HomeDisasterInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/HomeDisasterInfo.java new file mode 100644 index 0000000..ba76618 --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/HomeDisasterInfo.java @@ -0,0 +1,8 @@ +package com.kening.vordm.vo; + +import com.kening.vordm.entity.DisasterInfo; + + +public class HomeDisasterInfo extends DisasterInfo { + private String organization; +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java new file mode 100644 index 0000000..6e25b98 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java @@ -0,0 +1,82 @@ +package com.kening.vordm.controller; + +import org.springblade.core.mp.support.Query; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kening.vordm.entity.DisasterInfo; +import com.kening.vordm.entity.News; +import com.kening.vordm.service.DisasterInfoService; +import com.kening.vordm.service.NewsService; +import lombok.RequiredArgsConstructor; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +@RestController +@RequiredArgsConstructor +@RequestMapping +public class DisasterInfoController { + + private final DisasterInfoService disasterInfoService; + private final NewsService newsService; + + /** + * 查询条件封装 + * @param disasterInfo + * @return + */ + @GetMapping("/select-condition") + public List getCountryOrTypeOrTime(DisasterInfo disasterInfo){ + QueryWrapper qw = new QueryWrapper<>(); + if (disasterInfo.getDisasterType()!=null){ + qw.like("disaster_type",disasterInfo.getDisasterType()); + } + if (disasterInfo.getDisasterCountry()!=null){ + qw.like("disaster_country",disasterInfo.getDisasterCountry()); + } + if (disasterInfo.getDisasterTime()!=null){ + qw.like("disaster_time",disasterInfo.getDisasterTime()); + } + List disasterInfos = disasterInfoService.list(qw); + return disasterInfos; + } + /** + * 灾害id + * @param disasterInfo + * @return + */ + public List getDisasterIds(DisasterInfo disasterInfo){ + List disasterInfos = getCountryOrTypeOrTime(disasterInfo); +// List disasterInfos = disasterInfoService.list(Condition.getQueryWrapper(disasterInfo)); + if (!disasterInfos.isEmpty()){ + List ids = new ArrayList<>(); + disasterInfos.stream().forEach(disasterInfo1 -> { + ids.add(disasterInfo1.getId()); + }); + return ids; + } + return null; + } + + @GetMapping("/getAllData") + public R> getalldata(){ + return R.data(disasterInfoService.getAllData()); + } + /** + * 指定条件返回数据 + * @param query + * @param disasterInfo + * @return + */ + @GetMapping("/test") + public R> getdata(Query query, DisasterInfo disasterInfo){ + List disasterIds = getDisasterIds(disasterInfo); + return R.data(newsService.page(Condition.getPage(query),new QueryWrapper().in("disaster_id",disasterIds))); + } +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java index efb5274..6911405 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java @@ -3,6 +3,9 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kening.vordm.entity.DisasterInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author G1393 @@ -12,5 +15,9 @@ import com.kening.vordm.entity.DisasterInfo; */ public interface DisasterInfoMapper extends BaseMapper { - + List getSelectCondition(@Param("disaster_type") String disaster_type, + @Param("disaster_country") String disaster_country, + @Param("disaster_time") String disaster_time, + @Param("name") String name); + List getHomeDisasterInfo(); } 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 33ec14b..b85ee0d 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 @@ -31,4 +31,19 @@ temp_start_time,create_time,vordm_id, respond_time + + + 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 65f230e..b7f2b48 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 @@ -36,6 +36,7 @@ select from entity_data ed + l ed.disaster_id = #{entityData.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 88d6805..cc3b4c6 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 @@ -31,6 +31,8 @@ + + @@ -42,7 +44,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 + disaster_id,create_time,download_url,source_organization