|
@@ -1,5 +1,6 @@
|
|
package com.fdkankan.jp.xspace.service.impl;
|
|
package com.fdkankan.jp.xspace.service.impl;
|
|
|
|
|
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
@@ -8,12 +9,15 @@ import com.fdkankan.common.util.JwtUtil;
|
|
import com.fdkankan.common.util.SecurityUtil;
|
|
import com.fdkankan.common.util.SecurityUtil;
|
|
import com.fdkankan.jp.xspace.common.ResultCode;
|
|
import com.fdkankan.jp.xspace.common.ResultCode;
|
|
import com.fdkankan.jp.xspace.common.redis.RedisConstant;
|
|
import com.fdkankan.jp.xspace.common.redis.RedisConstant;
|
|
|
|
+import com.fdkankan.jp.xspace.constant.XspaceErrorCode;
|
|
import com.fdkankan.jp.xspace.dto.LoginDTO;
|
|
import com.fdkankan.jp.xspace.dto.LoginDTO;
|
|
import com.fdkankan.jp.xspace.entity.User;
|
|
import com.fdkankan.jp.xspace.entity.User;
|
|
|
|
+import com.fdkankan.jp.xspace.entity.UserPlatform;
|
|
import com.fdkankan.jp.xspace.entity.UserRole;
|
|
import com.fdkankan.jp.xspace.entity.UserRole;
|
|
import com.fdkankan.jp.xspace.common.exception.BusinessException;
|
|
import com.fdkankan.jp.xspace.common.exception.BusinessException;
|
|
import com.fdkankan.jp.xspace.entity.XspaceUser;
|
|
import com.fdkankan.jp.xspace.entity.XspaceUser;
|
|
import com.fdkankan.jp.xspace.mapper.IUserMapper;
|
|
import com.fdkankan.jp.xspace.mapper.IUserMapper;
|
|
|
|
+import com.fdkankan.jp.xspace.service.IUserPlatformService;
|
|
import com.fdkankan.jp.xspace.service.IUserRoleService;
|
|
import com.fdkankan.jp.xspace.service.IUserRoleService;
|
|
import com.fdkankan.jp.xspace.service.IUserService;
|
|
import com.fdkankan.jp.xspace.service.IUserService;
|
|
import com.fdkankan.jp.xspace.service.IXspaceUserService;
|
|
import com.fdkankan.jp.xspace.service.IXspaceUserService;
|
|
@@ -48,6 +52,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
|
|
private IUserRoleService userRoleService;
|
|
private IUserRoleService userRoleService;
|
|
@Autowired
|
|
@Autowired
|
|
private IXspaceUserService xspaceUserService;
|
|
private IXspaceUserService xspaceUserService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IUserPlatformService userPlatformService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public User getByUserName(String managerPhone) {
|
|
public User getByUserName(String managerPhone) {
|
|
@@ -70,6 +76,12 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
|
|
if(!user.getPassword().equals(passwordCode)){
|
|
if(!user.getPassword().equals(passwordCode)){
|
|
throw new BusinessException(ResultCode.PASSWORD_ERROR);
|
|
throw new BusinessException(ResultCode.PASSWORD_ERROR);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ List<UserPlatform> xspases = userPlatformService.list(new LambdaQueryWrapper<UserPlatform>().eq(UserPlatform::getUserId, user.getId()).eq(UserPlatform::getPlatformKey, "xspase"));
|
|
|
|
+ if(CollUtil.isEmpty(xspases)){
|
|
|
|
+ throw new BusinessException(XspaceErrorCode.CODE_90001.code(), XspaceErrorCode.CODE_90001.message());
|
|
|
|
+ }
|
|
|
|
+
|
|
String token = this.redisLogin(user.getUserName(), JSONObject.toJSONString(user),"user");
|
|
String token = this.redisLogin(user.getUserName(), JSONObject.toJSONString(user),"user");
|
|
UserVO userVo = getUserVo(user);
|
|
UserVO userVo = getUserVo(user);
|
|
LoginVO vo = new LoginVO();
|
|
LoginVO vo = new LoginVO();
|