From 392831be1e2839045d7e69345671b8326367cf05 Mon Sep 17 00:00:00 2001 From: zxh <599622719@qq.com> Date: Wed, 5 Apr 2023 17:42:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=81=A5=E6=84=9F=E5=BD=B1=E5=83=8F?= =?UTF-8?q?=E8=81=94=E5=8A=A8=EF=BC=8C=E4=BB=A5=E5=8F=8A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kening/vordm/vo/groupByUse.java | 22 ++++++++++ .../controller/DisasterInfoController.java | 44 ++++++------------- .../RemoteSensingSourceDataController.java | 25 +++++++++-- .../vordm/mapper/DisasterInfoMapper.xml | 13 +++--- .../vordm/service/DisasterInfoService.java | 7 +++ .../service/impl/DisasterInfoServiceImpl.java | 27 ++++++++++++ 6 files changed, 99 insertions(+), 39 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/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 6e25b98..add0dd3 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 @@ -26,44 +26,27 @@ 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()); - } + public R> getSelectCondition(DisasterInfo disasterInfo){ + String disaster_time=null; if (disasterInfo.getDisasterTime()!=null){ - qw.like("disaster_time",disasterInfo.getDisasterTime()); + disaster_time=disasterInfo.getDisasterTime().toString(); } - 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; + return R.data(disasterInfoService.getConditionData(disasterInfo.getDisasterType(),disasterInfo.getDisasterCountry(),disaster_time,disasterInfo.getName() + )); } + + /** + * 测试 + * @return + */ @GetMapping("/getAllData") public R> getalldata(){ return R.data(disasterInfoService.getAllData()); @@ -74,9 +57,10 @@ public class DisasterInfoController { * @param disasterInfo * @return */ + @GetMapping("/test") public R> getdata(Query query, DisasterInfo disasterInfo){ - List disasterIds = getDisasterIds(disasterInfo); + List disasterIds = disasterInfoService.getDisasterId(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/RemoteSensingSourceDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java index ff0448c..dd7c280 100644 --- 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 @@ -1,5 +1,13 @@ package com.kening.vordm.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kening.vordm.entity.News; +import com.kening.vordm.service.DisasterInfoService; +import javafx.beans.binding.LongExpression; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import com.kening.vordm.entity.DisasterInfo; import com.kening.vordm.entity.RemoteSensingSourceData; import com.kening.vordm.service.RemoteSensingSourceDataService; import io.swagger.models.auth.In; @@ -7,18 +15,29 @@ 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.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; @RestController @AllArgsConstructor +@RequestMapping("/remoteSensing") public class RemoteSensingSourceDataController { private RemoteSensingSourceDataService remoteSensingSourceDataService; + private DisasterInfoService disasterInfoService; - @GetMapping("/remoteSensingSourceData") - public R> getRemoteSensingSourceData(String disasterType, String disasterCountry, String disasterTime){ - return R.data(remoteSensingSourceDataService.getRemoteSensingSourceData(disasterType, disasterCountry, disasterTime)); + /** + * 根据页码和灾害信息查出遥感影像源数据，可多个灾害 + * @param disasterInfo + * @param query + * @return + */ + @GetMapping("/SourceData") + public R> getRemoteSensingSourceData(DisasterInfo disasterInfo, Query query){ + List disasterIds=disasterInfoService.getDisasterId(disasterInfo); + return R.data(remoteSensingSourceDataService.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.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml index b85ee0d..dd8d44e 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,14 +36,15 @@ select * from new_vordm.disaster_info - + select distinct ${name} as name from disaster_info - where + where + disaster_type=#{disaster_type} - and - disaster_country=#{disaster_country} + and + disaster_country like concat('%',#{disaster_country},'%') and - disaster_time like #{disaster_time} + 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 9a85f9e..cc919fa 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 @@ -14,6 +14,13 @@ import java.util.List; public interface DisasterInfoService extends IService { List getAllData(); + List getConditionData(String type,String country,String time,String name); // Long getDisasterId(DisasterInfo disasterInfo); + /** + * 根据灾害信息获取灾害id + * @param disasterInfo + * @return + */ + List getDisasterId(DisasterInfo disasterInfo); } 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 393052a..4c54a29 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 @@ -9,6 +9,7 @@ import lombok.RequiredArgsConstructor; import org.springblade.core.mp.support.Condition; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -28,7 +29,33 @@ 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); + return disasterInfos; + } + public List getDisasterId(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 = this.baseMapper.selectList(qw); +// 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; + } // public Long getDisasterId(DisasterInfo disasterInfo){ // QueryWrapper qw=new QueryWrapper<>(disasterInfo); // Long va=; From 39c3c6bcea2a118d325e78e1dce047383001a288 Mon Sep 17 00:00:00 2001 From: liyuchen <791867849@qq.com> Date: Wed, 5 Apr 2023 18:18:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=9A=E5=AA=92=E4=BD=93=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E6=8E=A5=E5=8F=A3-liyuchen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kening/vordm/entity/HotspotArea.java | 20 ++++++++ .../java/com/kening/vordm/entity/Tweets.java | 20 ++++++++ .../com/kening/vordm/entity/WorldCharts.java | 24 +++++++++ .../vordm/controller/NewsController.java | 42 +++++++++++++++ .../controller/SocialMediaController.java | 51 +++++++++++++++++++ .../controller/WordColudsController.java | 38 ++++++++++++++ .../vordm/mapper/SocialMediaMapper.java | 11 +++- .../kening/vordm/mapper/SocialMediaMapper.xml | 16 ++++++ .../kening/vordm/mapper/WordColudsMapper.java | 10 ++++ .../kening/vordm/mapper/WordColudsMapper.xml | 13 +++++ .../vordm/service/SocialMediaService.java | 10 +++- .../vordm/service/WordColudsService.java | 10 ++++ .../service/impl/SocialMediaServiceImpl.java | 12 +++++ .../service/impl/WordColudsServiceImpl.java | 15 ++++++ 14 files changed, 290 insertions(+), 2 deletions(-) create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tweets.java create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WorldCharts.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/SocialMediaController.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WordColudsController.java diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java new file mode 100644 index 0000000..7492d2a --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java @@ -0,0 +1,20 @@ +package com.kening.vordm.entity; + +import lombok.Data; + +/** + * 热点区域统计实体类 + * @author liyuchen + * @date 2023/04/05 + */ +@Data +public class HotspotArea { + /** + * 名称 + */ + private String name; + /** + * 频次 + */ + private Integer value; +} diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tweets.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tweets.java new file mode 100644 index 0000000..432a359 --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tweets.java @@ -0,0 +1,20 @@ +package com.kening.vordm.entity; + +import lombok.Data; + +/** + * 推特数量统计实体 + * @author liyuchen + * @date 2023/04/05 + */ +@Data +public class Tweets { + /** + * 时间 + */ + private String date; + /** + * 数量 + */ + private Integer num; +} diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WorldCharts.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WorldCharts.java new file mode 100644 index 0000000..18f5527 --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WorldCharts.java @@ -0,0 +1,24 @@ +package com.kening.vordm.entity; + +import lombok.Data; + +/** + * 词云图表统计实体 + * @author liyuchen + * @date 2023/04/05 + */ +@Data +public class WorldCharts { + /** + * 日期 + */ + private String date; + /** + * 词名 + */ + private String name; + /** + * 频次 + */ + private Integer value; +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java new file mode 100644 index 0000000..ab04772 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java @@ -0,0 +1,42 @@ +package com.kening.vordm.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kening.vordm.entity.News; +import com.kening.vordm.service.NewsService; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +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.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + + +/** + * 新闻UI前端控制器 + * @author liyuchen + * @date 2023/04/04 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/ui/news") +public class NewsController { + + private NewsService newsService; + + /** + * VordmUI-新闻列表分页查询 + * @param params + * @param query + * @return + */ + @GetMapping("/pages") + public R> pages(@RequestParam Map params, Query query){ + return R.data(newsService.page(Condition.getPage(query),Condition.getQueryWrapper(params,News.class))); + } + + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/SocialMediaController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/SocialMediaController.java new file mode 100644 index 0000000..b8724fe --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/SocialMediaController.java @@ -0,0 +1,51 @@ +package com.kening.vordm.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kening.vordm.entity.SocialMedia; +import com.kening.vordm.entity.Tweets; +import com.kening.vordm.service.SocialMediaService; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +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.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +/** + * 多媒体社交数据-前端UI控制器 + * @author liyuchen + * @date 2023/04/05 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/ui/socialMedia") +public class SocialMediaController { + + private SocialMediaService service; + + /** + * 媒体社交数据分页展示 + * @param params + * @param query + * @return + */ + @GetMapping("/pages") + public R> pages(@RequestParam Map params, Query query){ + return R.data(service.page(Condition.getPage(query),Condition.getQueryWrapper(params,SocialMedia.class))); + } + + /** + * 推文统计 + * @param disasterId 灾害id + * @return + */ + @GetMapping("/tweetsCount") + public R> tweetsCount(@RequestParam Long disasterId){ + return R.data(service.tweetsCount(disasterId)); + } +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WordColudsController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WordColudsController.java new file mode 100644 index 0000000..9603a17 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WordColudsController.java @@ -0,0 +1,38 @@ +package com.kening.vordm.controller; + +import com.kening.vordm.entity.Tweets; +import com.kening.vordm.entity.WordColuds; +import com.kening.vordm.entity.WorldCharts; +import com.kening.vordm.service.WordColudsService; +import lombok.AllArgsConstructor; +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.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +/** + * 词云-UI前端控制器 + * @author liyuchen + * @date 2023/04/05 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/ui/word") +public class WordColudsController { + + private WordColudsService service; + + /** + * 词云统计 + * @param disasterId 灾害id + * @return + */ + @GetMapping("/wordCount") + public R>> wordCount(@RequestParam Long disasterId){ + return R.data(service.wordCount(disasterId)); + } +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/SocialMediaMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/SocialMediaMapper.java index eff3314..7cfdc08 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/SocialMediaMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/SocialMediaMapper.java @@ -3,6 +3,10 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kening.vordm.entity.SocialMedia; +import com.kening.vordm.entity.Tweets; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author G1393 @@ -12,5 +16,10 @@ import com.kening.vordm.entity.SocialMedia; */ public interface SocialMediaMapper extends BaseMapper { - + /** + * 推文统计 + * @param disasterId 灾害id + * @return + */ + List tweetsCount(@Param("disasterId") Long disasterId); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/SocialMediaMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/SocialMediaMapper.xml index 8ceac7a..c8e2ef7 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/SocialMediaMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/SocialMediaMapper.xml @@ -36,4 +36,20 @@ disaster_id,type,status, manager_id,review_time + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordColudsMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordColudsMapper.java index 1f47605..2c437e1 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordColudsMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordColudsMapper.java @@ -3,6 +3,10 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kening.vordm.entity.WordColuds; +import com.kening.vordm.entity.WorldCharts; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author G1393 @@ -13,4 +17,10 @@ import com.kening.vordm.entity.WordColuds; public interface WordColudsMapper extends BaseMapper { + /** + * 词云统计 + * @param disasterId 灾害id + * @return + */ + List wordCount(@Param("disasterId") Long disasterId); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordColudsMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordColudsMapper.xml index aefa545..940fa7e 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordColudsMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordColudsMapper.xml @@ -21,4 +21,17 @@ word,disaster_id,create_time, status,manager_id,review_time + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/SocialMediaService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/SocialMediaService.java index 3bfa1e9..39cf9e1 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/SocialMediaService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/SocialMediaService.java @@ -3,6 +3,9 @@ package com.kening.vordm.service; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.SocialMedia; +import com.kening.vordm.entity.Tweets; + +import java.util.List; /** * @author G1393 @@ -10,5 +13,10 @@ import com.kening.vordm.entity.SocialMedia; * @createDate 2023-04-04 15:54:31 */ public interface SocialMediaService extends IService { - + /** + * 推文统计 + * @param disasterId 灾害id + * @return + */ + List tweetsCount(Long disasterId); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/WordColudsService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/WordColudsService.java index 966375b..257bc43 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/WordColudsService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/WordColudsService.java @@ -3,6 +3,10 @@ package com.kening.vordm.service; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.WordColuds; +import com.kening.vordm.entity.WorldCharts; + +import java.util.List; +import java.util.Map; /** * @author G1393 @@ -11,4 +15,10 @@ import com.kening.vordm.entity.WordColuds; */ public interface WordColudsService extends IService { + /** + * 词云统计 + * @param disasterId 灾害id + * @return + */ + Map> wordCount(Long disasterId); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/SocialMediaServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/SocialMediaServiceImpl.java index c59bc7d..5d55756 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/SocialMediaServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/SocialMediaServiceImpl.java @@ -2,10 +2,13 @@ package com.kening.vordm.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kening.vordm.entity.SocialMedia; +import com.kening.vordm.entity.Tweets; import com.kening.vordm.mapper.SocialMediaMapper; import com.kening.vordm.service.SocialMediaService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author G1393 * @description 针对表【social_media(社交媒体数据表，主要指twitter，facebook,微博等数据来源，重要字段 time-content)】的数据库操作Service实现 @@ -15,4 +18,13 @@ import org.springframework.stereotype.Service; public class SocialMediaServiceImpl extends ServiceImpl implements SocialMediaService { + /** + * 推文统计 + * @param disasterId 灾害id + * @return + */ + @Override + public List tweetsCount(Long disasterId) { + return baseMapper.tweetsCount(disasterId); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/WordColudsServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/WordColudsServiceImpl.java index 19f1057..ac66ff9 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/WordColudsServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/WordColudsServiceImpl.java @@ -2,10 +2,15 @@ package com.kening.vordm.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kening.vordm.entity.WordColuds; +import com.kening.vordm.entity.WorldCharts; import com.kening.vordm.mapper.WordColudsMapper; import com.kening.vordm.service.WordColudsService; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** * @author G1393 * @description 针对表【word_coluds(词云数据)】的数据库操作Service实现 @@ -15,4 +20,14 @@ import org.springframework.stereotype.Service; public class WordColudsServiceImpl extends ServiceImpl implements WordColudsService { + /** + * 词云统计 + * @param disasterId 灾害id + * @return + */ + @Override + public Map> wordCount(Long disasterId) { + List wordColudsList = baseMapper.wordCount(disasterId); + return wordColudsList.stream().collect(Collectors.groupingBy(WorldCharts::getDate)); + } } 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 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E7=81=BE=E5=AE=B3=E6=95=B0=E6=8D=AE=E7=9A=84=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=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); + } } From c534592f957fb2b2a48a9a9f05724ec5d97cc72e Mon Sep 17 00:00:00 2001 From: zxh <599622719@qq.com> Date: Wed, 5 Apr 2023 22:37:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E7=81=BE=E5=AE=B3=E6=95=B0=E6=8D=AE=E7=9A=84=E4=B8=BB?= =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kening/vordm/entity/DisasterInfo.java | 1 + .../kening/vordm/vo/DisasterMangerInfo.java | 25 +++++++++++++++++++ .../java/com/kening/vordm/vo/GroupByUse.java | 11 +++++--- .../java/com/kening/vordm/vo/groupByUse.java | 25 ------------------- .../controller/DisasterInfoController.java | 22 ++++++++++++++++ .../controller/ManageInforController.java | 23 +++++++++++++++++ .../vordm/mapper/DisasterInfoMapper.java | 5 +++- .../vordm/mapper/DisasterInfoMapper.xml | 15 +++++++++-- .../vordm/mapper/ManagerInfoMapper.java | 4 +++ .../kening/vordm/mapper/ManagerInfoMapper.xml | 9 +++++++ .../vordm/service/DisasterInfoService.java | 6 ++++- .../vordm/service/ManagerInfoService.java | 5 +++- .../service/impl/DisasterInfoServiceImpl.java | 25 ++++++++++++++++--- .../service/impl/ManagerInfoServiceImpl.java | 7 +++++- 14 files changed, 145 insertions(+), 38 deletions(-) create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterMangerInfo.java delete mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/groupByUse.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ManageInforController.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 5358ef0..cc8752c 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 @@ -99,6 +99,7 @@ public class DisasterInfo implements Serializable { @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/vo/DisasterMangerInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterMangerInfo.java new file mode 100644 index 0000000..584aaa7 --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterMangerInfo.java @@ -0,0 +1,25 @@ +package com.kening.vordm.vo; + +import com.kening.vordm.entity.DisasterInfo; + +public class DisasterMangerInfo extends DisasterInfo { + /** + * 用户名 + */ + private String username; + + /** + * 密码 + */ + private String password; + + /** + * 邮箱 + */ + private String email; + + /** + * 组织机构 + */ + private String organization; +} 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..af9d520 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 { /** * 名称 */ @@ -18,5 +16,10 @@ public class groupByUse { /** * 数量 */ - private String count; + private Integer cnt; + + /** + * 图标 + */ + private String icon; } 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 deleted file mode 100644 index 903d0c3..0000000 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/groupByUse.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.kening.vordm.vo; - -import lombok.Data; -import lombok.Getter; -import lombok.Setter; - -@Data -@Getter -@Setter -public class GroupByUse { - /** - * 名称 - */ - private String name; - - /** - * 数量 - */ - 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 fda4e71..a169dfb 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,6 +1,9 @@ package com.kening.vordm.controller; +import com.kening.vordm.vo.DisasterMangerInfo; import com.kening.vordm.vo.GroupByUse; +import com.sun.org.apache.bcel.internal.generic.NEW; +import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Query; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -16,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.Queue; + @RestController @RequiredArgsConstructor @RequestMapping @@ -54,8 +59,25 @@ public class DisasterInfoController { return R.data(newsService.page(Condition.getPage(query),new QueryWrapper().in("disaster_id",disasterIds))); } + /** + * 灾害信息统计 国家/灾害类型 + * @param name + * @return + */ @GetMapping("/disasterStatistics") public R> getDisasterStatistics(String name){ return R.data(disasterInfoService.getDisasterStatistics(name)); } + + /** + * 首页数据展示，包括响应中和未响应 + * @param query + * @param respondStatus + * @return + */ + @GetMapping("/homeDisasterInfo") + public R> gethomeDisasterInfo(Query query,Integer respondStatus){ + IPage pages=disasterInfoService.getHomeDisaster(Condition.getPage(query),respondStatus); + return R.data(BladePage.of(pages)); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ManageInforController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ManageInforController.java new file mode 100644 index 0000000..7abc700 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ManageInforController.java @@ -0,0 +1,23 @@ +package com.kening.vordm.controller; + +import com.kening.vordm.service.ManagerInfoService; +import com.kening.vordm.vo.GroupByUse; +import lombok.AllArgsConstructor; +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.List; + +@RestController +@AllArgsConstructor +@RequestMapping +public class ManageInforController { + + private final ManagerInfoService managerInfoService; + @GetMapping("manageStatistics") + public R> manageStatistics(String name){ + return R.data(managerInfoService.getMangerStatistics(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 4b6a1de..a068557 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 @@ -2,11 +2,14 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.kening.vordm.entity.DisasterInfo; +import com.kening.vordm.vo.DisasterMangerInfo; import com.kening.vordm.vo.GroupByUse; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Queue; /** * @author G1393 @@ -20,8 +23,8 @@ public interface DisasterInfoMapper extends BaseMapper { @Param("disaster_country") String disaster_country, @Param("disaster_time") String disaster_time, @Param("name") String name); - List getHomeDisasterInfo(); + List getHomeDisaster(IPage page, Integer respondStatus); 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 f5420ad..482b5d6 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,7 +31,10 @@ temp_start_time,create_time,vordm_id, respond_time - + + d.disaster_type,d.disaster_time,d.disaster_country, + m.organization + - + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ManagerInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ManagerInfoMapper.java index 33db91e..e6f3152 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ManagerInfoMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ManagerInfoMapper.java @@ -3,6 +3,9 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kening.vordm.entity.ManagerInfo; +import com.kening.vordm.vo.GroupByUse; + +import java.util.List; /** * @author G1393 @@ -12,5 +15,6 @@ import com.kening.vordm.entity.ManagerInfo; */ public interface ManagerInfoMapper extends BaseMapper { + public List manageStatistics(String name); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ManagerInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ManagerInfoMapper.xml index 2d11325..7c8711e 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ManagerInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ManagerInfoMapper.xml @@ -17,4 +17,13 @@ id,username,password, email,organization,create_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 7616394..bb9181d 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 @@ -1,9 +1,12 @@ package com.kening.vordm.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.DisasterInfo; +import com.kening.vordm.vo.DisasterMangerInfo; import com.kening.vordm.vo.GroupByUse; +import io.swagger.models.auth.In; import java.util.List; @@ -13,7 +16,6 @@ import java.util.List; * @createDate 2023-04-04 15:54:30 */ public interface DisasterInfoService extends IService { - List getAllData(); List getConditionData(String type, String country, String time, String name); // Long getDisasterId(DisasterInfo disasterInfo); @@ -26,4 +28,6 @@ public interface DisasterInfoService extends IService { List getDisasterId(DisasterInfo disasterInfo); List getDisasterStatistics( String name); + + IPage getHomeDisaster(IPage page, Integer respondStatus); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ManagerInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ManagerInfoService.java index be25ca5..78d9597 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ManagerInfoService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ManagerInfoService.java @@ -3,6 +3,9 @@ package com.kening.vordm.service; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.ManagerInfo; +import com.kening.vordm.vo.GroupByUse; + +import java.util.List; /** * @author G1393 @@ -10,5 +13,5 @@ import com.kening.vordm.entity.ManagerInfo; * @createDate 2023-04-04 15:54:30 */ public interface ManagerInfoService extends IService { - + public List getMangerStatistics(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 9eab765..347ab6c 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,12 +1,15 @@ package com.kening.vordm.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; 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.DisasterMangerInfo; import com.kening.vordm.vo.GroupByUse; import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.connection.RedisServer; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -26,9 +29,15 @@ implements DisasterInfoService { // this.disasterInfoService = disasterInfoService; // } - public List getAllData(){ - return this.baseMapper.getHomeDisasterInfo(); - } + + /** + * 返回指定的灾害条目 + * @param type + * @param country + * @param time + * @param name + * @return + */ public List getConditionData(String type, String country, String time, String name){ List disasterInfos=this.baseMapper.getSelectCondition(type,country,time,name); return disasterInfos; @@ -62,7 +71,17 @@ implements DisasterInfoService { return null; } + /** + * 进行灾害信息的统计，国家，类型 + * @param name + * @return + */ public List getDisasterStatistics(String name){ return this.baseMapper.getDisasterStatistics(name); } + + public IPage getHomeDisaster(IPage page, Integer respondStatus){ + List disasterMangerInfos = this.baseMapper.getHomeDisaster(page, respondStatus); + return page.setRecords(disasterMangerInfos); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ManagerInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ManagerInfoServiceImpl.java index 2c6d94c..fe99f1c 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ManagerInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ManagerInfoServiceImpl.java @@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kening.vordm.entity.ManagerInfo; import com.kening.vordm.mapper.ManagerInfoMapper; import com.kening.vordm.service.ManagerInfoService; +import com.kening.vordm.vo.GroupByUse; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author G1393 * @description 针对表【manager_info(管理员用户信息表)】的数据库操作Service实现 @@ -14,5 +17,7 @@ import org.springframework.stereotype.Service; @Service public class ManagerInfoServiceImpl extends ServiceImpl implements ManagerInfoService { - + public List getMangerStatistics(String name){ + return this.baseMapper.manageStatistics(name); + } }