From 7f3cf89cce5a41c52b0397ca28c9cdf714cc2362 Mon Sep 17 00:00:00 2001 From: zhang-962464 <599622719@qq.com> Date: Fri, 31 Mar 2023 17:29:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E8=A1=A8=E4=B8=8E=E5=A4=9A=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kening/vordm/vo/DisasterInfo.java | 16 ---------- .../com/kening/vordm/vo/DisasterInfoVo.java | 16 ++++++++++ .../vordm/controller/NewsController.java | 5 ++-- .../controller/SocialMediaController.java | 30 +++++++++++++++++++ .../kening/vordm/mapper/AccountInfoMapper.xml | 2 ++ .../vordm/mapper/DisasterInfoMapper.java | 7 +++-- .../vordm/mapper/DisasterInfoMapper.xml | 27 +++++++++++++++++ .../com/kening/vordm/mapper/NewsMapper.java | 5 ++-- .../com/kening/vordm/mapper/NewsMapper.xml | 7 +++++ .../kening/vordm/mapper/SocialMediaMapper.xml | 1 + .../vordm/service/DisasterInfoService.java | 5 +++- .../com/kening/vordm/service/NewsService.java | 5 ++-- .../service/impl/DisasterInfoServiceImpl.java | 7 +++++ .../vordm/service/impl/NewsServiceImpl.java | 8 +++++ 14 files changed, 116 insertions(+), 25 deletions(-) delete mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfo.java create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/SocialMediaController.java diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfo.java deleted file mode 100644 index 01ec2f0..0000000 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfo.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.kening.vordm.vo; - -import lombok.Data; - -/** - * @author wanghongqing - * @date 2023/3/31 09:46 - **/ -@Data -public class DisasterInfo { - - private Long id; - - private String content; - -} diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java new file mode 100644 index 0000000..f86d5a7 --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java @@ -0,0 +1,16 @@ +package com.kening.vordm.vo; + +import com.kening.vordm.entity.DisasterInfo; +import lombok.Getter; +import lombok.Setter; + +/** + * @author wanghongqing + * @date 2023/3/31 09:46 + **/ +@Getter +@Setter +public class DisasterInfoVo extends DisasterInfo { + + private String geo; +} 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 index aaf7d4a..4b8bd80 100644 --- 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 @@ -28,7 +28,8 @@ public class NewsController { public R> getNews(String content) { // LambdaQueryWrapper qr = new LambdaQueryWrapper<>(); // qr.like(News::getContent, content); - List list = newsService.list(Wrappers.lambdaQuery().like(News::getContent, content)); - return R.data(list); + //List list = newsService.list(Wrappers.lambdaQuery().like(News::getContent, content)); + + return R.data(newsService.getNewsInfo()); } } 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..6bc7f9d --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/SocialMediaController.java @@ -0,0 +1,30 @@ +package com.kening.vordm.controller; + +import com.kening.vordm.entity.DisasterInfo; +import com.kening.vordm.entity.SocialMedia; +import com.kening.vordm.service.DisasterInfoService; +import com.kening.vordm.vo.DisasterInfoVo; +import lombok.RequiredArgsConstructor; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * + * + * + */ +@RestController +@RequiredArgsConstructor +public class SocialMediaController { + private final DisasterInfoService disasterInfoService; + + @GetMapping("/social-media") + public R> getSocialMediaDataByCountry(DisasterInfo disasterInfo){ + return R.data(disasterInfoService.getAllDataByCountry(disasterInfo.getDisasterCountry())); + } + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AccountInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AccountInfoMapper.xml index 776a668..2e53cc0 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AccountInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AccountInfoMapper.xml @@ -14,9 +14,11 @@ + id,user_id,username, email,organization,research_field, create_time + 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 6299ed9..1775eda 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,10 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kening.vordm.entity.DisasterInfo; +import com.kening.vordm.vo.DisasterInfoVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author G1393 @@ -11,6 +15,5 @@ import com.kening.vordm.entity.DisasterInfo; * @Entity new.domain.DisasterInfo */ public interface DisasterInfoMapper extends BaseMapper { - - + List socialMediaData(@Param("country") String country); } 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 543a941..40cae69 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 @@ -19,10 +19,37 @@ + + + + + + + + + + + + + + + + id,disaster_type,disaster_keyword, disaster_time,geometry,disaster_level, disaster_country,respond_status,visit_count, create_time,vordm_id,respond_time + + id,disaster_type,disaster_keyword, + disaster_time + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/NewsMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/NewsMapper.java index 053b759..e3f4a62 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/NewsMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/NewsMapper.java @@ -4,6 +4,8 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kening.vordm.entity.News; +import java.util.List; + /** * @author G1393 * @description 针对表【news(新闻咨询数据表)】的数据库操作Mapper @@ -11,6 +13,5 @@ import com.kening.vordm.entity.News; * @Entity new.domain.News */ public interface NewsMapper extends BaseMapper { - - + List selectAllDataByNews(); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/NewsMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/NewsMapper.xml index ae3b7b0..6102f3b 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/NewsMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/NewsMapper.xml @@ -23,4 +23,11 @@ create_time,status,manager_id, review_time + + + 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 983c962..990888d 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 @@ -27,6 +27,7 @@ + id,link,time, content,user_id,favorite_count, 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 840cb67..bc14f52 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 @@ -2,6 +2,9 @@ package com.kening.vordm.service; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.DisasterInfo; +import com.kening.vordm.vo.DisasterInfoVo; + +import java.util.List; /** * @author G1393 @@ -9,5 +12,5 @@ import com.kening.vordm.entity.DisasterInfo; * @createDate 2023-03-30 17:40:27 */ public interface DisasterInfoService extends IService { - + List getAllDataByCountry(String country); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/NewsService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/NewsService.java index 3c20fe3..2df22a7 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/NewsService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/NewsService.java @@ -3,12 +3,13 @@ package com.kening.vordm.service; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.News; +import java.util.List; + /** * @author G1393 * @description 针对表【news(新闻咨询数据表)】的数据库操作Service * @createDate 2023-03-30 17:40:27 */ public interface NewsService extends IService { - - + List getNewsInfo(); } 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 85ec00a..bd31570 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 @@ -4,8 +4,11 @@ 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.DisasterInfoVo; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author G1393 * @description 针对表【disaster_info(灾害信息表，存储灾害信息)】的数据库操作Service实现 @@ -15,4 +18,8 @@ import org.springframework.stereotype.Service; public class DisasterInfoServiceImpl extends ServiceImpl implements DisasterInfoService { + @Override + public List getAllDataByCountry(String country) { + return this.baseMapper.socialMediaData(country); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/NewsServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/NewsServiceImpl.java index 6ae0b26..8431e41 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/NewsServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/NewsServiceImpl.java @@ -4,15 +4,23 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kening.vordm.entity.News; import com.kening.vordm.mapper.NewsMapper; import com.kening.vordm.service.NewsService; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author G1393 * @description 针对表【news(新闻咨询数据表)】的数据库操作Service实现 * @createDate 2023-03-30 17:40:27 */ @Service +@RequiredArgsConstructor public class NewsServiceImpl extends ServiceImpl implements NewsService { + @Override + public List getNewsInfo() { + return baseMapper.selectAllDataByNews(); + } }