czg_team
/
video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松 2025-01-03 19:11:05 +08:00
parent 0d23c99794 0aa85e1788
commit 886392e878
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sqx/modules/app/entity/UserEntity.java
View File

@ -28,7 +28,7 @@ public class UserEntity implements Serializable {
*/
@Excel(name = "用户id", orderNum = "1")
@ApiModelProperty("用户id")
@TableId(type = IdType.AUTO, value = "user_id")
@TableId(value = "user_id")
private Long userId;
/**
* 用户名

3
src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
View File

@ -19,6 +19,7 @@ import com.aliyuncs.http.MethodType;
import com.aliyuncs.profile.DefaultProfile;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.service.impl.ServiceImpl;
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.setRate(new BigDecimal(commonInfoService.findOne(420).getValue()));
userInfo.setTwoRate(new BigDecimal(commonInfoService.findOne(421).getValue()));
Long snowFlakeId = InvitationCodeUtil.getSnowFlakeId();
userInfo.setUserId(snowFlakeId);
baseMapper.insert(userInfo);
userInfo.setInvitationCode(InvitationCodeUtil.toSerialCode(userInfo.getUserId()));
baseMapper.updateById(userInfo);

2
src/main/java/com/sqx/modules/sys/controller/SysLoginController.java
View File

@ -10,6 +10,7 @@ import com.sqx.modules.sys.form.SysLoginForm;
import com.sqx.modules.sys.service.SysCaptchaService;
import com.sqx.modules.sys.service.SysUserService;
import com.sqx.modules.sys.service.SysUserTokenService;
import com.sqx.modules.utils.InvitationCodeUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@ -87,6 +88,7 @@ public class SysLoginController extends AbstractController {
user.setStatus(1);
user.setRoleIdList(Collections.singletonList(4L));
ValidatorUtils.validateEntity(user, AddGroup.class);
user.setUserId(InvitationCodeUtil.getSnowFlakeId());
sysUserService.saveUser(user);
return Result.success();
}

2
src/main/java/com/sqx/modules/sys/controller/SysUserController.java
View File

@ -13,6 +13,7 @@ import com.sqx.modules.sys.entity.SysUserEntity;
import com.sqx.modules.sys.form.PasswordForm;
import com.sqx.modules.sys.service.SysUserRoleService;
import com.sqx.modules.sys.service.SysUserService;
import com.sqx.modules.utils.InvitationCodeUtil;
import com.sqx.modules.utils.ParamPageUtils;
import org.apache.commons.lang.ArrayUtils;
import org.apache.shiro.crypto.hash.Sha256Hash;
@ -102,6 +103,7 @@ public class SysUserController extends AbstractController {
ValidatorUtils.validateEntity(user, AddGroup.class);
user.setCreateUserId(getUserId());
user.setUserId(InvitationCodeUtil.getSnowFlakeId());
sysUserService.saveUser(user);
return Result.success();

9
src/main/java/com/sqx/modules/utils/InvitationCodeUtil.java
View File

@ -127,8 +127,9 @@ public class InvitationCodeUtil {
return res;
}
// public static String getSnowFlakeId() {
// return String.valueOf(((SnowFlake) Objects.requireNonNull(SpringContextUtils.getSpringBean(SnowFlake.class))).nextId(false));
// }
public static Long getSnowFlakeId() {
String id = String.valueOf(((SnowFlake) Objects.requireNonNull(SpringContextUtils.getSpringBean(SnowFlake.class))).nextId(false));
return Long.parseLong(id);
}
}
}