From 706b65b340f2fddfa348c0a4fc94945ef2e1d2a0 Mon Sep 17 00:00:00 2001 From: zhang-962464 <599622719@qq.com> Date: Fri, 31 Mar 2023 10:52:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9disaster=5Fid=E4=B8=BAvor?= =?UTF-8?q?dm=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kening/vordm/entity/DownloadRecord.java | 8 ++-- .../com/kening/vordm/entity/EntityData.java | 4 +- .../java/com/kening/vordm/entity/Hotspot.java | 8 ++-- .../com/kening/vordm/entity/MapServer.java | 8 ++-- .../com/kening/vordm/entity/PictureInfo.java | 8 ++-- .../com/kening/vordm/entity/ResponseInfo.java | 8 ++-- .../com/kening/vordm/entity/Websites.java | 8 ++-- .../vordm/controller/TestController.java | 42 +++++++++++++++++++ .../vordm/mapper/DownloadRecordMapper.xml | 2 +- .../kening/vordm/mapper/EntityDataMapper.xml | 2 +- .../com/kening/vordm/mapper/HotspotMapper.xml | 2 +- .../kening/vordm/mapper/MapServerMapper.java | 4 ++ .../kening/vordm/mapper/MapServerMapper.xml | 5 ++- .../kening/vordm/mapper/PictureInfoMapper.xml | 2 +- .../vordm/mapper/ResponseInfoMapper.xml | 2 +- .../kening/vordm/mapper/WebsitesMapper.xml | 2 +- .../com/kening/vordm/service/NewsService.java | 1 + 17 files changed, 83 insertions(+), 33 deletions(-) create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/TestController.java diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DownloadRecord.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DownloadRecord.java index c794d6e..2ee90f5 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DownloadRecord.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DownloadRecord.java @@ -20,10 +20,10 @@ public class DownloadRecord implements Serializable { @TableId private Integer id; - /** - * 灾害id - */ - private Integer diasterId; + /** + * 灾害id,审批通过后生成 + */ + private String vordmId; /** * 大的数据源：1为新闻资讯，2为社交媒体，3实体数据 diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java index 8217ceb..15763b2 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java @@ -54,9 +54,9 @@ public class EntityData implements Serializable { private Date uploadTime; /** - * 灾害id + * vordm-id */ - private Integer disasterId; + private String vordmId; /** * 可视化可视化标志0-不可可视化；1-表示可以可视化 diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java index 71fca78..b42b8c7 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java @@ -36,10 +36,10 @@ public class Hotspot implements Serializable { */ private Integer frequency; - /** - * 灾害id - */ - private Integer disasterId; + /** + * 灾害id,审批通过后生成 + */ + private String vordmId; /** * 数据条目创建时间 diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/MapServer.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/MapServer.java index 2fe24e0..a33908a 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/MapServer.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/MapServer.java @@ -25,10 +25,10 @@ public class MapServer implements Serializable { */ private String name; - /** - * 灾害id - */ - private Integer disasterId; + /** + * 灾害id,审批通过后生成 + */ + private String vordmId; /** * 缩放纬度 diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/PictureInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/PictureInfo.java index aae83bf..e3f80de 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/PictureInfo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/PictureInfo.java @@ -36,10 +36,10 @@ public class PictureInfo implements Serializable { */ private String type; - /** - * 灾害id - */ - private Integer disasterId; + /** + * 灾害id,审批通过后生成 + */ + private String vordmId; /** * 创建时间 diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ResponseInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ResponseInfo.java index 1951780..903a5a9 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ResponseInfo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ResponseInfo.java @@ -35,10 +35,10 @@ public class ResponseInfo implements Serializable { */ private Integer managerId; - /** - * 灾害id - */ - private Integer disasterId; + /** + * 灾害id,审批通过后生成 + */ + private String vordmId; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java index c84805e..6371fc0 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java @@ -37,10 +37,10 @@ public class Websites implements Serializable { */ private String provider; - /** - * 灾害id - */ - private Integer disasterId; + /** + * 灾害id,审批通过后生成 + */ + private String vordmId; /** * 数据条目创建时间 diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/TestController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/TestController.java new file mode 100644 index 0000000..12be816 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/TestController.java @@ -0,0 +1,42 @@ +package com.kening.vordm.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kening.vordm.entity.News; +import com.kening.vordm.service.NewsService; +import lombok.RequiredArgsConstructor; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/api") +@RequiredArgsConstructor +public class TestController { + private final NewsService newsService; + + /** + * + * @param id + * @return + */ + @GetMapping + public R> getA(Long id) { + + LambdaQueryWrapper qrq = new LambdaQueryWrapper<>(); + qrq.eq(News::getId, id); + + List list = newsService.list(qrq); + return R.data(list); + } + + @PostMapping + public R getB() { + return R.data("seccess"); + } +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DownloadRecordMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DownloadRecordMapper.xml index abe1a4f..74f020c 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DownloadRecordMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DownloadRecordMapper.xml @@ -6,7 +6,7 @@ - + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml index 1a0689c..f72bfc6 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml @@ -12,7 +12,7 @@ - + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml index bc39a75..05523ef 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml @@ -9,7 +9,7 @@ - + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/MapServerMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/MapServerMapper.java index d9c21ee..60c4af6 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/MapServerMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/MapServerMapper.java @@ -4,6 +4,8 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kening.vordm.entity.MapServer; +import java.util.List; + /** * @author G1393 * @description 针对表【map_server(上传基础地理数据，并发布到geoserver上，记录geoserver的存储信息)】的数据库操作Mapper @@ -13,4 +15,6 @@ import com.kening.vordm.entity.MapServer; public interface MapServerMapper extends BaseMapper { + List getMapService(Long id); + } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/MapServerMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/MapServerMapper.xml index 9f6a907..d7624b0 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/MapServerMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/MapServerMapper.xml @@ -7,7 +7,7 @@ - + @@ -16,4 +16,7 @@ id,name,disaster_id, lat,lon + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/PictureInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/PictureInfoMapper.xml index 358f06f..d65734f 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/PictureInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/PictureInfoMapper.xml @@ -9,7 +9,7 @@ - + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ResponseInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ResponseInfoMapper.xml index 3299c9a..39befcd 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ResponseInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ResponseInfoMapper.xml @@ -9,7 +9,7 @@ - + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WebsitesMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WebsitesMapper.xml index ed15cba..a4e4cee 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WebsitesMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WebsitesMapper.xml @@ -9,7 +9,7 @@ - + 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 4b0eb36..3c20fe3 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 @@ -10,4 +10,5 @@ import com.kening.vordm.entity.News; */ public interface NewsService extends IService { + } 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 2/2] =?UTF-8?q?=E5=8D=95=E8=A1=A8=E4=B8=8E=E5=A4=9A?= =?UTF-8?q?=E8=A1=A8=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(); + } }