From c9c43b1a9320ba627bcb46d347c9136b4ea08ed6 Mon Sep 17 00:00:00 2001 From: why <986973311@qq.com> Date: Fri, 7 Apr 2023 18:42:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DisasterInfoController.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) 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 ec424fc..0a20ecd 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 @@ -2,10 +2,13 @@ package com.kening.vordm.controller; 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.entity.PictureInfo; import com.kening.vordm.service.DisasterInfoService; import com.kening.vordm.service.NewsService; +import com.kening.vordm.service.PictureInfoService; import com.kening.vordm.vo.DisasterMangerInfo; import com.kening.vordm.vo.GroupByUse; import lombok.RequiredArgsConstructor; @@ -26,7 +29,38 @@ public class DisasterInfoController { private final DisasterInfoService disasterInfoService; private final NewsService newsService; + private final PictureInfoService pictureInfoService; + /** + * 首页数据，轮播和定位相关 + * @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() + )); + } /** * 灾害查询条件，时间，类型，灾害联动 From d8846d48267cdb93b12be258367ab41a2e7113c5 Mon Sep 17 00:00:00 2001 From: why <986973311@qq.com> Date: Sat, 8 Apr 2023 15:11:47 +0800 Subject: [PATCH 2/2] 1 --- .../com/kening/vordm/controller/DisasterInfoController.java | 1 + .../java/com/kening/vordm/mapper/DisasterInfoMapper.java | 1 + .../java/com/kening/vordm/mapper/DisasterInfoMapper.xml | 3 +++ .../java/com/kening/vordm/service/DisasterInfoService.java | 2 ++ .../kening/vordm/service/impl/DisasterInfoServiceImpl.java | 6 ++++++ 5 files changed, 13 insertions(+) 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 0a20ecd..7379cec 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 @@ -98,6 +98,7 @@ public class DisasterInfoController { */ @GetMapping("/disasterStatistics") public R> getDisasterStatistics(String name){ + //List groupByUseList = disasterInfoService.getLeftData(); return R.data(disasterInfoService.getDisasterStatistics(name)); } 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 856b75b..34f478e 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 @@ -34,4 +34,5 @@ public interface DisasterInfoMapper extends BaseMapper { List getDisasterStatistics(@Param("name" ) String name ); + 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 0e6b658..64ca030 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 @@ -75,5 +75,8 @@ where d.respond_status=#{respondStatus} order by d.disaster_time desc + 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 d6c1d84..8ab2372 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 @@ -37,4 +37,6 @@ public interface DisasterInfoService extends IService { IPage getHomeDisaster(IPage page, Integer respondStatus); + + List getLeftData(); } 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 9e8d563..56e4b9e 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 @@ -88,4 +88,10 @@ implements DisasterInfoService { return page.setRecords(disasterMangerInfos); } + @Override + public List getLeftData() { + + return this.baseMapper.getLeftData(); + } + }