Skip to content

V
volunteer_service
Commit feeb6b69 authored by cy's avatar cy
Browse files
Options

更改验证码登录来源，私人订制方案

parent 16214930
Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 183 deletions
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/StaffMapper.java
View file @ feeb6b69
......@@ -24,6 +24,13 @@ public interface StaffMapper extends BaseMapper<Staff> {
*/
List<Staff> getStaffList(Map<String, Object> map);
/**
* 员工总条数
* @param map
* @return
*/
int getStaffListCount(Map<String, Object> map);
/**
* 编辑员工信息
* @param staff 需要编辑的信息
......
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java
View file @ feeb6b69
......@@ -54,6 +54,15 @@ public interface UsersMapper extends BaseMapper<User> {
List<User> getListQuery(Map<String, Object> map);
List<User> getListQueryVip(Map<String, Object> map);
Integer getListVipCount(Map<String, Object> map);
List<User> getStaffVipUser(Map<String, Object> map);
Integer staffVipUserCount(Map<String, Object> map);
Integer getUserNumbers(Map<String, Object> map);
User getByPhone(@Param("phone") String phone);
......
wisenergy-mapper/src/main/resources/mapper/StaffMapper.xml
View file @ feeb6b69
......@@ -79,7 +79,7 @@
from
<include refid="table"/>
<where>
is_delete=0
1=1
<if test="staffName != null">and staff_name like ('%' #{staffName} '%')</if>
<if test="phone != null">and phone like ('%' #{phone} '%')</if>
......@@ -90,6 +90,20 @@
</where>
</select>
<select id="getStaffListCount" resultType="java.lang.Integer" parameterType="map">
select
count(1)
from
<include refid="table"/>
<where>
1=1
<if test="staffName != null and staffName !=''">and staff_name like ('%' #{staffName} '%')</if>
<if test="phone != null and phone !=''">and phone like ('%' #{phone} '%')</if>
</where>
</select>
<update id="delete" parameterType="int">
UPDATE
<include refid="table"/>
......
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
View file @ feeb6b69
......@@ -184,6 +184,81 @@
</where>
</select>
<select id="getListQueryVip" parameterType="map" resultMap="ExBaseResultMap">
SELECT u.id, u.user_name, u.phone, u.sex, u.school, u.exam_type, u.source, u.is_delete, u.create_time,
u.update_time, u.is_vip, u.vip_mobile,u.last_login_time,
s.culture_grade, s.major_grade
FROM `user` u LEFT JOIN score s ON s.user_id = u.id
<where>
is_delete=0 and is_vip = 1
<if test="startTime != null and startTime !=''">
and create_time
between #{startTime}
</if>
<if test="endTime != null and endTime !=''">and #{endTime}</if>
<if test="userName != null and userName !=''">and user_name like ('%' #{userName} '%')</if>
<if test="vipMobile != null and vipMobile !=''">and vip_mobile like ('%' #{vipMobile} '%')</if>
order by create_time desc
<if test="pageNo != null">
limit #{pageNo},#{pageSize}
</if>
</where>
</select>
<select id="getListVipCount" parameterType="map" resultType="java.lang.Integer">
SELECT count(1)
FROM `user` u LEFT JOIN score s ON s.user_id = u.id
<where>
is_delete=0 and is_vip = 1
<if test="startTime != null and startTime !=''">
and create_time
between #{startTime}
</if>
<if test="endTime != null and endTime !=''">and #{endTime}</if>
<if test="userName != null and userName !=''">and user_name like ('%' #{userName} '%')</if>
<if test="vipMobile != null and vipMobile !=''">and vip_mobile like ('%' #{vipMobile} '%')</if>
</where>
</select>
<select id="getStaffVipUser" parameterType="map" resultMap="ExBaseResultMap">
SELECT u.id, u.user_name, u.phone, u.sex, u.school, u.exam_type, u.source, u.is_delete, u.create_time,
u.update_time, u.is_vip, u.vip_mobile,u.last_login_time,
s.culture_grade, s.major_grade
FROM `user` u LEFT JOIN score s ON s.user_id = u.id
LEFT JOIN staff_user_vip su on u.id= su.user_vip_id
<where>
u.is_delete=0 and u.is_vip = 1 and su.staff_id=#{staffId}
<if test="startTime != null and startTime !=''">
and create_time
between #{startTime}
</if>
<if test="endTime != null and endTime !=''">and #{endTime}</if>
<if test="userName != null and userName !=''">and user_name like ('%' #{userName} '%')</if>
<if test="vipMobile != null and vipMobile !=''">and vip_mobile like ('%' #{vipMobile} '%')</if>
order by create_time desc
<if test="pageNo != null">
limit #{pageNo},#{pageSize}
</if>
</where>
</select>
<select id="staffVipUserCount" parameterType="map" resultType="java.lang.Integer">
SELECT count(1)
FROM `user` u LEFT JOIN score s ON s.user_id = u.id
LEFT JOIN staff_user_vip su on u.id= su.user_vip_id
<where>
u.is_delete=0 and u.is_vip = 1 and su.staff_id=#{staffId}
<if test="startTime != null and startTime !=''">
and create_time
between #{startTime}
</if>
<if test="endTime != null and endTime !=''">and #{endTime}</if>
<if test="userName != null and userName !=''">and user_name like ('%' #{userName} '%')</if>
<if test="vipMobile != null and vipMobile !=''">and vip_mobile like ('%' #{vipMobile} '%')</if>
</where>
</select>
<select id="getUserNumbers" resultType="java.lang.Integer">
SELECT COUNT(id)
FROM
......@@ -233,7 +308,7 @@
from
<include refid="table"/>
<where>
is_delete=0
is_vip=1
<if test="list != null and (list.size)>0">
and id in
<foreach collection="list" index="index" item="id" separator="," open="(" close=")">
......@@ -254,7 +329,7 @@
FROM
<include refid="table"/>
<where>
is_delete=0 and is_vip = 1
is_vip = 1
<if test="list != null and (list.size)>0">
and id in
<foreach collection="list" index="index" item="id" separator="," open="(" close=")">
......
wisenergy-model/src/main/java/cn/wisenergy/model/app/Banner.java
View file @ feeb6b69
......@@ -49,9 +49,9 @@ public class Banner implements Serializable {
private Integer isHaveImage;
/**
* 广告类型： 1：顶部广告 2：底部广告 3：App
* 广告类型： 1：pc顶部广告 2：pc底部广告 3：App广告
*/
@ApiModelProperty(value = "广告类型： 1：顶部广告 2：底部广告 3：App",name = "type")
@ApiModelProperty(value = "广告类型： 1：pc顶部广告 2：pc底部广告 3：App广告",name = "type")
private Integer type;
/**
......
wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java
View file @ feeb6b69
......@@ -45,6 +45,7 @@ public class User implements Serializable {
@ApiModelProperty(name = "phone", value = "手机号")
private String phone;
/**
* 头像
*/
......@@ -115,7 +116,7 @@ public class User implements Serializable {
@ApiModelProperty(name = "vipMobile", value = "vip电话号码")
private String vipMobile;
/*
/**
* 最近一次登录时间
*/
@ApiModelProperty(name = "lastLoginTime", value = "最近一次登录时间")
......@@ -151,4 +152,10 @@ public class User implements Serializable {
@Transient
private String money;
/**
* 员工名称
*/
@Transient
private String staffName;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserInfoDto.java
View file @ feeb6b69
......@@ -166,5 +166,4 @@ public class UserInfoDto implements Serializable {
@ApiModelProperty(name = "staffName",value = "员工名字")
private String staffName;
}
wisenergy-model/src/main/java/cn/wisenergy/model/enums/LonginType.java
View file @ feeb6b69
package cn.wisenergy.model.enums;
public enum LonginType {
/* STUDENT("Student"),
ADMIN("Admin"),
TEACHER("Teacher");
private String type;
private void LoginType(String type) {
this.type = type;
}
@Override
public String toString() {
return this.type.toString();
}*/
ADMIN(1, "admin"),
......
wisenergy-model/src/main/java/cn/wisenergy/model/vo/SendSmsVo.java
View file @ feeb6b69
......@@ -24,9 +24,9 @@ public class SendSmsVo implements Serializable {
private String phone;
/**
* 来源 1:PC 2:APP
* 来源 1:PC 2:APP,3:小程序
*/
@ApiModelProperty(value = "来源 1:PC 2:APP", name = "source")
@ApiModelProperty(value = "来源 1:PC 2:APP 3:小程序", name = "source")
private Integer source;
/**
......
wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserLoginVo.java
View file @ feeb6b69
......@@ -15,8 +15,7 @@ import java.io.Serializable;
@Data
@ApiModel(value = "UserLoginVo")
public class UserLoginVo implements Serializable {
private static final long serialVersionUID = 2206962675782086034L;
private static final long serialVersionUID = 1L;
/**
* 手机号码
*/
......
wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserVipQueryVo.java
View file @ feeb6b69
package cn.wisenergy.model.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
......@@ -42,4 +43,11 @@ public class UserVipQueryVo implements Serializable {
*/
@ApiModelProperty(name = "phone",value = "手机号")
private String phone;
/**
* vip用户手机
*/
@ApiModelProperty(value = "vip用户手机", name = "vipMobile")
@ExcelProperty(value = "vip用户手机")
private String vipMobile;
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AliPayServiceImpl.java
View file @ feeb6b69
......@@ -69,7 +69,6 @@ public class AliPayServiceImpl implements AliPayService {
alipayRequest.setReturnUrl(Common.RETURN_URL_PC);
//支付回调地址
alipayRequest.setNotifyUrl(Common.NOTIFY_URL);
//alipayRequest.setNotifyUrl("http://bga7hc.natappfree.cc/pay/aliPayCallBack.do");
alipayRequest.setBizContent("{" +
"\"out_trade_no\":\"" + tradeNo + "\"," +
"\"total_amount\":" + payPageDto.getTotal() + "," +
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java
View file @ feeb6b69
......@@ -447,17 +447,6 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
return R.error("无文化课专科录取规则!");
}
/*//本科类比文化分 = 本年录取分 -去年录取分 + 考生分数
double firstCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + Double.parseDouble(schemeVo.getCultureGrade());
double cultureMax = Double.parseDouble(firstRule.getCultureMax().toString());
//2).判断文化课的分数是否小于最小报考分数
//专科类比文化分 = 本年录取分 -去年录取分 + 考生分数
double secondCulture = secondRule.getCurrentYearCulture() - secondRule.getCultureMin() + Double.parseDouble(schemeVo.getCultureGrade());
double cultureMin = Double.parseDouble(secondRule.getCultureMin().toString());
if (secondCulture < cultureMin) {
return R.error("很抱歉，客户的成绩不满足报考条件，无法查询!");
}*/
if (cultureGrade < secondRule.getCultureMin()) {
return R.error("很抱歉，客户的成绩不满足报考条件，无法查询!");
}
......@@ -478,15 +467,6 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
return R.error("无美术专科录取规则!");
}
//判断考生是否有报取资格
//专科类比分 = 本年录取分 -去年录取分 + 考生分数
/* double secondCulture = secondRule.getCurrentYearCulture() - secondRule.getCultureMin() +
Double.parseDouble(schemeVo.getCultureGrade());
double secondMajor = secondRule.getCurrentYearMajor() - secondRule.getProfessionMin() +
Double.parseDouble(schemeVo.getMajorGrade());
if (secondCulture < secondRule.getCultureMin() && secondMajor < secondRule.getProfessionMin()) {
return R.error("很抱歉，客户的成绩不满足报考条件，无法查询!");
}*/
if (cultureGrade < secondRule.getCultureMin() || majorGrade < secondRule.getProfessionMin()) {
return R.error("很抱歉，客户的成绩不满足报考条件，无法查询!");
}
......@@ -507,15 +487,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
return R.error("无文学编导专科录取规则!");
}
//判断考生是否有报取资格
//专科类比分 = 本年录取分 -去年录取分 + 考生分数
/* double secondCulture = secondRule.getCurrentYearCulture() - secondRule.getCultureMin() +
Double.parseDouble(schemeVo.getCultureGrade());
double secondMajor = secondRule.getCurrentYearMajor() - secondRule.getProfessionMin() +
Double.parseDouble(schemeVo.getMajorGrade());
if (secondCulture < secondRule.getCultureMin() || secondMajor < secondRule.getProfessionMin()) {
return R.error("很抱歉，客户的专业成绩不满足报考条件，无法查询!");
}*/
if (cultureGrade < secondRule.getCultureMin() || majorGrade < secondRule.getProfessionMin()) {
return R.error("很抱歉，客户的成绩不满足报考条件，无法查询!");
}
......@@ -536,15 +508,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
return R.error("无体育专科录取规则!");
}
//判断考生是否有报取资格
//综合成绩差值
double value = secondRule.getCurrentYearCulture() - secondRule.getCultureMin();
/* double culture = Double.parseDouble(schemeVo.getCultureGrade());
double major = Double.parseDouble(schemeVo.getMajorGrade());*/
//计算综合成绩
/* double totalv = major * 750 / 100 * 0.7 + culture * 0.3 - value;*/
if (cultureGrade < secondRule.getCultureMin() || majorGrade < secondRule.getProfessionMin()) {
if (cultureGrade < secondRule.getCultureMin()) {
return R.error("很抱歉，客户的成绩不满足报考条件，无法查询!");
}
......@@ -640,21 +604,6 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
list = volunteerMapper.getVolunteerListVip(map);
}
//专科科类比分 = 本年录取分 -去年录取分 + 考生分数
/* double secondCulture = secondRule.getCurrentYearCulture() - secondRule.getCultureMin() +
Double.parseDouble(schemeVo.getCultureGrade());
double secondMajor = secondRule.getCurrentYearMajor() - secondRule.getProfessionMin() +
Double.parseDouble(schemeVo.getMajorGrade());*/
//2、考生是否能报取美术专科
/* if (secondCulture >= secondRule.getCultureMin() && secondMajor >= secondRule.getProfessionMin()) {
map.put("type", SchemeTypeEnums.JUNIOR_COLLEGE_ARTS.getCode());
map.put("total", total);
map.put("locals", locals);
list = volunteerMapper.getVolunteerListVip(map);
}*/
return list;
}
......@@ -668,10 +617,6 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
*/
private List<Volunteer> getLiteratureVipList(AdmissionRule firstRule, AdmissionRule secondRule, Double cultureGrade, Double majorGrade, Integer totalMax, Integer totalMin, List<String> locals,
List<String> professionNames) {
//本科类比分 = 本年录取分 -去年录取分 + 考生分数
/*double culture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + Double.parseDouble(queryVo.getCultureGrade());
double major = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + Double.parseDouble(queryVo.getMajorGrade());*/
Map<String, Object> map = new HashMap<>(16);
map.put("professionNames", professionNames);
map.put("locals", locals);
......@@ -693,20 +638,6 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
list = volunteerMapper.getVolunteerListVip(map);
}
//专科类比分 = 本年录取分 -去年录取分 + 考生分数
/* double cultureSecond = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + Double.parseDouble(queryVo.getCultureGrade());
double majorSecond = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + Double.parseDouble(queryVo.getMajorGrade());*/
//2、考生是否能报取美术专科
/* if (cultureSecond >= secondRule.getCultureMin() && majorSecond >= secondRule.getProfessionMin()) {
map.put("type", SchemeTypeEnums.JUNIOR_COLLEGE_LITERATURE.getCode());
map.put("totalMax", totalMax);
map.put("totalMin", totalMin);
map.put("locals", locals);
list = volunteerMapper.getVolunteerListVip(map);
}*/
return list;
}
......@@ -741,14 +672,6 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
list = volunteerMapper.getVolunteerListVip(map);
}
//2、考生是否能报取体育专科
/* if (total >= secondRule.getCultureMin()) {
map.put("type", SchemeTypeEnums.JUNIOR_COLLEGE_SPORTS.getCode());
map.put("totalMax", totalMax);
map.put("totalMin", totalMin);
map.put("locals", locals);
list = volunteerMapper.getVolunteerListVip(map);
}*/
return list;
}
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SendSmsSerViceImpl.java
View file @ feeb6b69
......@@ -71,8 +71,7 @@ public class SendSmsSerViceImpl implements SendSmsSerVice {
//保存验证到缓存，以便做验证
String source = SourceType.getByCode(sendSmsVo.getSource());
String scene = SceneType.getNameByCode(sendSmsVo.getScene());
/* boolean bool = redisService.set(CachePrefix.SMS_CODE.getPrefix() + scene + "_" +
source + "_" + sendSmsVo.getPhone(), code, Common.SMS_TIMEOUT);*/
boolean bool = redisService.set(CachePrefix.SMS_CODE.getPrefix() + "_" +
source + "_" + sendSmsVo.getPhone(), code, Common.SMS_TIMEOUT);
log.info(CachePrefix.SMS_CODE.getPrefix());
......@@ -116,6 +115,7 @@ public class SendSmsSerViceImpl implements SendSmsSerVice {
String value = SceneType.getNameByCode(type);
//获取短信验证码key
String key = CachePrefix.SMS_CODE.getPrefix() + "_" + source + "_" + phone;
//判断缓存是否过期
long time = redisService.getExpire(key);
if (time < 0) {
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/StaffServiceImpl.java
View file @ feeb6b69
......@@ -100,7 +100,7 @@ public class StaffServiceImpl implements StaffService {
PageInfo<StaffDto> info = new PageInfo<>();
info.setPageSize(null==queryVo.getPageSize()?0:queryVo.getPageSize());
info.setPageNum(null==queryVo.getPageNo()?0:queryVo.getPageNo());
info.setTotal(staffList.size());
info.setTotal(staffMapper.getStaffListCount(map));
info.setList(staffDtos);
return R.ok(0,info);
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/StaffUserVipServiceImpl.java
View file @ feeb6b69
......@@ -148,12 +148,6 @@ public class StaffUserVipServiceImpl extends ServiceImpl<LocalMapper, Local> imp
if (null==queryVo) {
return R.error("入参为空");
}
List<StaffUserVip> listStaff = new ArrayList<>();
if(null != queryVo.getStaffId()){
listStaff = staffUserVipMapper.getList(queryVo.getStaffId());
}else{
listStaff = staffUserVipMapper.getAllList();
}
//创建参数容器
Map<String, Object> map = new HashMap<>(4);
......@@ -165,82 +159,37 @@ public class StaffUserVipServiceImpl extends ServiceImpl<LocalMapper, Local> imp
map.put("pageSize", queryVo.getPageSize());
}
map.put("userName", queryVo.getUserName());
map.put("phone", queryVo.getPhone());
map.put("list",listStaff);
map.put("vipMobile", queryVo.getVipMobile());
List<User> list1;
int count;
if(null != queryVo.getStaffId() && queryVo.getStaffId()>0){
map.put("staffId",queryVo.getStaffId());
list1 = usersMapper.getStaffVipUser(map);
count=usersMapper.staffVipUserCount(map);
}else{
list1 = usersMapper.getListQueryVip(map);
count=usersMapper.getListVipCount(map);
}
//查询用户数据
List<User> list1 = usersMapper.getUserByStaffId(map);
List<UserInfoDto> list = new ArrayList<>();
//将集合遍历拿出用户id查询成绩信息
for (User user : list1) {
UserInfoDto userInfoDto = new UserInfoDto();
//查询相关信息
ScoreInfo scoreInfo = scoreInfoMapper.getByUserId(user.getId());
if (null != scoreInfo) {
userInfoDto.setCultureGrade(scoreInfo.getCultureGrade().toString());
userInfoDto.setMajorGrade(null==scoreInfo.getMajorGrade()?"":scoreInfo.getMajorGrade().toString());
}
LoginRecord loginRecord = loginRecordMapper.getById(user.getId());
if (null != loginRecord) {
userInfoDto.setLastLoginTime(loginRecord.getUpdateTime());
userInfoDto.setIp(loginRecord.getIp());
}
UserLimit userLimit = userLimitMapper.getByUserId(user.getId());
if (null != userLimit) {
userInfoDto.setQueryLimit(userLimit.getUsableLimit());
}
List<PayRecord> byId = payRecordMapper.getById(user.getId());
//计算充值卡充值次数
Integer rechargeTimes = 0;
//支付宝充值总金额
Double alipayMoney = 0.0;
//微信充值总金额
Double weChatMoney = 0.0;
if (!CollectionUtils.isEmpty(byId)) {
for (PayRecord payRecord : byId) {
if (payRecord.getType() == 1) {
alipayMoney += Double.valueOf(null == payRecord.getMoney() ? 0 : payRecord.getMoney());
}
if (payRecord.getType() == 2) {
weChatMoney += Double.valueOf(null == payRecord.getMoney() ? 0 : payRecord.getMoney());
}
if (payRecord.getType() == 3) {
rechargeTimes += 1;
}
}
}
userInfoDto.setWeChatMoney(String.valueOf(weChatMoney));
userInfoDto.setAlipayMoney(String.valueOf(alipayMoney));
userInfoDto.setRechargeTimes(rechargeTimes);
//将消息进行同步
QueryWrapper<StaffUserVip> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_vip_id",user.getId());
StaffUserVip staffUserVip = staffUserVipMapper.selectOne(queryWrapper);
Staff staff = staffMapper.selectById(staffUserVip.getStaffId());
user.setStaffName(staff.getStaffName());
BeanUtils.copyProperties(user, userInfoDto);
userInfoDto.setUserId(user.getId());
userInfoDto.setRegisterTime(user.getCreateTime());
list.add(userInfoDto);
for(UserInfoDto userInfo : list){
QueryWrapper<StaffUserVip> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_vip_id",userInfo.getUserId());
StaffUserVip staffUserVip = staffUserVipMapper.selectOne(queryWrapper);
Staff staff = staffMapper.selectById(staffUserVip.getStaffId());
userInfo.setStaffName(staff.getStaffName());
}
}
PageInfo<UserInfoDto> info = new PageInfo<>();
info.setPageSize(null==queryVo.getPageSize()?0:queryVo.getPageSize());
info.setPageNum(null==queryVo.getPageNo()?0:queryVo.getPageNo());
info.setTotal(usersMapper.getVipUserNumbers(map));
info.setTotal(count);
info.setList(list);
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java
View file @ feeb6b69
......@@ -120,7 +120,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
map.put("phone", userVo.getPhone());
map.put("is_delete", 0);
User user = usersMapper.selectOne(map);
redisService.set(CODE_LOGIN_TYPE+"_"+user.getPhone(),SourceType.getByCode(userVo.getSource()),Common.SMS_TIMEOUT);
Subject subject = SecurityUtils.getSubject();
UserToken userToken = new UserToken(userVo.getPhone(), userVo.getCode(), CODE_LOGIN_TYPE);
try {
......
wisenergy-service/src/main/java/cn/wisenergy/service/shir/realm/CodeRealm.java
View file @ feeb6b69
......@@ -5,6 +5,7 @@ import cn.wisenergy.model.app.User;
import cn.wisenergy.model.enums.SourceType;
import cn.wisenergy.service.cache.RedisService;
import cn.wisenergy.service.common.CachePrefix;
import cn.wisenergy.service.common.Common;
import cn.wisenergy.service.util.UserToken;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
......@@ -39,9 +40,10 @@ public class CodeRealm extends AuthorizingRealm {
if (userInfo == null) {
return null;
}
String source = SourceType.getByCode(userInfo.getSource());
String source = redisService.get(userToken.getLoginType()+"_"+userInfo.getPhone()).toString();
//获取短信验证码key
String key = CachePrefix.SMS_CODE.getPrefix() + "_" + source + "_" + userInfo.getPhone();
Object obj = redisService.get(key);
String code = obj.toString();
SimpleAuthenticationInfo authenticationInfo = new SimpleAuthenticationInfo(
......
wisenergy-service/src/main/java/cn/wisenergy/service/util/UserToken.java
View file @ feeb6b69
......@@ -5,11 +5,13 @@ import org.apache.shiro.authc.UsernamePasswordToken;
public class UserToken extends UsernamePasswordToken {
//登录类型
private String loginType;
public UserToken(final String username, final String password,String loginType) {
super(username,password);
this.loginType = loginType;
}
public String getLoginType() {
return loginType;
}
......
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/StaffUserVipController.java
View file @ feeb6b69
......@@ -36,9 +36,6 @@ public class StaffUserVipController {
return staffUserVipService.staffLogin(loginVo);
}
/* public R<Boolean> loginOut(){
return true;
}*/
@ApiOperation(value = "添加Vip客户",notes = "添加Vip客户",httpMethod = "POST")
@ApiModelProperty(name = "staffAddDto",value = "登录信息",dataType = "StaffAddDto")
......@@ -52,7 +49,7 @@ public class StaffUserVipController {
@ApiOperation(value = "查询Vip客户（查询所有vip客户就不用传staffId）",notes = "查询Vip客户（查询所有vip客户就不用传staffId）",httpMethod = "POST")
@ApiModelProperty(name = "queryVo",value = "vip客户信息",dataType = "UserVipQueryVo")
@PostMapping("/getList")
public R<PageInfo<UserInfoDto>> getUserVipList(@RequestBody UserVipQueryVo queryVo,HttpServletResponse response){
public R<PageInfo<UserInfoDto>> getUserVipList(@RequestBody UserVipQueryVo queryVo){
log.info("StaffUserVipController[].addUserVip[].input.param:"+queryVo);
return staffUserVipService.getList(queryVo);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment