From 7fc1ca4497f5591df22dd9d08562ece71713b4ac Mon Sep 17 00:00:00 2001 From: glj <管理局23456> Date: Wed, 22 Mar 2023 18:42:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/common/utils/DatesUtil.java | 36 +++ .../kening/vordm/entity/DownloadRecord.java | 47 ++++ .../com/kening/vordm/entity/EntityData.java | 96 -------- .../kening/vordm/entity/ExportHotspot.java | 34 +++ .../com/kening/vordm/entity/ExportNews.java | 29 +++ .../{Websites.java => ExportSocialMedia.java} | 38 ++-- ...{WordColuds.java => ExportWordClouds.java} | 38 +--- .../java/com/kening/vordm/entity/Hotspot.java | 56 ----- .../com/kening/vordm/entity/MapServer.java | 46 ---- .../java/com/kening/vordm/entity/News.java | 61 ------ .../com/kening/vordm/entity/PictureInfo.java | 56 ----- .../vordm/entity/RemoteSensingSourceData.java | 151 ------------- .../com/kening/vordm/entity/RespondInfo.java | 207 +++++++++++------- .../com/kening/vordm/entity/SocialMedia.java | 106 --------- .../java/com/kening/vordm/entity/Tool.java | 61 ------ .../vordm/entity/VoluntaryUploadingData.java | 91 -------- .../controller/RespondInfoController.java | 34 +++ .../vordm/mapper/DownloadRecordMapper.java | 15 ++ .../vordm/mapper/DownloadRecordMapper.xml | 19 ++ .../vordm/mapper/ExportHotspotMapper.java | 16 ++ .../vordm/mapper/ExportHotspotMapper.xml | 16 ++ .../kening/vordm/mapper/ExportNewsMapper.java | 16 ++ .../kening/vordm/mapper/ExportNewsMapper.xml | 15 ++ .../vordm/mapper/ExportSocialMediaMapper.java | 16 ++ .../vordm/mapper/ExportSocialMediaMapper.xml | 20 ++ .../vordm/mapper/ExportWordCloudsMapper.java | 16 ++ .../vordm/mapper/ExportWordCloudsMapper.xml | 16 ++ .../vordm/mapper/RespondInfoMapper.java | 3 + .../kening/vordm/mapper/RespondInfoMapper.xml | 50 ++++- .../vordm/service/DownloadRecordService.java | 14 ++ .../vordm/service/ExportHotspotService.java | 14 ++ .../vordm/service/ExportNewsService.java | 14 ++ .../service/ExportSocialMediaService.java | 14 ++ .../service/ExportWordCloudsService.java | 14 ++ .../vordm/service/RespondInfoService.java | 9 + .../impl/DownloadRecordServiceImpl.java | 18 ++ .../impl/ExportHotspotServiceImpl.java | 18 ++ .../service/impl/ExportNewsServiceImpl.java | 18 ++ .../impl/ExportSocialMediaServiceImpl.java | 18 ++ .../impl/ExportWordCloudsServiceImpl.java | 18 ++ .../service/impl/RespondInfoServiceImpl.java | 37 ++++ 41 files changed, 747 insertions(+), 864 deletions(-) create mode 100644 kn-common/src/main/java/org/springblade/common/utils/DatesUtil.java create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DownloadRecord.java delete mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ExportHotspot.java create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ExportNews.java rename kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/{Websites.java => ExportSocialMedia.java} (51%) rename kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/{WordColuds.java => ExportWordClouds.java} (55%) delete mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java delete mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/MapServer.java delete mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/News.java delete mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/PictureInfo.java delete mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java delete mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/SocialMedia.java delete mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java delete mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/VoluntaryUploadingData.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RespondInfoController.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DownloadRecordMapper.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DownloadRecordMapper.xml create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportHotspotMapper.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportHotspotMapper.xml create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportNewsMapper.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportNewsMapper.xml create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportSocialMediaMapper.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportSocialMediaMapper.xml create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportWordCloudsMapper.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportWordCloudsMapper.xml create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DownloadRecordService.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ExportHotspotService.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ExportNewsService.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ExportSocialMediaService.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ExportWordCloudsService.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DownloadRecordServiceImpl.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ExportHotspotServiceImpl.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ExportNewsServiceImpl.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ExportSocialMediaServiceImpl.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ExportWordCloudsServiceImpl.java diff --git a/kn-common/src/main/java/org/springblade/common/utils/DatesUtil.java b/kn-common/src/main/java/org/springblade/common/utils/DatesUtil.java new file mode 100644 index 0000000..8e6936e --- /dev/null +++ b/kn-common/src/main/java/org/springblade/common/utils/DatesUtil.java @@ -0,0 +1,36 @@ +package org.springblade.common.utils; + +import java.util.Calendar; +import java.util.Date; + +/** + * 日期工具类 + */ +public class DatesUtil { + + /** + * 获取任意时间 + * @param days 天数 1 加一天 -1 减一天 + * @return + */ + public static Date getArbitrarilyTime(Integer days) { + Date date = new Date(); + if (date == null) { + return null; + } + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + cal.add(Calendar.DATE, days); + return cal.getTime(); + } + + + + // 获取当天的开始时间 + public static java.util.Date getTime() { + Calendar calendar= Calendar.getInstance(); + return calendar.getTime(); + } + + +} 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 new file mode 100644 index 0000000..c794d6e --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DownloadRecord.java @@ -0,0 +1,47 @@ +package com.kening.vordm.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * + * @TableName download_record + */ +@TableName(value ="download_record") +@Data +public class DownloadRecord implements Serializable { + /** + * 数据自增列 + */ + @TableId + private Integer id; + + /** + * 灾害id + */ + private Integer diasterId; + + /** + * 大的数据源：1为新闻资讯，2为社交媒体，3实体数据 +4、遥感元数据；5图形数据（词云和热点区域） + */ + private Integer bigType; + + /** + * 数据类型 : 1_1为新闻资讯-baidu;1_2新闻资讯-bing,2_1为社交媒体-twitter;2_2为社交媒体-weibo；3_1是实体数据-basic_data,3_2 是实体数据-respond_report ,3_3 是实体数据-cartographic_product ;4_1是遥感影像-landset,4_2是遥感影像-sentinel;5_1为图形数据-hotspot,5_2为图形数据-word_clouds + */ + private String smallType; + + /** + * 下载次数统计 + */ + private Integer count; + + @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/EntityData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java deleted file mode 100644 index eece3a5..0000000 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.kening.vordm.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -/** - * 其他上传的实体数据 - * @TableName entity_data - */ -@TableName(value ="entity_data") -@Data -public class EntityData implements Serializable { - /** - * 数据自增列 - */ - @TableId - private Long id; - - /** - * 数据来源机构 - */ - private String source; - - /** - * 数据名称 - */ - private String title; - - /** - * 数据产品提供者 - */ - private String provider; - - /** - * 数据产品的大小 - */ - private Integer size; - - /** - * 数据类型（制图产品，减灾产品和其他数据） - */ - private String type; - - /** - * 数据下载链接（网站上，对象存储路径） - */ - private String link; - - /** - * 数据备注 - */ - private String remark; - - /** - * 提交时间 - */ - private Date applyTime; - - /** - * 灾害id - */ - private Integer disasterId; - - /** - * 可视化可视化标志0-不可可视化；1-表示可以可视化 - */ - private Integer visualFlag; - - /** - * 可视化跳转中心经度 - */ - private Double visualLon; - - /** - * 可视化跳转中心纬度 - */ - private Double visualLat; - - /** - * 是否由志愿者上传（0-不是；1-是） - */ - private Integer voluntaryFlag; - - /** - * 数据条目创建时间 - */ - private Date createTime; - - @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/ExportHotspot.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ExportHotspot.java new file mode 100644 index 0000000..4293eba --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ExportHotspot.java @@ -0,0 +1,34 @@ +package com.kening.vordm.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * + * @TableName export_hotspot + */ +@TableName(value ="export_hotspot") +@Data +public class ExportHotspot implements Serializable { + /** + * 区域_中文 + */ + private String areaCn; + + /** + * 区域_英文 + */ + private String areaEn; + + /** + * 出现频次 + */ + private Integer frequency; + + @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/ExportNews.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ExportNews.java new file mode 100644 index 0000000..d774d31 --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ExportNews.java @@ -0,0 +1,29 @@ +package com.kening.vordm.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * + * @TableName export_news + */ +@TableName(value ="export_news") +@Data +public class ExportNews implements Serializable { + /** + * 新闻名称 + */ + private String title; + + /** + * 新闻内容 + */ + private String content; + + @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/ExportSocialMedia.java similarity index 51% rename from kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java rename to kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ExportSocialMedia.java index 2e03e74..7482d0c 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/ExportSocialMedia.java @@ -3,47 +3,47 @@ package com.kening.vordm.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + /** - * 减灾网址 - * @TableName websites + * + * @TableName export_social_media */ -@TableName(value ="websites") +@TableName(value ="export_social_media") @Data -public class Websites implements Serializable { +public class ExportSocialMedia implements Serializable { /** - * 数据自增列 + * 推文发表时间 */ - @TableId - private Long id; + private Date time; /** - * 减灾网站名称 + * 推文内容 */ - private String title; + private String content; /** - * 减灾网站链接 + * 点赞数量 */ - private String link; + private Integer favoriteCount; /** - * 提供者 + * 回复数 */ - private String provider; + private Integer replyCount; /** - * 灾害id + * 访问树量 */ - private Integer disasterId; + private Integer visitCount; /** - * 数据条目创建时间 + * 转发次数 */ - private Date createTime; + private Integer retweetCount; @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/WordColuds.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ExportWordClouds.java similarity index 55% rename from kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordColuds.java rename to kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ExportWordClouds.java index f7f196e..95c3f08 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordColuds.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ExportWordClouds.java @@ -3,23 +3,18 @@ package com.kening.vordm.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; import lombok.Data; -/** - * 词云数据 - * @TableName word_coluds - */ -@TableName(value ="word_coluds") -@Data -public class WordColuds implements Serializable { - /** - * 数据自增列 - */ - @TableId - private Long id; +import java.io.Serializable; +import java.util.Date; +/** + * + * @TableName export_word_clouds + */ +@TableName(value ="export_word_clouds") +@Data +public class ExportWordClouds implements Serializable { /** * 该词组归属的时间 */ @@ -35,21 +30,6 @@ public class WordColuds implements Serializable { */ private String word; - /** - * 灾害id - */ - private Integer disasterId; - - /** - * 数据条目创建时间 - */ - private Date createTime; - - /** - * 审核状态，0为未审核，1为审核保留，2为审核不保留 - */ - private Integer status; - @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/Hotspot.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java deleted file mode 100644 index d70d7b2..0000000 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.kening.vordm.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -/** - * 热点区域数据 - * @TableName hotspot - */ -@TableName(value ="hotspot") -@Data -public class Hotspot implements Serializable { - /** - * 数据自增列 - */ - @TableId - private Long id; - - /** - * 区域_中文 - */ - private String areaCn; - - /** - * 区域_英文 - */ - private String areaEn; - - /** - * 出现频次 - */ - private Integer frequency; - - /** - * 灾害id - */ - private Integer disasterId; - - /** - * 数据条目创建时间 - */ - private Date createTime; - - /** - * 是否保留此条目，0为未审核，1为审核保留，2为审核不保留 - */ - private Integer status; - - @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/MapServer.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/MapServer.java deleted file mode 100644 index bf3cd54..0000000 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/MapServer.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.kening.vordm.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import lombok.Data; - -/** - * 上传基础地理数据，并发布到geoserver上，记录geoserver的存储信息 - - * @TableName map_server - */ -@TableName(value ="map_server") -@Data -public class MapServer implements Serializable { - /** - * 数据自增列 - */ - @TableId - private Long id; - - /** - * 展示在前端的名字 - */ - private String name; - - /** - * 灾害id - */ - private Integer disasterId; - - /** - * 缩放纬度 - */ - private Double lat; - - /** - * 缩放经度 - */ - private Double lon; - - @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/News.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/News.java deleted file mode 100644 index d657eca..0000000 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/News.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.kening.vordm.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -/** - * 新闻咨询数据表 - * @TableName news - */ -@TableName(value ="news") -@Data -public class News implements Serializable { - /** - * 数据自增列 - */ - @TableId - private Long id; - - /** - * 新闻名称 - */ - private String title; - - /** - * 新闻内容 - */ - private String content; - - /** - * 新闻链接 - */ - private String link; - - /** - * 新闻类型（baidu,bing）0-baidu ,1-bing - */ - private Integer type; - - /** - * 灾害id - */ - private Integer disasterId; - - /** - * 数据条目创建时间 - */ - private Date createTime; - - /** - * 是否保留此条目，0为未审核，1为审核保留，2为审核不保留 - */ - private Integer status; - - @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/PictureInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/PictureInfo.java deleted file mode 100644 index 854b40d..0000000 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/PictureInfo.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.kening.vordm.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -/** - * - * @TableName picture_info - */ -@TableName(value ="picture_info") -@Data -public class PictureInfo implements Serializable { - /** - * 数据自增列 - */ - @TableId - private Long id; - - /** - * 数据存储链接 - */ - private String link; - - /** - * 数据大小（byte） - */ - private Integer size; - - /** - * 数据格式，jpg、png - */ - private String type; - - /** - * 灾害id - */ - private Integer disasterId; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 是否为主页显示，0为不是，1为是 - */ - private Integer isMain; - - @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/RemoteSensingSourceData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java deleted file mode 100644 index 332a51c..0000000 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java +++ /dev/null @@ -1,151 +0,0 @@ -package com.kening.vordm.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -/** - * 遥感影像源数据 - * @TableName remote_sensing_source_data - */ -@TableName(value ="remote_sensing_source_data") -@Data -public class RemoteSensingSourceData implements Serializable { - /** - * 主键 - */ - @TableId - private Long id; - - /** - * 影像缩略图地址 - */ - private String thumbnailLink; - - /** - * 产品级别 - */ - private String productLevel; - - /** - * 产品序列号 - */ - private String productSerialNum; - - /** - * 生产时间 - */ - private Date productTime; - - /** - * 产品波段树 - */ - private Integer productBandsNum; - - /** - * 产品分辨率 - */ - private Double productResolution; - - /** - * 原始数据条带号 - */ - private Integer rawDataStripeNum; - - /** - * 云层覆盖量 - */ - private Integer cloudCover; - - /** - * 产品大小(MB为单位) - */ - private Integer productSize; - - /** - * 投影带号 - */ - private Integer projectBandNum; - - /** - * 覆盖区域 - */ - private String coverageArea; - - /** - * 卫星代号 - */ - private String satelliteCode; - - /** - * 接收时间 - */ - private Date receivingTime; - - /** - * 左上纬度 - */ - private Double upperLeftLat; - - /** - * 左上经度 - */ - private Double upperLeftLon; - - /** - * 右上纬度 - */ - private Double upperRightLat; - - /** - * 右上经度 - */ - private Double upperRightLon; - - /** - * 景中心纬度 - */ - private Double viewCenterLat; - - /** - * 景中心经度 - */ - private Double viewCenterLon; - - /** - * 右下纬度 - */ - private Double lowerRightLat; - - /** - * 右下经度 - */ - private Double lowerRightLon; - - /** - * 左下纬度 - */ - private Double lowerLeftLat; - - /** - * 左下经度 - */ - private Double lowerLeftLon; - - /** - * 灾害id - */ - private Integer disasterId; - - /** - * 数据条目创建时间 - */ - private Date createTime; - - @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/RespondInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RespondInfo.java index 50aa961..8475448 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RespondInfo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RespondInfo.java @@ -18,107 +18,152 @@ public class RespondInfo implements Serializable { * 唯一值 */ @TableId - private Long id; + private Long id; - /** - * 用户姓名 - */ - private String userName; + /** + * 用户姓名 + */ + private String userName; - /** - * 邮箱 - */ - private String email; + /** + * 邮箱 + */ + private String email; - /** - * 组织机构 - */ - private String organization; + /** + * 组织机构 + */ + private String organization; - /** - * 地区 - */ - private String region; + /** + * 地区 + */ + private String region; - /** - * 灾害类型 - */ - private String disasterType; + /** + * 灾害类型 + */ + private String disasterType; - /** - * 灾害关键词 - */ - private String disasterKeyword; + /** + * 灾害关键词 + */ + private String disasterKeyword; - /** - * 灾害发生时间 - */ - private Date disasterTime; + /** + * 灾害发生时间 + */ + private Date disasterTime; - /** - * 灾害响应时间 - */ - private Date respondTime; + /** + * 灾害响应时间 + */ + private Date respondTime; - /** - * 用户职业 - */ - private String userProfession; + /** + * 用户职业 + */ + private String userProfession; - /** - * 用户研究领域 - */ - private String userResearchField; + /** + * 用户研究领域 + */ + private String userResearchField; - /** - * 灾害发生地经度 - */ - private Double disasterLon; + /** + * 灾害发生地经度 + */ + private Double disasterLon; - /** - * 灾害发生地纬度 - */ - private Double disasterLat; + /** + * 灾害发生地纬度 + */ + private Double disasterLat; - /** - * 灾害强度或震级 - */ - private String disasterLevel; + /** + * 灾害强度或震级 + */ + private String disasterLevel; - /** - * 受灾国家 - */ - private String disasterCountry; + /** + * 受灾国家 + */ + private String disasterCountry; - /** - * 响应状态，0未响应，1响应中，2响应已完成 - */ - private Integer respondStatus; + /** + * 响应状态，0未审批，1审批未通过。2审批通过并正在响应，3审批通过并且响应完成 + */ + private Integer respondStatus; - /** - * 爬虫类型 - */ - private Integer spidertype; + /** + * 本灾害的用户访问次数 + */ + private Integer visitCount; - /** - * 爬虫起始时间 - */ - private Date tempendtime; + /** + * 爬虫类型 + */ + private Integer spiderType; - /** - * 爬虫区域范围 - */ - private String tempregion; + /** + * 爬虫起始时间 + */ + private Date tempEndTime; - /** - * 爬虫终止时间 - */ - private Date tempstarttime; + /** + * 爬虫区域范围 + */ + private String disasterRegion; - /** - * 数据条目创建时间 - */ - private Date createTime; + /** + * 爬虫终止时间 + */ + private Date tempStartTime; + + /** + * 数据条目创建时间 + */ + private Date createTime; + + /** + * 灾害id,审批通过后生成 + */ + private String disasterId; + + /** + * 下载次数 + */ + private Integer downloadFrequency; + + /** + * 时间段 0 最近一周 / 1 最近一个月 / 2 最近半年 + */ + @TableField(exist = false) + private Integer timePeriod; + + /** + * 排序字段 0 Visits / 1 Downloads / 2 Update time + */ + @TableField(exist = false) + private Integer sort; + + /** + * 排序字段 + */ + @TableField(exist = false) + private String sortName; + + /** + * 开始时间 + */ + @TableField(exist = false) + private String startTime; + + /** + * 结束时间 + */ + @TableField(exist = false) + private String endTime; @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/SocialMedia.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/SocialMedia.java deleted file mode 100644 index eaa23d6..0000000 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/SocialMedia.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.kening.vordm.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -/** - * 社交媒体数据表，主要指twitter，facebook,微博等数据来源，重要字段 time-content - * @TableName social_media - */ -@TableName(value ="social_media") -@Data -public class SocialMedia implements Serializable { - /** - * 数据自增列 - */ - @TableId - private Long id; - - /** - * 推文标签链接 - */ - private String link; - - /** - * 推文发表时间 - */ - private Date time; - - /** - * 推文内容 - */ - private String content; - - /** - * 用户id - */ - private Integer userId; - - /** - * 点赞数量 - */ - private Integer favoriteCount; - - /** - * 回复数 - */ - private Integer replyCount; - - /** - * 转发次数 - */ - private Integer retweetCount; - - /** - * 地理字段 - */ - private String geo; - - /** - * 坐标 - */ - private String coordinates; - - /** - * 发文地 - */ - private String place; - - /** - * 贡献者 - */ - private String contributors; - - /** - * 推文主题 - */ - private String topic; - - /** - * 数据条目创建时间 - */ - private Date createTime; - - /** - * 灾害id - */ - private Integer disasterId; - - /** - * 数据类型，0-twitter ,1-weibo - */ - private Integer type; - - /** - * 审核状态，0为未审核，1为审核保留，2为审核不保留 - */ - private Integer status; - - @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/Tool.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java deleted file mode 100644 index ef19ab0..0000000 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.kening.vordm.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -/** - * 模型工具表 - * @TableName tool - */ -@TableName(value ="tool") -@Data -public class Tool implements Serializable { - /** - * 数据自增列 - */ - @TableId - private Long id; - - /** - * 工具名称 - */ - private String toolName; - - /** - * 数据标签 - */ - private String label; - - /** - * 导论 - */ - private String introduction; - - /** - * 工具链接 - */ - private String link; - - /** - * 联系方式 - */ - private String email; - - /** - * 对模型的进一步描述 - */ - private String detail; - - /** - * 数据条目创建时间 - */ - private Date createTime; - - @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/VoluntaryUploadingData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/VoluntaryUploadingData.java deleted file mode 100644 index 00d6790..0000000 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/VoluntaryUploadingData.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.kening.vordm.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -/** - * 自愿者上传数据 - * @TableName voluntary_uploading_data - */ -@TableName(value ="voluntary_uploading_data") -@Data -public class VoluntaryUploadingData implements Serializable { - /** - * - */ - @TableId - private Long id; - - /** - * 真实姓名 - */ - private String realName; - - /** - * 所在单位 - */ - private String place; - - /** - * 职业 - */ - private String profession; - - /** - * 职称 - */ - private String jobTitle; - - /** - * 领域 - */ - private String field; - - /** - * 邮箱 - */ - private String email; - - /** - * 数据格式 - */ - private String type; - - /** - * 数据大小(MB存储) - */ - private Integer size; - - /** - * 数据说明 - */ - private String details; - - /** - * 上传时间 - */ - private Date uploadtime; - - /** - * 灾害id - */ - private Integer disasterId; - - /** - * 数据存储地址 - */ - private String link; - - /** - * 数据条目创建时间 - */ - private Date createTime; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; - -} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RespondInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RespondInfoController.java new file mode 100644 index 0000000..d8aadb5 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RespondInfoController.java @@ -0,0 +1,34 @@ +package com.kening.vordm.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kening.vordm.entity.RespondInfo; +import com.kening.vordm.service.RespondInfoService; +import lombok.RequiredArgsConstructor; +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.RestController; + +//灾害数据 +@RestController +@RequiredArgsConstructor +@RequestMapping("/respondInfo") +public class RespondInfoController { + + //灾害信息服务层 + private final RespondInfoService respondInfoService; + + + /** + * 灾害列表信息 + * @param respondInfo 灾害条件信息 + * @param query current当前页 size 每页数据量 + * @return + */ + @GetMapping("/list") + public R> getRespondInfoList(RespondInfo respondInfo, Query query) { + return R.data(respondInfoService.getRespondInfoList(Condition.getPage(query), respondInfo)); + } +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DownloadRecordMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DownloadRecordMapper.java new file mode 100644 index 0000000..d46d34f --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DownloadRecordMapper.java @@ -0,0 +1,15 @@ +package com.kening.vordm.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kening.vordm.entity.DownloadRecord; + +/** +* @author G1393 +* @description 针对表【download_record】的数据库操作Mapper +* @createDate 2023-03-22 16:42:20 +* @Entity new.domain.DownloadRecord +*/ +public interface DownloadRecordMapper extends BaseMapper { + + +} 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 new file mode 100644 index 0000000..abe1a4f --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DownloadRecordMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + id,diaster_id,big_type, + small_type,count + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportHotspotMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportHotspotMapper.java new file mode 100644 index 0000000..8ac9ee8 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportHotspotMapper.java @@ -0,0 +1,16 @@ +package com.kening.vordm.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kening.vordm.entity.ExportHotspot; + +/** +* @author G1393 +* @description 针对表【export_hotspot】的数据库操作Mapper +* @createDate 2023-03-22 16:42:20 +* @Entity new.domain.ExportHotspot +*/ +public interface ExportHotspotMapper extends BaseMapper { + + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportHotspotMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportHotspotMapper.xml new file mode 100644 index 0000000..6907bc5 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportHotspotMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + area_cn,area_en,frequency + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportNewsMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportNewsMapper.java new file mode 100644 index 0000000..b53263d --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportNewsMapper.java @@ -0,0 +1,16 @@ +package com.kening.vordm.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kening.vordm.entity.ExportNews; + +/** +* @author G1393 +* @description 针对表【export_news】的数据库操作Mapper +* @createDate 2023-03-22 16:42:20 +* @Entity new.domain.ExportNews +*/ +public interface ExportNewsMapper extends BaseMapper { + + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportNewsMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportNewsMapper.xml new file mode 100644 index 0000000..65ce21e --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportNewsMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + title,content + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportSocialMediaMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportSocialMediaMapper.java new file mode 100644 index 0000000..83575e6 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportSocialMediaMapper.java @@ -0,0 +1,16 @@ +package com.kening.vordm.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kening.vordm.entity.ExportSocialMedia; + +/** +* @author G1393 +* @description 针对表【export_social_media】的数据库操作Mapper +* @createDate 2023-03-22 16:42:20 +* @Entity new.domain.ExportSocialMedia +*/ +public interface ExportSocialMediaMapper extends BaseMapper { + + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportSocialMediaMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportSocialMediaMapper.xml new file mode 100644 index 0000000..1cc85fc --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportSocialMediaMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + time,content,favorite_count, + reply_count,visit_count,retweet_count + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportWordCloudsMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportWordCloudsMapper.java new file mode 100644 index 0000000..08ffb13 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportWordCloudsMapper.java @@ -0,0 +1,16 @@ +package com.kening.vordm.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kening.vordm.entity.ExportWordClouds; + +/** +* @author G1393 +* @description 针对表【export_word_clouds】的数据库操作Mapper +* @createDate 2023-03-22 16:42:20 +* @Entity new.domain.ExportWordClouds +*/ +public interface ExportWordCloudsMapper extends BaseMapper { + + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportWordCloudsMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportWordCloudsMapper.xml new file mode 100644 index 0000000..3e2f4a6 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ExportWordCloudsMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + time,frequency,word + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RespondInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RespondInfoMapper.java index fbd2a7e..95ae405 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RespondInfoMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RespondInfoMapper.java @@ -1,7 +1,9 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.kening.vordm.entity.RespondInfo; +import org.apache.ibatis.annotations.Param; /** * @author G1393 @@ -12,4 +14,5 @@ import com.kening.vordm.entity.RespondInfo; public interface RespondInfoMapper extends BaseMapper { + IPage getRespondInfoList(@Param("respondInfo") RespondInfo respondInfo, IPage page); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RespondInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RespondInfoMapper.xml index f45fbd4..5cd86d3 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RespondInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RespondInfoMapper.xml @@ -21,20 +21,48 @@ - - - - + + + + + + + - id,user_name,email, - organization,region,disaster_type, - disaster_keyword,disaster_time,respond_time, - user_profession,user_research_field,disaster_lon, - disaster_lat,disaster_level,disaster_country, - respond_status,spidertype,tempendtime, - tempregion,tempstarttime,create_time + ri.id,ri.user_name,ri.email, + ri.organization,ri.region,ri.disaster_type, + ri.disaster_keyword,ri.disaster_time,ri.respond_time, + ri.user_profession,ri.user_research_field,ri.disaster_lon, + ri.disaster_lat,ri.disaster_level,ri.disaster_country, + ri.respond_status,ri.visit_count,ri.spider_type,ri.temp_end_time, + ri.disaster_region,ri.temp_start_time,ri.create_time,ri.disaster_id,ri.download_frequency + + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DownloadRecordService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DownloadRecordService.java new file mode 100644 index 0000000..7c3d497 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DownloadRecordService.java @@ -0,0 +1,14 @@ +package com.kening.vordm.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.kening.vordm.entity.DownloadRecord; + +/** +* @author G1393 +* @description 针对表【download_record】的数据库操作Service +* @createDate 2023-03-22 16:42:20 +*/ +public interface DownloadRecordService extends IService { + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ExportHotspotService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ExportHotspotService.java new file mode 100644 index 0000000..4c6f4ef --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ExportHotspotService.java @@ -0,0 +1,14 @@ +package com.kening.vordm.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.kening.vordm.entity.ExportHotspot; + +/** +* @author G1393 +* @description 针对表【export_hotspot】的数据库操作Service +* @createDate 2023-03-22 16:42:20 +*/ +public interface ExportHotspotService extends IService { + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ExportNewsService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ExportNewsService.java new file mode 100644 index 0000000..6f60385 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ExportNewsService.java @@ -0,0 +1,14 @@ +package com.kening.vordm.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.kening.vordm.entity.ExportNews; + +/** +* @author G1393 +* @description 针对表【export_news】的数据库操作Service +* @createDate 2023-03-22 16:42:20 +*/ +public interface ExportNewsService extends IService { + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ExportSocialMediaService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ExportSocialMediaService.java new file mode 100644 index 0000000..bb09989 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ExportSocialMediaService.java @@ -0,0 +1,14 @@ +package com.kening.vordm.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.kening.vordm.entity.ExportSocialMedia; + +/** +* @author G1393 +* @description 针对表【export_social_media】的数据库操作Service +* @createDate 2023-03-22 16:42:20 +*/ +public interface ExportSocialMediaService extends IService { + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ExportWordCloudsService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ExportWordCloudsService.java new file mode 100644 index 0000000..9ff0926 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ExportWordCloudsService.java @@ -0,0 +1,14 @@ +package com.kening.vordm.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.kening.vordm.entity.ExportWordClouds; + +/** +* @author G1393 +* @description 针对表【export_word_clouds】的数据库操作Service +* @createDate 2023-03-22 16:42:20 +*/ +public interface ExportWordCloudsService extends IService { + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RespondInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RespondInfoService.java index 5e6380f..2fd0d24 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RespondInfoService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RespondInfoService.java @@ -1,5 +1,6 @@ package com.kening.vordm.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.RespondInfo; @@ -10,4 +11,12 @@ import com.kening.vordm.entity.RespondInfo; */ public interface RespondInfoService extends IService { + /** + * 灾害列表信息 + * @param respondInfo 灾害条件信息 + * @param page current当前页 size 每页数据量 + * @return + */ + IPage getRespondInfoList(IPage page, RespondInfo respondInfo); + } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DownloadRecordServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DownloadRecordServiceImpl.java new file mode 100644 index 0000000..1ef4b07 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DownloadRecordServiceImpl.java @@ -0,0 +1,18 @@ +package com.kening.vordm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.kening.vordm.entity.DownloadRecord; +import com.kening.vordm.mapper.DownloadRecordMapper; +import com.kening.vordm.service.DownloadRecordService; +import org.springframework.stereotype.Service; + +/** +* @author G1393 +* @description 针对表【download_record】的数据库操作Service实现 +* @createDate 2023-03-22 16:42:20 +*/ +@Service +public class DownloadRecordServiceImpl extends ServiceImpl +implements DownloadRecordService { + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ExportHotspotServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ExportHotspotServiceImpl.java new file mode 100644 index 0000000..a54dd9a --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ExportHotspotServiceImpl.java @@ -0,0 +1,18 @@ +package com.kening.vordm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.kening.vordm.entity.ExportHotspot; +import com.kening.vordm.mapper.ExportHotspotMapper; +import com.kening.vordm.service.ExportHotspotService; +import org.springframework.stereotype.Service; + +/** +* @author G1393 +* @description 针对表【export_hotspot】的数据库操作Service实现 +* @createDate 2023-03-22 16:42:20 +*/ +@Service +public class ExportHotspotServiceImpl extends ServiceImpl +implements ExportHotspotService { + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ExportNewsServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ExportNewsServiceImpl.java new file mode 100644 index 0000000..79ccff6 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ExportNewsServiceImpl.java @@ -0,0 +1,18 @@ +package com.kening.vordm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.kening.vordm.entity.ExportNews; +import com.kening.vordm.mapper.ExportNewsMapper; +import com.kening.vordm.service.ExportNewsService; +import org.springframework.stereotype.Service; + +/** +* @author G1393 +* @description 针对表【export_news】的数据库操作Service实现 +* @createDate 2023-03-22 16:42:20 +*/ +@Service +public class ExportNewsServiceImpl extends ServiceImpl +implements ExportNewsService { + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ExportSocialMediaServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ExportSocialMediaServiceImpl.java new file mode 100644 index 0000000..b2f50ec --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ExportSocialMediaServiceImpl.java @@ -0,0 +1,18 @@ +package com.kening.vordm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.kening.vordm.entity.ExportSocialMedia; +import com.kening.vordm.mapper.ExportSocialMediaMapper; +import com.kening.vordm.service.ExportSocialMediaService; +import org.springframework.stereotype.Service; + +/** +* @author G1393 +* @description 针对表【export_social_media】的数据库操作Service实现 +* @createDate 2023-03-22 16:42:20 +*/ +@Service +public class ExportSocialMediaServiceImpl extends ServiceImpl +implements ExportSocialMediaService { + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ExportWordCloudsServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ExportWordCloudsServiceImpl.java new file mode 100644 index 0000000..7a8dd8e --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ExportWordCloudsServiceImpl.java @@ -0,0 +1,18 @@ +package com.kening.vordm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.kening.vordm.entity.ExportWordClouds; +import com.kening.vordm.mapper.ExportWordCloudsMapper; +import com.kening.vordm.service.ExportWordCloudsService; +import org.springframework.stereotype.Service; + +/** +* @author G1393 +* @description 针对表【export_word_clouds】的数据库操作Service实现 +* @createDate 2023-03-22 16:42:20 +*/ +@Service +public class ExportWordCloudsServiceImpl extends ServiceImpl +implements ExportWordCloudsService { + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RespondInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RespondInfoServiceImpl.java index 89ab8f5..3039397 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RespondInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RespondInfoServiceImpl.java @@ -1,11 +1,15 @@ package com.kening.vordm.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kening.vordm.entity.RespondInfo; import com.kening.vordm.mapper.RespondInfoMapper; import com.kening.vordm.service.RespondInfoService; +import org.springblade.common.utils.DatesUtil; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; + /** * @author G1393 * @description 针对表【respond_info(存放具体灾害的数据库，其id用于作为灾害id，用于检索每个具体灾害的信息)】的数据库操作Service实现 @@ -15,4 +19,37 @@ import org.springframework.stereotype.Service; public class RespondInfoServiceImpl extends ServiceImpl implements RespondInfoService { + @Override + public IPage getRespondInfoList(IPage page, RespondInfo respondInfo) { + //排序字段 0 Visits / 1 Downloads / 2 Update time + if (respondInfo.getSort() == 1){ + respondInfo.setSortName("ri.visit_count"); + }else if (respondInfo.getSort() == 2){ + respondInfo.setSortName("ri.download_frequency"); + }else if (respondInfo.getSort() == 3){ + respondInfo.setSortName("ri.create_time"); + } + if (respondInfo.getTimePeriod()!=null){ + SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + //获取当前时间 + String format = dateFormat.format(DatesUtil.getTime()); + respondInfo.setEndTime(format); + //时间段 0 最近一周 / 1 最近一个月 / 2 最近半年 + if (respondInfo.getTimePeriod() == 1){ + //一周前的时间 + String format1 = dateFormat.format(DatesUtil.getArbitrarilyTime(-7)); + respondInfo.setStartTime(format1); + }else if (respondInfo.getTimePeriod() == 2){ + //一个月前的时间 + String format1 = dateFormat.format(DatesUtil.getArbitrarilyTime(-30)); + respondInfo.setStartTime(format1); + }else if (respondInfo.getTimePeriod() == 3){ + //半年前的时间 + String format1 = dateFormat.format(DatesUtil.getArbitrarilyTime(-180)); + respondInfo.setStartTime(format1); + } + } + return baseMapper.getRespondInfoList(respondInfo,page); + } + }