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 index 6865ec3..f36c883 100644 --- 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 @@ -3,14 +3,9 @@ package com.kening.vordm.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.kening.vordm.entity.DisasterInfo; -import com.kening.vordm.entity.DownloadRecord; -import com.kening.vordm.entity.News; -import com.kening.vordm.entity.Websites; -import com.kening.vordm.service.DisasterInfoService; -import com.kening.vordm.service.DownloadRecordService; -import com.kening.vordm.service.NewsService; -import com.kening.vordm.service.WebsitesService; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kening.vordm.entity.*; +import com.kening.vordm.service.*; import com.kening.vordm.vo.DisasterMangerInfo; import com.kening.vordm.vo.GroupByUse; import com.kening.vordm.vo.UserTenantVo; @@ -33,10 +28,41 @@ public class DisasterInfoController { private final WebsitesService websitesService; private final NewsService newsService; + private final PictureInfoService pictureInfoService; //下载次数记录 private final DownloadRecordService downloadRecordService; + /** + * 首页数据,轮播和定位相关 + * @return + */ + @GetMapping("/indexData") + public R> indexData(){ + return R.data(disasterInfoService.list(Wrappers.lambdaQuery() + .eq(DisasterInfo::getRespondStatus,2))); + } + + @GetMapping("/getPicInfoByDisasterId") + public R> getPicInfoByDisasterInfoId(Long disasterId){ + return R.data(pictureInfoService.list(Wrappers.lambdaQuery() + .eq(PictureInfo::getDisasterId,disasterId))); + } + + /** + * 灾害查询条件,时间,类型,灾害联动 + * @param disasterInfo + * @return + */ + @GetMapping("/selectCondition") + public R> getSelectCondition1(DisasterInfo disasterInfo){ + String disaster_time=null; + if (disasterInfo.getDisasterTime()!=null){ + disaster_time=disasterInfo.getDisasterTime().toString(); + } + return R.data(disasterInfoService.getConditionData(disasterInfo.getDisasterType(),disasterInfo.getDisasterCountry(),disaster_time,disasterInfo.getName() + )); + } /** * 灾害查询条件,时间,类型,灾害联动 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 1a9c043..ba73038 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 @@ -37,4 +37,5 @@ public interface DisasterInfoMapper extends BaseMapper { List getAllUser(); + List getLeftData(); } 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 0db5224..484539d 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 @@ -84,6 +84,9 @@ where d.respond_status=#{respondStatus} order by d.disaster_time desc +