From f71755741fdf90efaf26876f052204636c95ae2e Mon Sep 17 00:00:00 2001 From: glj Date: Tue, 18 Apr 2023 21:08:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4-glj?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kening/vordm/entity/GuestInfo.java | 10 ++++ .../vordm/entity/RemoteSensingSourceData.java | 5 ++ .../com/kening/vordm/entity/WordCLouds.java | 5 ++ .../com/kening/vordm/entity/WorldCharts.java | 4 ++ .../com/kening/vordm/vo/CallForHelpVo.java | 10 ++++ .../main/java/com/kening/vordm/vo/UserVo.java | 46 +++++++++++++++++++ .../vordm/controller/LoginController.java | 20 ++++++-- .../controller/PictureInfoController.java | 9 ++++ .../vordm/mapper/DisasterInfoMapper.xml | 2 + .../kening/vordm/mapper/GuestInfoMapper.java | 3 ++ .../kening/vordm/mapper/GuestInfoMapper.xml | 13 +++++- .../kening/vordm/mapper/WordCloudsMapper.xml | 4 +- .../vordm/service/DisasterInfoService.java | 5 ++ .../service/impl/DisasterInfoServiceImpl.java | 17 +++++++ 14 files changed, 146 insertions(+), 7 deletions(-) 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 3c7a47e..d4923b2 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 @@ -61,6 +61,16 @@ public class GuestInfo implements Serializable { */ private String professionalTitle; + /** + * 姓 + */ + private String lastName; + + /** + * 名字 + */ + private String firstName; + @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 index cc25f5f..2369735 100644 --- 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 @@ -83,6 +83,11 @@ public class RemoteSensingSourceData implements Serializable { */ private String satelliteCode; + /** + * 卫星类型0-sentinel,1-landset,2-searchone + */ + private String satelliteType; + /** * 接收时间 */ diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordCLouds.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordCLouds.java index 564a23b..4bd0d69 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordCLouds.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordCLouds.java @@ -68,6 +68,11 @@ public class WordCLouds implements Serializable { */ private Integer isDeleted; + /** + * 数据类型，0-twitter ,1-weibo + */ + private Integer type; + @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/WorldCharts.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WorldCharts.java index 18f5527..859c3eb 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WorldCharts.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WorldCharts.java @@ -21,4 +21,8 @@ public class WorldCharts { * 频次 */ private Integer value; + /** + * 频次 + */ + private Integer type; } diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java index 8c6e33a..04abf8c 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java @@ -47,4 +47,14 @@ public class CallForHelpVo extends DisasterInfo { * 创建时间 */ private Date createTime; + + /** + * 姓 + */ + private String lastName; + + /** + * 名字 + */ + private String firstName; } diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java index 032b5e8..f596c27 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java @@ -38,4 +38,50 @@ public class UserVo { */ private String tenantId; + /** + * 用户平台 + */ + private String userType; + + /** + * 账号 + */ + private String account; + + /** + * 昵称 + */ + private String name; + + /** + * 真名 + */ + private String realName; + + /** + * 头像 + */ + private String avatar; + + /** + * 组织机构 + */ + private String organization; + + /** + * 手机 + */ + private String phone; + + /** + * 研究范围 + */ + private String researchField; + + /** + * 职业 + */ + private String occupation; + + } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/LoginController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/LoginController.java index f4d446b..198caf2 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/LoginController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/LoginController.java @@ -5,10 +5,7 @@ import com.kening.vordm.service.EmailService; import com.kening.vordm.vo.UserVo; import lombok.RequiredArgsConstructor; import org.springblade.core.tool.api.R; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.mail.MessagingException; @@ -47,4 +44,19 @@ public class LoginController { public R sendUserPasswordEmail(@RequestBody UserVo userVo) throws MessagingException { return emailService.sendUserPasswordEmail(userVo); } + + /** + * 根据邮箱获取用户信息-游客信息 + * @param email 邮箱 + * @return + */ + @GetMapping("/getUserByEmail") + public R getUserByEmail(String email) { + return R.data(disasterInfoService.getUserByEmail(email)); + } + + @GetMapping("/getBladeUserByEmail") + public R getBladeUserByEmail(String email) { + return R.data(disasterInfoService.getBladeUserByEmail(email)); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/PictureInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/PictureInfoController.java index 56a01cd..7835b40 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/PictureInfoController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/PictureInfoController.java @@ -1,6 +1,7 @@ package com.kening.vordm.controller; import cn.hutool.core.convert.Convert; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kening.vordm.entity.*; @@ -15,6 +16,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; /** @@ -40,6 +42,13 @@ public class PictureInfoController { return R.data(service.page(Condition.getPage(query),Condition.getQueryWrapper(params,PictureInfo.class))); } + @GetMapping("/getPictureInfoByDisasterId") + public R> getPictureInfoByDisasterId(Long disasterId){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PictureInfo::getDisasterId,disasterId); + return R.data(service.list(queryWrapper)); + } + /** * 批量上传 * @return 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 731e3d5..f05f3c8 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 @@ -137,6 +137,8 @@ + select * FROM blade_user + + email = #{email} + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml index 80f883f..75d7d1b 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml @@ -14,6 +14,7 @@ + @@ -25,7 +26,8 @@ select DATE_FORMAT(time,'%Y-%m-%d') date, frequency value, - word name + word name, + type from word_clouds and `status` = 1 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 e72ad83..7bc9d35 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 @@ -4,6 +4,7 @@ package com.kening.vordm.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.DisasterInfo; +import com.kening.vordm.entity.GuestInfo; import com.kening.vordm.vo.*; import org.springblade.core.tool.api.R; @@ -63,4 +64,8 @@ public interface DisasterInfoService extends IService { Map statistics(); boolean removeManage(List disasterInfoList); + + GuestInfo getUserByEmail(String email); + + UserVo getBladeUserByEmail(String email); } 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 89b623b..7b3adc9 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 @@ -1,5 +1,6 @@ package com.kening.vordm.service.impl; +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.Wrappers; @@ -7,7 +8,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Maps; import com.kening.vordm.entity.DisasterData; import com.kening.vordm.entity.DisasterInfo; +import com.kening.vordm.entity.GuestInfo; import com.kening.vordm.mapper.DisasterInfoMapper; +import com.kening.vordm.mapper.GuestInfoMapper; import com.kening.vordm.service.DisasterInfoService; import com.kening.vordm.service.GuestManageDisasterRefService; import com.kening.vordm.vo.*; @@ -40,6 +43,8 @@ public class DisasterInfoServiceImpl extends ServiceImpl qw = new LambdaQueryWrapper<>(); + qw.eq(GuestInfo::getEmail,email); + return guestInfoMapper.selectOne(qw); + } + + @Override + public UserVo getBladeUserByEmail(String email) { + return guestInfoMapper.getBladeUserByEmail(email); + } + /** * 后台管理系统-控制台灾害各项统计 * @description 暂时没有条件查询 所有统计都暂时写在一个查询里面