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)); + } }