代码提交-glj
This commit is contained in:
parent
51136e2658
commit
f71755741f
|
@ -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;
|
||||
|
||||
|
|
|
@ -83,6 +83,11 @@ public class RemoteSensingSourceData implements Serializable {
|
|||
*/
|
||||
private String satelliteCode;
|
||||
|
||||
/**
|
||||
* 卫星类型0-sentinel,1-landset,2-searchone
|
||||
*/
|
||||
private String satelliteType;
|
||||
|
||||
/**
|
||||
* 接收时间
|
||||
*/
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -21,4 +21,8 @@ public class WorldCharts {
|
|||
* 频次
|
||||
*/
|
||||
private Integer value;
|
||||
/**
|
||||
* 频次
|
||||
*/
|
||||
private Integer type;
|
||||
}
|
||||
|
|
|
@ -47,4 +47,14 @@ public class CallForHelpVo extends DisasterInfo {
|
|||
* 创建时间
|
||||
*/
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 姓
|
||||
*/
|
||||
private String lastName;
|
||||
|
||||
/**
|
||||
* 名字
|
||||
*/
|
||||
private String firstName;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -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));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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<List<PictureInfo>> getPictureInfoByDisasterId(Long disasterId){
|
||||
LambdaQueryWrapper<PictureInfo> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(PictureInfo::getDisasterId,disasterId);
|
||||
return R.data(service.list(queryWrapper));
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量上传
|
||||
* @return
|
||||
|
|
|
@ -137,6 +137,8 @@
|
|||
<select id="page" parameterType="com.kening.vordm.vo.CallForHelpVo" resultType="com.kening.vordm.vo.CallForHelpVo">
|
||||
SELECT
|
||||
u.username ,
|
||||
u.last_name AS lastName,
|
||||
u.first_name AS firstName,
|
||||
u.id as uid ,
|
||||
u.email,
|
||||
u.research_field,
|
||||
|
|
|
@ -3,6 +3,8 @@ package com.kening.vordm.mapper;
|
|||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.kening.vordm.entity.GuestInfo;
|
||||
import com.kening.vordm.vo.UserVo;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
/**
|
||||
* @author G1393
|
||||
|
@ -13,4 +15,5 @@ import com.kening.vordm.entity.GuestInfo;
|
|||
public interface GuestInfoMapper extends BaseMapper<GuestInfo> {
|
||||
|
||||
|
||||
UserVo getBladeUserByEmail(@Param("email") String email);
|
||||
}
|
||||
|
|
|
@ -14,11 +14,20 @@
|
|||
<result property="isManage" column="is_manage" jdbcType="INTEGER"/>
|
||||
<result property="occupation" column="occupation" jdbcType="VARCHAR"/>
|
||||
<result property="professionalTitle" column="professional_title" jdbcType="VARCHAR"/>
|
||||
<result property="lastName" column="last_name" jdbcType="VARCHAR"/>
|
||||
<result property="firstName" column="first_name" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="Base_Column_List">
|
||||
id ,username,email,
|
||||
organization,research_field,create_time,
|
||||
is_manage,occupation,professional_title
|
||||
is_manage,occupation,professional_title,last_name,first_name
|
||||
</sql>
|
||||
|
||||
<select id="getBladeUserByEmail" resultType="com.kening.vordm.vo.UserVo">
|
||||
select * FROM blade_user
|
||||
<where>
|
||||
email = #{email}
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
<result property="status" column="status" jdbcType="SMALLINT"/>
|
||||
<result property="managerId" column="manager_id" jdbcType="BIGINT"/>
|
||||
<result property="reviewTime" column="review_time" jdbcType="TIMESTAMP"/>
|
||||
<result property="type" column="type" jdbcType="TIMESTAMP"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="Base_Column_List">
|
||||
|
@ -25,7 +26,8 @@
|
|||
select
|
||||
DATE_FORMAT(time,'%Y-%m-%d') date,
|
||||
frequency value,
|
||||
word name
|
||||
word name,
|
||||
type
|
||||
from word_clouds
|
||||
<where>
|
||||
and `status` = 1
|
||||
|
|
|
@ -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<DisasterInfo> {
|
|||
Map<String,Object> statistics();
|
||||
|
||||
boolean removeManage(List<DisasterInfo> disasterInfoList);
|
||||
|
||||
GuestInfo getUserByEmail(String email);
|
||||
|
||||
UserVo getBladeUserByEmail(String email);
|
||||
}
|
||||
|
|
|
@ -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<DisasterInfoMapper, Dis
|
|||
|
||||
private final BladeRedis bladeRedis;
|
||||
|
||||
private final GuestInfoMapper guestInfoMapper;
|
||||
|
||||
private final GuestManageDisasterRefService guestManageDisasterRefService;
|
||||
|
||||
/**
|
||||
|
@ -186,6 +191,18 @@ public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, Dis
|
|||
return Boolean.TRUE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public GuestInfo getUserByEmail(String email) {
|
||||
LambdaQueryWrapper<GuestInfo> qw = new LambdaQueryWrapper<>();
|
||||
qw.eq(GuestInfo::getEmail,email);
|
||||
return guestInfoMapper.selectOne(qw);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserVo getBladeUserByEmail(String email) {
|
||||
return guestInfoMapper.getBladeUserByEmail(email);
|
||||
}
|
||||
|
||||
/**
|
||||
* 后台管理系统-控制台灾害各项统计
|
||||
* @description 暂时没有条件查询 所有统计都暂时写在一个查询里面
|
||||
|
|
Loading…
Reference in New Issue