From 2bb3d1eed9334a286998fea53aaca80975b17e2f Mon Sep 17 00:00:00 2001 From: glj <管理局23456> Date: Fri, 7 Apr 2023 18:13:22 +0800 Subject: [PATCH 01/19] =?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 --- .../com/kening/vordm/entity/DisasterInfo.java | 5 + .../com/kening/vordm/vo/EntityDataUserVo.java | 124 ++++++++++++++++++ .../controller/DisasterInfoController.java | 14 +- .../controller/EntityDataController.java | 29 +++- .../vordm/mapper/DisasterInfoMapper.xml | 3 +- .../kening/vordm/mapper/EntityDataMapper.java | 9 +- .../kening/vordm/mapper/EntityDataMapper.xml | 8 +- .../vordm/service/EntityDataService.java | 15 +++ .../service/impl/EntityDataServiceImpl.java | 63 ++++++++- 9 files changed, 247 insertions(+), 23 deletions(-) create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java index 56b5a90..201e02e 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java @@ -67,6 +67,11 @@ public class DisasterInfo implements Serializable { */ private Integer visitCount; + /** + * 本灾害的数据下载次数 + */ + private Integer downloadCount; + /** * 爬虫类型 */ diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java new file mode 100644 index 0000000..5ecbcd1 --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java @@ -0,0 +1,124 @@ +package com.kening.vordm.vo; + +import lombok.Data; + +import java.util.Date; + +@Data +public class EntityDataUserVo { + + /** + * 数据名称 + */ + private String title; + + /** + * 数据产品的大小（byte） + */ + private Long size; + + /** + * 数据类型（0-基础数据，1-减灾产品，2-制图产品） + */ + private String type; + + /** + * 数据下载链接（网站上，对象存储路径） + */ + private String link; + + /** + * 数据备注 + */ + private String remark; + + /** + * 上传时间 + */ + private Date uploadTime; + + /** + * 灾害id + */ + private Long disasterId; + + /** + * 可视化可视化标志0-不可可视化；1-表示可以可视化 + */ + private Integer visualFlag; + + /** + * 可视化跳转中心经度 + */ + private Double visualLon; + + /** + * 可视化跳转中心纬度 + */ + private Double visualLat; + + /** + * 审核时间 + */ + private Date examTime; + + /** + * 0 未审核，1-审核已通过，2-审核未通过 + */ + private Integer status; + + /** + * 上传人 + */ + private Long uploaderId; + + /** + * 管理人/审核人 + */ + private Long managerId; + + /** + * 审核时间 + */ + private Date reviewTime; + + /** + * 来源机构 + */ + private String sourceOrganization; + + /** + * 用户名称 + */ + private String username; + + /** + * 用户邮件 + */ + private String email; + + /** + * 用户组织机构 + */ + private String organization; + + /** + * 研究范围 + */ + private String researchField; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 是否是管理员 + */ + private Integer isManage; + + /** + * 验证码 + */ + private Integer Verification; +} 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 2778cd5..6865ec3 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 @@ -117,16 +117,10 @@ public class DisasterInfoController { */ @PostMapping("/saveDownloadRecord") public R saveDownloadRecord(@RequestBody DownloadRecord downloadRecord) { - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(DownloadRecord::getBigType, downloadRecord.getBigType()); - qw.eq(DownloadRecord::getSmallType, downloadRecord.getSmallType()); - qw.eq(DownloadRecord::getDiasterId, downloadRecord.getDiasterId()); - DownloadRecord one = downloadRecordService.getOne(qw); - if (one != null) { - one.setCount(one.getCount() + 1); - downloadRecordService.updateById(one); - } else { - downloadRecordService.save(downloadRecord); + DisasterInfo byId = disasterInfoService.getById(downloadRecord.getDiasterId()); + if (byId != null) { + byId.setDownloadCount(byId.getDownloadCount() +1); + disasterInfoService.updateById(byId); } return R.status(true); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java index 23bcfa8..3fea077 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java @@ -3,13 +3,15 @@ package com.kening.vordm.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kening.vordm.entity.EntityData; import com.kening.vordm.service.EntityDataService; +import com.kening.vordm.vo.EntityDataUserVo; +import com.kening.vordm.vo.UserTenantVo; 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; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @RestController @RequiredArgsConstructor @@ -17,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; public class EntityDataController { //实体数据服务层 - private final EntityDataService respondInfoService; + private final EntityDataService entityDataService; /** * 实体数据列表信息 @@ -27,9 +29,26 @@ public class EntityDataController { */ @GetMapping("/getList") public R> getEntityDataList(EntityData entityData, Query query) { - return R.data(respondInfoService.getEntityDataList(Condition.getPage(query), entityData)); + return R.data(entityDataService.getEntityDataList(Condition.getPage(query), entityData)); + } + + /** + * 获取所以不可可视化下机构信息 + * @return + */ + @GetMapping("/getEntityDataSourceOrganization") + public R> getEntityDataSourceOrganization() { + return R.data(entityDataService.getEntityDataSourceOrganization()); } + /** + * Resource upload 上传实体信息 + * @return + */ + @PostMapping("/saveEntityData") + public R saveEntityData(@RequestBody EntityDataUserVo entityDataUserVo) { + return R.data(entityDataService.saveEntityData(entityDataUserVo)); + } } 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 26f709c..f78e524 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 @@ -15,6 +15,7 @@ + @@ -29,7 +30,7 @@ di.disaster_level,di.disaster_country,di.respond_status, di.visit_count,di.spider_type,di.tempend_time, di.temp_start_time,di.create_time,di.vordm_id, - di.respond_time + di.respond_time,di.download_count d.disaster_type,d.disaster_time,d.disaster_country, diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.java index 488cd20..6c1df2c 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.java @@ -4,8 +4,11 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kening.vordm.entity.EntityData; +import com.kening.vordm.vo.UserTenantVo; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author G1393 * @description 针对表【entity_data(其他上传的实体数据)】的数据库操作Mapper @@ -16,6 +19,8 @@ public interface EntityDataMapper extends BaseMapper { IPage getEntityDataList(@Param("entityData") EntityData entityData, IPage page); - - + + + List getEntityDataSourceOrganization(); + } 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 7c9edc2..a746ff1 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 @@ -44,7 +44,7 @@ and ed.status = #{entityData.status} - + and ed.visual_flag = #{entityData.visualFlag} @@ -56,4 +56,10 @@ ORDER BY ed.upload_time DESC + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EntityDataService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EntityDataService.java index e191f4c..ccdc4f4 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EntityDataService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EntityDataService.java @@ -4,6 +4,10 @@ package com.kening.vordm.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.EntityData; +import com.kening.vordm.vo.EntityDataUserVo; +import com.kening.vordm.vo.UserTenantVo; + +import java.util.List; /** * @author G1393 @@ -14,4 +18,15 @@ public interface EntityDataService extends IService { IPage getEntityDataList(IPage page, EntityData entityData); + /** + * 获取所以不可可视化下机构信息 + * @return + */ + List getEntityDataSourceOrganization(); + + /** + * Resource upload 上传实体信息 + * @return + */ + Boolean saveEntityData(EntityDataUserVo entityDataUserVo); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java index 7b28175..4cbad72 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java @@ -1,16 +1,20 @@ package com.kening.vordm.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kening.vordm.entity.EntityData; +import com.kening.vordm.entity.GuestInfo; import com.kening.vordm.mapper.EntityDataMapper; +import com.kening.vordm.mapper.GuestInfoMapper; import com.kening.vordm.service.EntityDataService; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.CollectionUtil; +import com.kening.vordm.vo.EntityDataUserVo; +import com.kening.vordm.vo.UserTenantVo; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; +import java.util.Date; import java.util.List; /** @@ -18,14 +22,65 @@ import java.util.List; * @description 针对表【entity_data(其他上传的实体数据)】的数据库操作Service实现 * @createDate 2023-04-04 15:54:30 */ +@Slf4j @Service +@AllArgsConstructor public class EntityDataServiceImpl extends ServiceImpl implements EntityDataService { + private GuestInfoMapper guestInfoMapper; + @Override public IPage getEntityDataList(IPage page, EntityData entityData) { return this.baseMapper.getEntityDataList(entityData, page); } + /** + * 获取所以不可可视化下机构信息 + * @return + */ + @Override + public List getEntityDataSourceOrganization() { + return this.baseMapper.getEntityDataSourceOrganization(); + } + + @Override + public Boolean saveEntityData(EntityDataUserVo entityDataUserVo) { + //创建实体数据 + EntityData entityData = new EntityData(); + + //判断上传用户是否存在 + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + qw.eq(GuestInfo::getEmail,entityDataUserVo.getEmail()); + GuestInfo guestInfo1 = guestInfoMapper.selectOne(qw); + if (guestInfo1==null){ + GuestInfo guestInfo = new GuestInfo(); + guestInfo.setEmail(entityDataUserVo.getEmail()); + guestInfo.setOrganization(entityDataUserVo.getOrganization()); + guestInfo.setIsManage(entityDataUserVo.getIsManage()); + guestInfo.setResearchField(entityDataUserVo.getResearchField()); + guestInfo.setUsername(entityDataUserVo.getUsername()); + guestInfo.setCreateTime(new Date()); + guestInfoMapper.insert(guestInfo); + entityData.setUploaderId(guestInfo.getId()); + }else { + entityData.setUploaderId(guestInfo1.getId()); + } + + //实体数据 + entityData.setTitle(entityDataUserVo.getTitle()); + entityData.setSize(entityDataUserVo.getSize()); + entityData.setLink(entityDataUserVo.getLink()); + entityData.setDisasterId(entityDataUserVo.getDisasterId()); + entityData.setUploaderId(entityDataUserVo.getUploaderId()); + entityData.setUploadTime(new Date()); + entityData.setSourceOrganization(entityDataUserVo.getOrganization()); + this.baseMapper.insert(entityData); + + + + return null; + } + } From c9c43b1a9320ba627bcb46d347c9136b4ea08ed6 Mon Sep 17 00:00:00 2001 From: why <986973311@qq.com> Date: Fri, 7 Apr 2023 18:42:48 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DisasterInfoController.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) 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 ec424fc..0a20ecd 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 @@ -2,10 +2,13 @@ package com.kening.vordm.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kening.vordm.entity.DisasterInfo; import com.kening.vordm.entity.News; +import com.kening.vordm.entity.PictureInfo; import com.kening.vordm.service.DisasterInfoService; import com.kening.vordm.service.NewsService; +import com.kening.vordm.service.PictureInfoService; import com.kening.vordm.vo.DisasterMangerInfo; import com.kening.vordm.vo.GroupByUse; import lombok.RequiredArgsConstructor; @@ -26,7 +29,38 @@ public class DisasterInfoController { private final DisasterInfoService disasterInfoService; private final NewsService newsService; + private final PictureInfoService pictureInfoService; + /** + * 首页数据，轮播和定位相关 + * @return + */ + @GetMapping("/indexData") + public R> indexData(){ + return R.data(disasterInfoService.list(Wrappers.lambdaQuery() + .eq(DisasterInfo::getRespondStatus,2))); + } + + @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() + )); + } /** * 灾害查询条件，时间，类型，灾害联动 From ad5de299c6aacd7e6273917e27a07c79987cfad8 Mon Sep 17 00:00:00 2001 From: glj <管理局23456> Date: Sat, 8 Apr 2023 14:49:34 +0800 Subject: [PATCH 03/19] =?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 --- .../com/kening/vordm/entity/DisasterInfo.java | 1 - .../com/kening/vordm/entity/GuestInfo.java | 10 +++++++++ .../vordm/entity/GuestManageDisasterRef.java | 5 +++++ .../com/kening/vordm/vo/EntityDataUserVo.java | 10 +++++++++ .../vordm/mapper/DisasterInfoMapper.xml | 3 ++- .../kening/vordm/mapper/GuestInfoMapper.xml | 22 ++++++++++--------- .../mapper/GuestManageDisasterRefMapper.xml | 3 ++- .../service/impl/EntityDataServiceImpl.java | 16 ++++++-------- 8 files changed, 48 insertions(+), 22 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java index 201e02e..09a382a 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java @@ -114,7 +114,6 @@ public class DisasterInfo implements Serializable { /** * 发起机构 */ - @TableField(exist = false) private String sponsorOrganization; /** diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestInfo.java index 405bf9d..3c7a47e 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestInfo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestInfo.java @@ -51,6 +51,16 @@ public class GuestInfo implements Serializable { */ private Integer isManage; + /** + * 职业 + */ + private String occupation; + + /** + * 职称 + */ + private String professionalTitle; + @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/GuestManageDisasterRef.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestManageDisasterRef.java index a77d85b..b75f64a 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestManageDisasterRef.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestManageDisasterRef.java @@ -40,6 +40,11 @@ public class GuestManageDisasterRef implements Serializable { */ private Long disasterId; + /** + * 灾害id + */ + private String responseOrganization; + @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java index 5ecbcd1..9828532 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java @@ -121,4 +121,14 @@ public class EntityDataUserVo { * 验证码 */ private Integer Verification; + + /** + * 职业 + */ + private String occupation; + + /** + * 职称 + */ + private String professionalTitle; } 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 f78e524..0db5224 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 @@ -22,6 +22,7 @@ + @@ -30,7 +31,7 @@ di.disaster_level,di.disaster_country,di.respond_status, di.visit_count,di.spider_type,di.tempend_time, di.temp_start_time,di.create_time,di.vordm_id, - di.respond_time,di.download_count + di.respond_time,di.download_count,di.sponsor_organization d.disaster_type,d.disaster_time,d.disaster_country, diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml index 6dcedb9..a0b1982 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml @@ -1,22 +1,24 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - + + + + + + + + + id,username,email, organization,research_field,create_time, - is_manage + is_manage,occupation,professional_title diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml index 7b1106c..c24283a 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml @@ -10,10 +10,11 @@ + id,sponsor_id,uploader_id, - manager_id,disaster_id + manager_id,disaster_id,response_organization diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java index 4cbad72..1424673 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java @@ -37,6 +37,7 @@ public class EntityDataServiceImpl extends ServiceImpl qw = new LambdaQueryWrapper<>(); - qw.eq(GuestInfo::getEmail,entityDataUserVo.getEmail()); + qw.eq(GuestInfo::getEmail, entityDataUserVo.getEmail()); GuestInfo guestInfo1 = guestInfoMapper.selectOne(qw); - if (guestInfo1==null){ + if (guestInfo1 == null) { GuestInfo guestInfo = new GuestInfo(); guestInfo.setEmail(entityDataUserVo.getEmail()); guestInfo.setOrganization(entityDataUserVo.getOrganization()); @@ -61,9 +62,11 @@ public class EntityDataServiceImpl extends ServiceImpl1; } From 715fceb0426a47bed9a6c3e803c828f99b7be624 Mon Sep 17 00:00:00 2001 From: glj <管理局23456> Date: Sat, 8 Apr 2023 14:52:17 +0800 Subject: [PATCH 04/19] =?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 --- .../com/kening/vordm/service/impl/EntityDataServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java index 1424673..c998f37 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java @@ -76,6 +76,7 @@ public class EntityDataServiceImpl extends ServiceImpl1; } From d8846d48267cdb93b12be258367ab41a2e7113c5 Mon Sep 17 00:00:00 2001 From: why <986973311@qq.com> Date: Sat, 8 Apr 2023 15:11:47 +0800 Subject: [PATCH 05/19] 1 --- .../com/kening/vordm/controller/DisasterInfoController.java | 1 + .../java/com/kening/vordm/mapper/DisasterInfoMapper.java | 1 + .../java/com/kening/vordm/mapper/DisasterInfoMapper.xml | 3 +++ .../java/com/kening/vordm/service/DisasterInfoService.java | 2 ++ .../kening/vordm/service/impl/DisasterInfoServiceImpl.java | 6 ++++++ 5 files changed, 13 insertions(+) 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 0a20ecd..7379cec 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 @@ -98,6 +98,7 @@ public class DisasterInfoController { */ @GetMapping("/disasterStatistics") public R> getDisasterStatistics(String name){ + //List groupByUseList = disasterInfoService.getLeftData(); return R.data(disasterInfoService.getDisasterStatistics(name)); } 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 856b75b..34f478e 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 @@ -34,4 +34,5 @@ public interface DisasterInfoMapper extends BaseMapper { List getDisasterStatistics(@Param("name" ) String name ); + List getLeftData(); } 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 0e6b658..64ca030 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 @@ -75,5 +75,8 @@ where d.respond_status=#{respondStatus} order by d.disaster_time desc + 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 d6c1d84..8ab2372 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 @@ -37,4 +37,6 @@ public interface DisasterInfoService extends IService { IPage getHomeDisaster(IPage page, Integer respondStatus); + + List getLeftData(); } 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 9e8d563..56e4b9e 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 @@ -88,4 +88,10 @@ implements DisasterInfoService { return page.setRecords(disasterMangerInfos); } + @Override + public List getLeftData() { + + return this.baseMapper.getLeftData(); + } + } From 6b34f5cf1874dc9f2a0399ba61136e24cec5c014 Mon Sep 17 00:00:00 2001 From: glj <管理局23456> Date: Mon, 10 Apr 2023 09:22:20 +0800 Subject: [PATCH 06/19] =?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 --- .../java/com/kening/vordm/controller/EntityDataController.java | 2 +- .../com/kening/vordm/service/impl/EntityDataServiceImpl.java | 2 ++ kn-service/kn-setting/pom.xml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java index 3fea077..3704d69 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java @@ -33,7 +33,7 @@ public class EntityDataController { } /** - * 获取所以不可可视化下机构信息 + * 获取所有实体信息下机构信息 * @return */ @GetMapping("/getEntityDataSourceOrganization") diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java index c998f37..9abd656 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java @@ -13,6 +13,7 @@ import com.kening.vordm.vo.UserTenantVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; @@ -46,6 +47,7 @@ public class EntityDataServiceImpl extends ServiceImpl + From ea517025f4c96d7555d4ec4f5e5482880d9af782 Mon Sep 17 00:00:00 2001 From: why <986973311@qq.com> Date: Mon, 10 Apr 2023 09:29:15 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E5=B7=A6=E8=BE=B9=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vordm/controller/DisasterInfoController.java | 14 +++++++++++++- .../kening/vordm/mapper/DisasterInfoMapper.java | 4 +++- .../com/kening/vordm/mapper/DisasterInfoMapper.xml | 10 ++++++---- .../kening/vordm/service/DisasterInfoService.java | 4 +++- .../service/impl/DisasterInfoServiceImpl.java | 12 +++++++++++- 5 files changed, 36 insertions(+), 8 deletions(-) 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 f36c883..4e563b1 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 @@ -16,6 +16,7 @@ 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.util.List; @RestController @@ -103,7 +104,18 @@ public class DisasterInfoController { */ @GetMapping("/disasterStatistics") public R> getDisasterStatistics(String name) { - return R.data(disasterInfoService.getDisasterStatistics(name)); + List groupByUseList = new ArrayList<>(); + if("searchSponsorOrganization".equals(name)){ + //发起机构方法 第三个左边栏 + groupByUseList = disasterInfoService.getLeft3Data(); + } else if ("searchResponseOrganization".equals(name)) { + //发起机构方法 第四个左边栏 + groupByUseList = disasterInfoService.getLeft4Data(); + }else{ + groupByUseList = disasterInfoService.getDisasterStatistics(name); + } + + return R.data(groupByUseList); } /** 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 ba73038..24125aa 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 @@ -37,5 +37,7 @@ public interface DisasterInfoMapper extends BaseMapper { List getAllUser(); - List getLeftData(); + List getLeft3Data(); + + List getLeft4Data(); } 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 484539d..f9e2fd5 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 @@ -84,10 +84,6 @@ where d.respond_status=#{respondStatus} order by d.disaster_time desc - - + + 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 b76bfef..4c897f3 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 @@ -43,5 +43,7 @@ public interface DisasterInfoService extends IService { List getAllUser(); - List getLeftData(); + List getLeft3Data(); + + List getLeft4Data(); } 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 6137684..60da78b 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 @@ -94,8 +94,18 @@ implements DisasterInfoService { return this.baseMapper.getAllUser(); } + @Override + public List getLeft3Data() { + return this.baseMapper.getLeft3Data(); + } + + @Override + public List getLeft4Data() { + return this.baseMapper.getLeft4Data(); + } + public List getLeftData() { - return this.baseMapper.getLeftData(); + return this.baseMapper.getLeft4Data(); } } From 71e8901d5509bac1fc3fb5f382e8d27534b0e827 Mon Sep 17 00:00:00 2001 From: glj <管理局23456> Date: Mon, 10 Apr 2023 09:33:48 +0800 Subject: [PATCH 08/19] =?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 --- kn-service/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kn-service/pom.xml b/kn-service/pom.xml index b1d3bac..64e9f95 100644 --- a/kn-service/pom.xml +++ b/kn-service/pom.xml @@ -5,7 +5,7 @@ 4.0.0 biz-vordm - kn-setting + From 1abb487a79c1f2bfb555cf5dbab3e8ca883815b1 Mon Sep 17 00:00:00 2001 From: glj <管理局23456> Date: Mon, 10 Apr 2023 09:51:54 +0800 Subject: [PATCH 09/19] =?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 --- .../src/main/java/com/kening/vordm/vo/DisasterMangerInfo.java | 2 ++ .../main/java/com/kening/vordm/controller/ToolController.java | 2 +- .../main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterMangerInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterMangerInfo.java index 584aaa7..d9f5d92 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterMangerInfo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterMangerInfo.java @@ -1,7 +1,9 @@ package com.kening.vordm.vo; import com.kening.vordm.entity.DisasterInfo; +import lombok.Data; +@Data public class DisasterMangerInfo extends DisasterInfo { /** * 用户名 diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java index 826ec4f..c80fbbe 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java @@ -21,7 +21,7 @@ import java.util.Arrays; @RestController @AllArgsConstructor -@RequestMapping("/tool") +@RequestMapping("/ui/tool") public class ToolController{ private ToolService toolService; @ApiOperationSupport(order = 1) 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 f9e2fd5..8e5b795 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 @@ -84,6 +84,7 @@ where d.respond_status=#{respondStatus} order by d.disaster_time desc + + + 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 4c897f3..323dbe7 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 @@ -46,4 +46,8 @@ public interface DisasterInfoService extends IService { List getLeft3Data(); List getLeft4Data(); + + List getLeft1Data(); + + List getLeft2Data(); } 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 60da78b..0037b1e 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 @@ -104,8 +104,15 @@ implements DisasterInfoService { return this.baseMapper.getLeft4Data(); } - public List getLeftData() { - return this.baseMapper.getLeft4Data(); + @Override + public List getLeft1Data() { + return this.baseMapper.getLeft1Data(); } + @Override + public List getLeft2Data() { + return this.baseMapper.getLeft2Data(); + } + + } From 7cadff6440d34c893dd515429bf84f7164b60f4b Mon Sep 17 00:00:00 2001 From: qqGroup0 <253114712@qq.com> Date: Tue, 11 Apr 2023 00:04:19 +0800 Subject: [PATCH 13/19] =?UTF-8?q?zqq:=E9=81=A5=E6=84=9F=E5=BD=B1=E5=83=8F?= =?UTF-8?q?=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DisasterInfoController.java | 11 +++++---- .../RemoteSensingSourceDataController.java | 24 +++++++++++++++++++ .../vordm/mapper/DisasterInfoMapper.xml | 2 +- .../mapper/RemoteSensingSourceDataMapper.java | 6 +++++ .../mapper/RemoteSensingSourceDataMapper.xml | 18 ++++++++++++++ .../RemoteSensingSourceDataService.java | 5 ++++ .../service/impl/DisasterInfoServiceImpl.java | 7 +++--- .../RemoteSensingSourceDataServiceImpl.java | 7 ++++++ .../src/main/resources/application-dev.yml | 6 ++--- 9 files changed, 74 insertions(+), 12 deletions(-) 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 32296c9..afd41a7 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 @@ -17,6 +17,7 @@ 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.springblade.core.tool.utils.DateUtil; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -64,11 +65,11 @@ public class DisasterInfoController { */ @GetMapping("/selectCondition") public R> getSelectCondition1(DisasterInfo disasterInfo){ - String disaster_time=null; - if (disasterInfo.getDisasterTime()!=null){ - disaster_time=disasterInfo.getDisasterTime().toString(); + 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() + return R.data(disasterInfoService.getConditionData(disasterInfo.getDisasterType(), disasterInfo.getDisasterCountry(), disaster_time, disasterInfo.getName() )); } @@ -82,7 +83,7 @@ public class DisasterInfoController { public R> getSelectCondition(DisasterInfo disasterInfo) { String disaster_time = null; if (disasterInfo.getDisasterTime() != null) { - disaster_time = disasterInfo.getDisasterTime().toString(); + disaster_time = DateUtil.format(disasterInfo.getDisasterTime(),"yyyy-MM-dd"); } return R.data(disasterInfoService.getConditionData(disasterInfo.getDisasterType(), disasterInfo.getDisasterCountry(), disaster_time, disasterInfo.getName() )); diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java index fcd7ef3..5cac6b8 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java @@ -3,13 +3,16 @@ package com.kening.vordm.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kening.vordm.entity.DisasterInfo; +import com.kening.vordm.entity.EntityData; import com.kening.vordm.entity.RemoteSensingSourceData; import com.kening.vordm.service.DisasterInfoService; import com.kening.vordm.service.RemoteSensingSourceDataService; +import com.kening.vordm.vo.GroupByUse; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -37,4 +40,25 @@ public class RemoteSensingSourceDataController { return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),new QueryWrapper().in("disaster_id",disasterIds))); } + /** + * 实体数据列表信息 + * @param remoteSensingSourceData 实体数据条件信息 + * @param query current当前页 size 每页数据量 + * @return + */ + @GetMapping("/Condition") + public R> getRemoteSensingSourceDataByCondition(RemoteSensingSourceData remoteSensingSourceData, Query query) { + return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByCondition(Condition.getPage(query), remoteSensingSourceData)); + } + +// /** +// * 根据页码和灾害信息查出遥感影像源数据，可多个灾害 +// * @param remoteSensingSourceData +// * @param query +// * @return +// */ +// @GetMapping("/Condition1") +// public R> getRemoteSensingSourceDataByCondition(RemoteSensingSourceData remoteSensingSourceData, Query query){ +// return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),Condition.getQueryWrapper(remoteSensingSourceData))); +// } } 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 8e5b795..004474e 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 @@ -62,7 +62,7 @@ from disaster_info where - disaster_type=#{disaster_type} + disaster_type like concat('%',#{disaster_type},'%') and disaster_country like concat('%',#{disaster_country},'%') and diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.java index aa73221..a899ac1 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.java @@ -2,7 +2,10 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kening.vordm.entity.EntityData; import com.kening.vordm.entity.RemoteSensingSourceData; +import com.kening.vordm.vo.GroupByUse; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,4 +19,7 @@ import java.util.List; public interface RemoteSensingSourceDataMapper extends BaseMapper { List getRemoteSensingSourceData(@Param("disasterType") String disasterType,@Param("disasterCountry") String disasterCountry,@Param("disasterTime") String disasterTime); + + IPage getRemoteSensingSourceDataByCondition(@Param("remoteSensingSourceData") RemoteSensingSourceData remoteSensingSourceData, IPage page); + } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml index cc3b4c6..c09eb88 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml @@ -62,4 +62,22 @@ AND d.disaster_country = #{disasterCountry} AND d.disaster_time = #{disasterTime} + + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RemoteSensingSourceDataService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RemoteSensingSourceDataService.java index bf7c2bc..04385ca 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RemoteSensingSourceDataService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RemoteSensingSourceDataService.java @@ -1,8 +1,11 @@ package com.kening.vordm.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.kening.vordm.entity.EntityData; import com.kening.vordm.entity.RemoteSensingSourceData; +import com.kening.vordm.vo.GroupByUse; import org.springframework.stereotype.Service; import java.util.List; @@ -15,4 +18,6 @@ import java.util.List; public interface RemoteSensingSourceDataService extends IService { List getRemoteSensingSourceData(String disasterType,String disasterCountry, String disasterTime); + IPage getRemoteSensingSourceDataByCondition(IPage page, RemoteSensingSourceData remoteSensingSourceData); + } 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 60da78b..8299d2a 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 @@ -46,13 +46,13 @@ implements DisasterInfoService { public List getDisasterId(DisasterInfo disasterInfo){ QueryWrapper qw = new QueryWrapper<>(); if (disasterInfo.getDisasterType()!=null){ - qw.like("disaster_type",disasterInfo.getDisasterType()); + qw.eq("disaster_type",disasterInfo.getDisasterType()); } if (disasterInfo.getDisasterCountry()!=null){ - qw.like("disaster_country",disasterInfo.getDisasterCountry()); + qw.eq("disaster_country",disasterInfo.getDisasterCountry()); } if (disasterInfo.getDisasterTime()!=null){ - qw.like("disaster_time",disasterInfo.getDisasterTime()); + qw.eq("disaster_time",disasterInfo.getDisasterTime()); } List disasterInfos = this.baseMapper.selectList(qw); if (!disasterInfos.isEmpty()){ @@ -63,6 +63,7 @@ implements DisasterInfoService { return ids; } return null; +// return new ArrayList<>(); } /** diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java index 2f289a2..701666d 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java @@ -1,9 +1,12 @@ 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.EntityData; import com.kening.vordm.entity.RemoteSensingSourceData; import com.kening.vordm.mapper.RemoteSensingSourceDataMapper; import com.kening.vordm.service.RemoteSensingSourceDataService; +import com.kening.vordm.vo.GroupByUse; import org.springframework.stereotype.Service; import java.util.List; @@ -22,4 +25,8 @@ implements RemoteSensingSourceDataService { return this.baseMapper.getRemoteSensingSourceData(disasterType, disasterCountry, disasterTime); } + @Override + public IPage getRemoteSensingSourceDataByCondition(IPage page, RemoteSensingSourceData remoteSensingSourceData) { + return this.baseMapper.getRemoteSensingSourceDataByCondition(remoteSensingSourceData, page); + } } diff --git a/kn-service/biz-vordm/src/main/resources/application-dev.yml b/kn-service/biz-vordm/src/main/resources/application-dev.yml index 3aef9ec..c447108 100644 --- a/kn-service/biz-vordm/src/main/resources/application-dev.yml +++ b/kn-service/biz-vordm/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ spring: datasource: - url: ${kn.datasource.vordm.url} - username: ${kn.datasource.vordm.username} - password: ${kn.datasource.vordm.password} + url: ${blade.datasource.dev.url} + username: ${blade.datasource.dev.username} + password: ${blade.datasource.dev.password} From b23d0eb50025e98d24fb66ef85fd414914b471cc Mon Sep 17 00:00:00 2001 From: glj <管理局23456> Date: Tue, 11 Apr 2023 08:51:29 +0800 Subject: [PATCH 14/19] =?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 --- .../com/kening/vordm/vo/EntityDataUserVo.java | 12 +++++ .../main/java/com/kening/vordm/vo/FileVo.java | 20 ++++++++ .../vordm/controller/CaptchaController.java | 41 +++++++++++++++ .../controller/EntityDataController.java | 2 +- .../vordm/controller/FileController.java | 50 +++++++++++++++++++ .../RemoteSensingSourceDataController.java | 5 +- .../service/impl/DisasterInfoServiceImpl.java | 12 ++--- .../service/impl/EntityDataServiceImpl.java | 25 ++++++++++ .../src/main/java/mapper/ContactMapper.xml | 19 ------- kn-service/pom.xml | 19 +++++++ 10 files changed, 178 insertions(+), 27 deletions(-) create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/FileVo.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CaptchaController.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/FileController.java delete mode 100644 kn-service/biz-vordm/src/main/java/mapper/ContactMapper.xml diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java index 9828532..f7de346 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java @@ -1,8 +1,10 @@ package com.kening.vordm.vo; import lombok.Data; +import org.springframework.web.multipart.MultipartFile; import java.util.Date; +import java.util.List; @Data public class EntityDataUserVo { @@ -131,4 +133,14 @@ public class EntityDataUserVo { * 职称 */ private String professionalTitle; + + /** + * 职称 + */ + private String key; + + /** + * 文件信息 + */ + private List filesArray; } diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/FileVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/FileVo.java new file mode 100644 index 0000000..4aaeeda --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/FileVo.java @@ -0,0 +1,20 @@ +package com.kening.vordm.vo; + +import lombok.Data; + +@Data +public class FileVo { + + //文件大小 + private Long fileSize; + + //获取文件类型 + private String fileType; + + //文件后缀 + private String fileSuffix; + + //文件存储路径 + private String link; + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CaptchaController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CaptchaController.java new file mode 100644 index 0000000..8f63236 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CaptchaController.java @@ -0,0 +1,41 @@ +package com.kening.vordm.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springblade.common.cache.CacheNames; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.redis.cache.BladeRedis; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.StringUtil; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author wanghongqing + * @date 2023/3/31 11:10 + **/ +@RestController +@RequestMapping("/captcha") +@RequiredArgsConstructor +@Api(value = "验证码校验接口", tags = "验证码校验") +public class CaptchaController extends BladeController { + + private final BladeRedis bladeRedis; + + + @PostMapping("/validate") + @ApiOperation(value = "验证码校验", notes = "传入需要校验的验证码以及缓存Key") + public R validDefaultTime(@RequestParam String code, @RequestParam String key) { + // 获取验证码 + String redisCode = bladeRedis.get(CacheNames.CAPTCHA_KEY + key); + // 判断验证码 + if (code == null || !StringUtil.equalsIgnoreCase(redisCode, code)) { + return R.fail(1404, "Verification code error"); + } + return R.success("OK"); + } + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java index 3704d69..172628f 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java @@ -47,7 +47,7 @@ public class EntityDataController { * @return */ @PostMapping("/saveEntityData") - public R saveEntityData(@RequestBody EntityDataUserVo entityDataUserVo) { + public R saveEntityData(EntityDataUserVo entityDataUserVo) { return R.data(entityDataService.saveEntityData(entityDataUserVo)); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/FileController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/FileController.java new file mode 100644 index 0000000..f91b254 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/FileController.java @@ -0,0 +1,50 @@ +package com.kening.vordm.controller; + +import cn.hutool.core.date.DateUtil; +import com.kening.vordm.vo.FileVo; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.oss.MinioTemplate; +import org.springblade.core.oss.model.BladeFile; +import org.springblade.core.tool.api.R; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +@RequestMapping("/ui/upload") +@RestController +@Slf4j +public class FileController { + + + /** + * 对象存储模块 + */ + @Autowired + private MinioTemplate minioTemplate; + + /** + * 上传文件 + * @param file + * @return + */ + @PostMapping("/uploadFile") + public R upload(MultipartFile file){ + BladeFile bladeFile = minioTemplate.putFile(file); + //获取文件大小 + Long fileSize = file.getSize(); + //获取文件类型 + String fileType = file.getContentType(); + //文件后缀 + String fileSuffix = file.getOriginalFilename(); + //文件存储路径 + String link = bladeFile.getLink(); + FileVo fileVo = new FileVo(); + fileVo.setFileSize(fileSize); + fileVo.setFileType(fileType); + fileVo.setFileSuffix(fileSuffix); + fileVo.setLink(link); + return R.data(bladeFile); + } +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java index fcd7ef3..d84193d 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java @@ -33,7 +33,10 @@ public class RemoteSensingSourceDataController { */ @GetMapping("/SourceData") public R> getRemoteSensingSourceData(DisasterInfo disasterInfo, Query query){ - List disasterIds=disasterInfoService.getDisasterId(disasterInfo); + List disasterIds = disasterInfoService.getDisasterId(disasterInfo); + if (disasterIds.isEmpty()){ + return R.data(null); + } return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),new QueryWrapper().in("disaster_id",disasterIds))); } 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 60da78b..75e76ec 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 @@ -46,23 +46,23 @@ implements DisasterInfoService { public List getDisasterId(DisasterInfo disasterInfo){ QueryWrapper qw = new QueryWrapper<>(); if (disasterInfo.getDisasterType()!=null){ - qw.like("disaster_type",disasterInfo.getDisasterType()); + qw.eq("disaster_type",disasterInfo.getDisasterType()); } if (disasterInfo.getDisasterCountry()!=null){ - qw.like("disaster_country",disasterInfo.getDisasterCountry()); + qw.eq("disaster_country",disasterInfo.getDisasterCountry()); } if (disasterInfo.getDisasterTime()!=null){ - qw.like("disaster_time",disasterInfo.getDisasterTime()); + qw.eq("disaster_time",disasterInfo.getDisasterTime()); } List disasterInfos = this.baseMapper.selectList(qw); + List ids = new ArrayList<>(); if (!disasterInfos.isEmpty()){ - List ids = new ArrayList<>(); disasterInfos.stream().forEach(disasterInfo1 -> { - ids.add(disasterInfo1.getId()); + ids .add(disasterInfo1.getId()); }); return ids; } - return null; + return ids; } /** diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java index 9abd656..28cbca5 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java @@ -9,12 +9,21 @@ import com.kening.vordm.mapper.EntityDataMapper; import com.kening.vordm.mapper.GuestInfoMapper; import com.kening.vordm.service.EntityDataService; import com.kening.vordm.vo.EntityDataUserVo; +import com.kening.vordm.vo.FileVo; import com.kening.vordm.vo.UserTenantVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.core.oss.MinioTemplate; +import org.springblade.core.oss.model.BladeFile; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; import java.util.Date; import java.util.List; @@ -31,6 +40,11 @@ public class EntityDataServiceImpl extends ServiceImpl getEntityDataList(IPage page, EntityData entityData) { return this.baseMapper.getEntityDataList(entityData, page); @@ -83,5 +97,16 @@ public class EntityDataServiceImpl extends ServiceImpl1; } + public static MultipartFile fileToMultipartFile(File file) { + MultipartFile result = null; + if (null != file) { + try (FileInputStream input = new FileInputStream(file)) { + result = new MockMultipartFile(file.getName().concat("temp"), file.getName(), "text/plain", input); + } catch (IOException e) { + e.printStackTrace(); + } + } + return result; + } } diff --git a/kn-service/biz-vordm/src/main/java/mapper/ContactMapper.xml b/kn-service/biz-vordm/src/main/java/mapper/ContactMapper.xml deleted file mode 100644 index 3f3c255..0000000 --- a/kn-service/biz-vordm/src/main/java/mapper/ContactMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - user_name,email,organization, - message,id - - diff --git a/kn-service/pom.xml b/kn-service/pom.xml index 64e9f95..e7461aa 100644 --- a/kn-service/pom.xml +++ b/kn-service/pom.xml @@ -65,6 +65,25 @@ + + org.springblade + blade-starter-oss + + + esdk-obs-java + com.huaweicloud + + + + + io.minio + minio + + + org.springframework + spring-mock + 2.0.8 + com.alibaba fastjson From 622140bfd4cb29a70d888d6aa9f34f583b6d7f2b Mon Sep 17 00:00:00 2001 From: why <986973311@qq.com> Date: Tue, 11 Apr 2023 09:11:59 +0800 Subject: [PATCH 15/19] 1 --- .../com/kening/vordm/vo/DisasterInfoVo.java | 127 ++++++++++++++++++ .../controller/DisasterInfoController.java | 77 +++++------ .../vordm/mapper/DisasterInfoMapper.xml | 6 +- .../vordm/mapper/DisasterInfoVoMapper.java | 18 +++ .../vordm/service/DisasterInfoVoService.java | 13 ++ .../impl/DisasterInfoVoServiceImpl.java | 22 +++ .../main/java/mapper/DisasterInfoVoMapper.xml | 40 ++++++ 7 files changed, 260 insertions(+), 43 deletions(-) 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/mapper/DisasterInfoVoMapper.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoVoService.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoVoServiceImpl.java create mode 100644 kn-service/biz-vordm/src/main/java/mapper/DisasterInfoVoMapper.xml 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 @@