From ff04cc156a7cef577b913ceef10d830b537972ad Mon Sep 17 00:00:00 2001 From: zxh <599622719@qq.com> Date: Wed, 5 Apr 2023 18:27:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E7=81=BE=E5=AE=B3=E6=95=B0=E6=8D=AE=E7=9A=84=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kening/vordm/vo/GroupByUse.java | 22 +++++++++++++++++++ .../java/com/kening/vordm/vo/groupByUse.java | 9 +++++--- .../controller/DisasterInfoController.java | 19 ++++++---------- .../vordm/mapper/DisasterInfoMapper.java | 12 ++++++---- .../vordm/mapper/DisasterInfoMapper.xml | 12 ++++++++-- .../vordm/service/DisasterInfoService.java | 5 ++++- .../service/impl/DisasterInfoServiceImpl.java | 20 ++++++++++------- 7 files changed, 69 insertions(+), 30 deletions(-) create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/GroupByUse.java diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/GroupByUse.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/GroupByUse.java new file mode 100644 index 0000000..1ba8bc3 --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/GroupByUse.java @@ -0,0 +1,22 @@ +package com.kening.vordm.vo; + +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + +import javax.swing.*; + +@Data +@Getter +@Setter +public class groupByUse { + /** + * 名称 + */ + private String name; + + /** + * 数量 + */ + private String count; +} diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/groupByUse.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/groupByUse.java index 1ba8bc3..903d0c3 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/groupByUse.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/groupByUse.java @@ -4,12 +4,10 @@ import lombok.Data; import lombok.Getter; import lombok.Setter; -import javax.swing.*; - @Data @Getter @Setter -public class groupByUse { +public class GroupByUse { /** * 名称 */ @@ -19,4 +17,9 @@ public class groupByUse { * 数量 */ private String count; + + /** + * 图标 + */ + private String icon; } 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 add0dd3..fda4e71 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 @@ -1,9 +1,9 @@ package com.kening.vordm.controller; +import com.kening.vordm.vo.GroupByUse; 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; @@ -15,8 +15,6 @@ 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 @@ -33,7 +31,7 @@ public class DisasterInfoController { * @return */ @GetMapping("/select-condition") - public R> getSelectCondition(DisasterInfo disasterInfo){ + public R> getSelectCondition(DisasterInfo disasterInfo){ String disaster_time=null; if (disasterInfo.getDisasterTime()!=null){ disaster_time=disasterInfo.getDisasterTime().toString(); @@ -43,14 +41,6 @@ public class DisasterInfoController { } - /** - * 测试 - * @return - */ - @GetMapping("/getAllData") - public R> getalldata(){ - return R.data(disasterInfoService.getAllData()); - } /** * 指定条件返回数据 * @param query @@ -63,4 +53,9 @@ public class DisasterInfoController { List disasterIds = disasterInfoService.getDisasterId(disasterInfo); return R.data(newsService.page(Condition.getPage(query),new QueryWrapper().in("disaster_id",disasterIds))); } + + @GetMapping("/disasterStatistics") + public R> getDisasterStatistics(String name){ + 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 6911405..4b6a1de 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,7 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kening.vordm.entity.DisasterInfo; +import com.kening.vordm.vo.GroupByUse; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,9 +16,12 @@ import java.util.List; */ 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 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(); + + List getDisasterStatistics(@Param("name" ) String name ); + } 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 dd8d44e..f5420ad 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 @@ -36,10 +36,10 @@ select * from new_vordm.disaster_info - select distinct ${name} as name from disaster_info - where + where disaster_type=#{disaster_type} and @@ -47,4 +47,12 @@ and disaster_time like concat('%',#{disaster_time},'%') + + 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 cc919fa..7616394 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 @@ -3,6 +3,7 @@ package com.kening.vordm.service; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.DisasterInfo; +import com.kening.vordm.vo.GroupByUse; import java.util.List; @@ -14,7 +15,7 @@ import java.util.List; public interface DisasterInfoService extends IService { List getAllData(); - List getConditionData(String type,String country,String time,String name); + List getConditionData(String type, String country, String time, String name); // Long getDisasterId(DisasterInfo disasterInfo); /** @@ -23,4 +24,6 @@ public interface DisasterInfoService extends IService { * @return */ List getDisasterId(DisasterInfo disasterInfo); + + List getDisasterStatistics( String name); } 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 4c54a29..9eab765 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 @@ -5,8 +5,8 @@ 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 com.kening.vordm.vo.GroupByUse; import lombok.RequiredArgsConstructor; -import org.springblade.core.mp.support.Condition; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -29,11 +29,16 @@ implements DisasterInfoService { public List getAllData(){ return this.baseMapper.getHomeDisasterInfo(); } - public List getConditionData(String type,String country,String time,String name){ - List disasterInfos=this.baseMapper.getSelectCondition(type,country,time,name); + public List getConditionData(String type, String country, String time, String name){ + List disasterInfos=this.baseMapper.getSelectCondition(type,country,time,name); return disasterInfos; } + /** + * 用于获取灾害id类型 + * @param disasterInfo + * @return + */ public List getDisasterId(DisasterInfo disasterInfo){ QueryWrapper qw = new QueryWrapper<>(); if (disasterInfo.getDisasterType()!=null){ @@ -56,9 +61,8 @@ implements DisasterInfoService { } return null; } -// public Long getDisasterId(DisasterInfo disasterInfo){ -// QueryWrapper qw=new QueryWrapper<>(disasterInfo); -// Long va=; -// return va; -//// } + + public List getDisasterStatistics(String name){ + return this.baseMapper.getDisasterStatistics(name); + } }