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 3ca02c5..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 @@ -44,7 +44,7 @@ public class RemoteSensingSourceData implements Serializable { /** * 产品波段树 */ - private Integer productBandsNum; + private String productBandsNum; /** * 产品分辨率 @@ -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/controller/EntityDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java index 8fceffa..977f313 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 @@ -29,5 +29,6 @@ public class EntityDataController { return R.data(respondInfoService.getEntityDataList(Condition.getPage(query), 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 new file mode 100644 index 0000000..ff0448c --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java @@ -0,0 +1,24 @@ +package com.kening.vordm.controller; + +import com.kening.vordm.entity.RemoteSensingSourceData; +import com.kening.vordm.service.RemoteSensingSourceDataService; +import io.swagger.models.auth.In; +import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@AllArgsConstructor +public class RemoteSensingSourceDataController { + + private RemoteSensingSourceDataService remoteSensingSourceDataService; + + @GetMapping("/remoteSensingSourceData") + public R> getRemoteSensingSourceData(String disasterType, String disasterCountry, String disasterTime){ + return R.data(remoteSensingSourceDataService.getRemoteSensingSourceData(disasterType, disasterCountry, disasterTime)); + } +} 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 7c9edc2..6e5e92d 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 @@ -37,6 +37,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.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.java index 7cf80aa..aa73221 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.java @@ -3,6 +3,9 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kening.vordm.entity.RemoteSensingSourceData; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author G1393 @@ -12,5 +15,5 @@ import com.kening.vordm.entity.RemoteSensingSourceData; */ public interface RemoteSensingSourceDataMapper extends BaseMapper { - + List getRemoteSensingSourceData(@Param("disasterType") String disasterType,@Param("disasterCountry") String disasterCountry,@Param("disasterTime") String disasterTime); } 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 19685cc..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,6 +44,22 @@ 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 + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java index fccef18..9a85f9e 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java @@ -4,11 +4,16 @@ package com.kening.vordm.service; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.DisasterInfo; +import java.util.List; + /** * @author G1393 * @description 针对表【disaster_info(灾害信息表，存储灾害信息)】的数据库操作Service * @createDate 2023-04-04 15:54:30 */ public interface DisasterInfoService extends IService { + List getAllData(); + +// Long getDisasterId(DisasterInfo disasterInfo); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RemoteSensingSourceDataService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RemoteSensingSourceDataService.java index 02ec553..bf7c2bc 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RemoteSensingSourceDataService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RemoteSensingSourceDataService.java @@ -3,6 +3,9 @@ package com.kening.vordm.service; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.RemoteSensingSourceData; +import org.springframework.stereotype.Service; + +import java.util.List; /** * @author G1393 @@ -10,5 +13,6 @@ import com.kening.vordm.entity.RemoteSensingSourceData; * @createDate 2023-04-04 15:54:31 */ public interface RemoteSensingSourceDataService extends IService { + List getRemoteSensingSourceData(String disasterType,String disasterCountry, String disasterTime); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java index db2cc3a..393052a 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java @@ -1,18 +1,37 @@ package com.kening.vordm.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kening.vordm.entity.DisasterInfo; import com.kening.vordm.mapper.DisasterInfoMapper; import com.kening.vordm.service.DisasterInfoService; +import lombok.RequiredArgsConstructor; +import org.springblade.core.mp.support.Condition; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author G1393 * @description 针对表【disaster_info(灾害信息表，存储灾害信息)】的数据库操作Service实现 * @createDate 2023-04-04 15:54:30 */ @Service +@RequiredArgsConstructor public class DisasterInfoServiceImpl extends ServiceImpl implements DisasterInfoService { +// public DisasterInfoServiceImpl(DisasterInfoService disasterInfoService) { +// this.disasterInfoService = disasterInfoService; +// } + + public List getAllData(){ + return this.baseMapper.getHomeDisasterInfo(); + } + +// public Long getDisasterId(DisasterInfo disasterInfo){ +// QueryWrapper qw=new QueryWrapper<>(disasterInfo); +// Long va=; +// return va; +//// } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java index 7275829..2f289a2 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java @@ -6,6 +6,8 @@ import com.kening.vordm.mapper.RemoteSensingSourceDataMapper; import com.kening.vordm.service.RemoteSensingSourceDataService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author G1393 * @description 针对表【remote_sensing_source_data(遥感影像源数据)】的数据库操作Service实现 @@ -15,4 +17,9 @@ import org.springframework.stereotype.Service; public class RemoteSensingSourceDataServiceImpl extends ServiceImpl implements RemoteSensingSourceDataService { + @Override + public List getRemoteSensingSourceData(String disasterType, String disasterCountry, String disasterTime) { + return this.baseMapper.getRemoteSensingSourceData(disasterType, disasterCountry, disasterTime); + } + }