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..f7ec3db --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java @@ -0,0 +1,127 @@ +package com.kening.vordm.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Date; +import lombok.Data; + +/** + * + * @TableName disaster_info_vo + */ +@TableName(value ="disaster_info_vo") +@Data +public class DisasterInfoVo implements Serializable { + /** + * 唯一值 + */ + private Long id; + + /** + * 灾害类型 + */ + private String disasterType; + + /** + * 灾害关键词 + */ + private String disasterKeyword; + + /** + * 灾害发生时间 + */ + private LocalDate disasterTime; + + /** + * 灾害发起时间 + */ + private LocalDateTime uploadTime; + + /** + * 灾害区域地理字段 + */ + private String geometry; + + /** + * 灾害强度或震级 + */ + private String disasterLevel; + + /** + * 受灾国家 + */ + private String disasterCountry; + + /** + * 响应状态，0未审批，1审批未通过。2审批通过并正在响应，3审批通过并且响应完成 + */ + private Integer respondStatus; + + /** + * 本灾害的用户访问次数 + */ + private Integer visitCount; + + /** + * 本灾害的数据下载次数 + */ + private Integer downloadCount; + + /** + * 爬虫类型 + */ + private Integer spiderType; + + /** + * 爬虫起始时间 + */ + private Date tempendTime; + + /** + * 爬虫终止时间 + */ + private Date tempStartTime; + + /** + * 数据条目创建时间 + */ + private Date createTime; + + /** + * 灾害id,审批通过后生成 + */ + private String vordmId; + + /** + * 灾害响应时间 + */ + private Date respondTime; + + /** + * 灾害申请组织 + */ + private String sponsorOrganization; + + /** + * + */ + private String disasterImg; + + /** + * 字典名称 + */ + private String dictValue; + + /** + * + */ + private Long size; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java index 40caa77..f2f2434 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java @@ -1,22 +1,21 @@ 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.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kening.vordm.entity.*; import com.kening.vordm.service.*; -import com.kening.vordm.vo.DisasterMangerInfo; +import com.kening.vordm.vo.DisasterInfoVo; import com.kening.vordm.vo.GroupByUse; import com.kening.vordm.vo.UserTenantVo; import lombok.RequiredArgsConstructor; -import org.springblade.core.mp.support.BladePage; 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.*; -import java.util.ArrayList; +import java.time.LocalDate; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -32,9 +31,7 @@ public class DisasterInfoController { private final NewsService newsService; private final PictureInfoService pictureInfoService; - - //下载次数记录 - private final DownloadRecordService downloadRecordService; + private final DisasterInfoVoService disasterInfoVoService; /** * 首页数据，轮播和定位相关 @@ -49,22 +46,8 @@ public class DisasterInfoController { @GetMapping("/getPicInfoByDisasterId") public R> getPicInfoByDisasterInfoId(Long disasterId){ return R.data(pictureInfoService.list(Wrappers.lambdaQuery() - .eq(PictureInfo::getDisasterId,disasterId))); - } - - /** - * 灾害查询条件，时间，类型，灾害联动 - * @param disasterInfo - * @return - */ - @GetMapping("/selectCondition") - public R> getSelectCondition1(DisasterInfo disasterInfo){ - String disaster_time=null; - if (disasterInfo.getDisasterTime()!=null){ - disaster_time=disasterInfo.getDisasterTime().toString(); - } - return R.data(disasterInfoService.getConditionData(disasterInfo.getDisasterType(),disasterInfo.getDisasterCountry(),disaster_time,disasterInfo.getName() - )); + .eq(PictureInfo::getDisasterId,disasterId) + .eq(PictureInfo::getIsMain, 1))); } /** @@ -75,6 +58,26 @@ public class DisasterInfoController { */ @GetMapping("/select-condition") public R> getSelectCondition(DisasterInfo disasterInfo) { + //String dateType = String.valueOf(params.get("dateTyle")); + // LocalDate date = LocalDate.now(); + // if(StringUtils.isNotBlank(dateType)){ + // switch (dateType){ + // case "1" : + // //Latest week 上一周 + // date = LocalDate.now().minusWeeks(1); + // break; + // case "2": + // //Latest month 上一个月 + // date = LocalDate.now().minusMonths(1); + // break; + // case "3": + // //Latest six month 上6个月 + // date = LocalDate.now().minusMonths(6); + // break; + // default: + // break; + // } + // } String disaster_time = null; if (disasterInfo.getDisasterTime() != null) { disaster_time = disasterInfo.getDisasterTime().toString(); @@ -84,19 +87,7 @@ public class DisasterInfoController { } - /** - * 指定条件返回数据 - * - * @param query - * @param disasterInfo - * @return - */ - @GetMapping("/test") - public R> getdata(Query query, DisasterInfo disasterInfo) { - List disasterIds = disasterInfoService.getDisasterId(disasterInfo); - return R.data(newsService.page(Condition.getPage(query), new QueryWrapper().in("disaster_id", disasterIds))); - } /** * 灾害信息统计 国家/灾害类型 左边栏 @@ -125,7 +116,6 @@ public class DisasterInfoController { // }else{ // groupByUseList = disasterInfoService.getDisasterStatistics(name); // } - return R.data(dataMap); } @@ -133,15 +123,22 @@ public class DisasterInfoController { * 首页数据展示，包括响应中和未响应 * * @param query - * @param respondStatus * @return */ @GetMapping("/homeDisasterInfo") - public R> gethomeDisasterInfo(Query query, Integer respondStatus) { - IPage pages = disasterInfoService.getHomeDisaster(Condition.getPage(query), respondStatus); - return R.data(BladePage.of(pages)); + public R> gethomeDisasterInfo(Query query, @RequestParam Map params) { + return R.data(disasterInfoVoService.page(Condition.getPage(query),Wrappers.lambdaQuery() + .eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus"))) + .ge(StringUtils.isNotBlank(String.valueOf(params.get("startTime"))),DisasterInfoVo::getDisasterTime,LocalDate.parse(String.valueOf(params.get("startTime")))) + .le(StringUtils.isNotBlank(String.valueOf(params.get("endTime"))),DisasterInfoVo::getDisasterTime,LocalDate.parse(String.valueOf(params.get("endTime")))) + .eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))),DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType"))) + .orderByDesc(DisasterInfoVo::getDisasterTime) + )); } + public static void main(String[] args) { + System.out.println(LocalDate.now().minusMonths(6).toString()); + } /** * 获取债害详情信息 * 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 ddda48c..5b887ea 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 @@ -78,7 +78,7 @@