user_id 的问题
This commit is contained in:
@@ -28,7 +28,7 @@ public class UserEntity implements Serializable {
|
|||||||
*/
|
*/
|
||||||
@Excel(name = "用户id", orderNum = "1")
|
@Excel(name = "用户id", orderNum = "1")
|
||||||
@ApiModelProperty("用户id")
|
@ApiModelProperty("用户id")
|
||||||
@TableId(type = IdType.AUTO, value = "user_id")
|
@TableId(value = "user_id")
|
||||||
private Long userId;
|
private Long userId;
|
||||||
/**
|
/**
|
||||||
* 用户名
|
* 用户名
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import com.aliyuncs.http.MethodType;
|
|||||||
import com.aliyuncs.profile.DefaultProfile;
|
import com.aliyuncs.profile.DefaultProfile;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.getui.push.v2.sdk.ApiHelper;
|
import com.getui.push.v2.sdk.ApiHelper;
|
||||||
@@ -970,6 +971,8 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
|
|||||||
userInfo.setUpdateTime(sdf.format(new Date()));
|
userInfo.setUpdateTime(sdf.format(new Date()));
|
||||||
userInfo.setRate(new BigDecimal(commonInfoService.findOne(420).getValue()));
|
userInfo.setRate(new BigDecimal(commonInfoService.findOne(420).getValue()));
|
||||||
userInfo.setTwoRate(new BigDecimal(commonInfoService.findOne(421).getValue()));
|
userInfo.setTwoRate(new BigDecimal(commonInfoService.findOne(421).getValue()));
|
||||||
|
Long snowFlakeId = InvitationCodeUtil.getSnowFlakeId();
|
||||||
|
userInfo.setUserId(snowFlakeId);
|
||||||
baseMapper.insert(userInfo);
|
baseMapper.insert(userInfo);
|
||||||
userInfo.setInvitationCode(InvitationCodeUtil.toSerialCode(userInfo.getUserId()));
|
userInfo.setInvitationCode(InvitationCodeUtil.toSerialCode(userInfo.getUserId()));
|
||||||
baseMapper.updateById(userInfo);
|
baseMapper.updateById(userInfo);
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import com.sqx.modules.sys.form.SysLoginForm;
|
|||||||
import com.sqx.modules.sys.service.SysCaptchaService;
|
import com.sqx.modules.sys.service.SysCaptchaService;
|
||||||
import com.sqx.modules.sys.service.SysUserService;
|
import com.sqx.modules.sys.service.SysUserService;
|
||||||
import com.sqx.modules.sys.service.SysUserTokenService;
|
import com.sqx.modules.sys.service.SysUserTokenService;
|
||||||
|
import com.sqx.modules.utils.InvitationCodeUtil;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiImplicitParam;
|
import io.swagger.annotations.ApiImplicitParam;
|
||||||
import io.swagger.annotations.ApiImplicitParams;
|
import io.swagger.annotations.ApiImplicitParams;
|
||||||
@@ -87,6 +88,7 @@ public class SysLoginController extends AbstractController {
|
|||||||
user.setStatus(1);
|
user.setStatus(1);
|
||||||
user.setRoleIdList(Collections.singletonList(4L));
|
user.setRoleIdList(Collections.singletonList(4L));
|
||||||
ValidatorUtils.validateEntity(user, AddGroup.class);
|
ValidatorUtils.validateEntity(user, AddGroup.class);
|
||||||
|
user.setUserId(InvitationCodeUtil.getSnowFlakeId());
|
||||||
sysUserService.saveUser(user);
|
sysUserService.saveUser(user);
|
||||||
return Result.success();
|
return Result.success();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import com.sqx.modules.sys.entity.SysUserEntity;
|
|||||||
import com.sqx.modules.sys.form.PasswordForm;
|
import com.sqx.modules.sys.form.PasswordForm;
|
||||||
import com.sqx.modules.sys.service.SysUserRoleService;
|
import com.sqx.modules.sys.service.SysUserRoleService;
|
||||||
import com.sqx.modules.sys.service.SysUserService;
|
import com.sqx.modules.sys.service.SysUserService;
|
||||||
|
import com.sqx.modules.utils.InvitationCodeUtil;
|
||||||
import com.sqx.modules.utils.ParamPageUtils;
|
import com.sqx.modules.utils.ParamPageUtils;
|
||||||
import org.apache.commons.lang.ArrayUtils;
|
import org.apache.commons.lang.ArrayUtils;
|
||||||
import org.apache.shiro.crypto.hash.Sha256Hash;
|
import org.apache.shiro.crypto.hash.Sha256Hash;
|
||||||
@@ -102,6 +103,7 @@ public class SysUserController extends AbstractController {
|
|||||||
ValidatorUtils.validateEntity(user, AddGroup.class);
|
ValidatorUtils.validateEntity(user, AddGroup.class);
|
||||||
|
|
||||||
user.setCreateUserId(getUserId());
|
user.setCreateUserId(getUserId());
|
||||||
|
user.setUserId(InvitationCodeUtil.getSnowFlakeId());
|
||||||
sysUserService.saveUser(user);
|
sysUserService.saveUser(user);
|
||||||
|
|
||||||
return Result.success();
|
return Result.success();
|
||||||
|
|||||||
@@ -127,8 +127,9 @@ public class InvitationCodeUtil {
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
// public static String getSnowFlakeId() {
|
public static Long getSnowFlakeId() {
|
||||||
// return String.valueOf(((SnowFlake) Objects.requireNonNull(SpringContextUtils.getSpringBean(SnowFlake.class))).nextId(false));
|
String id = String.valueOf(((SnowFlake) Objects.requireNonNull(SpringContextUtils.getSpringBean(SnowFlake.class))).nextId(false));
|
||||||
// }
|
return Long.parseLong(id);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user