|
|
@@ -9,6 +9,7 @@ import org.springframework.util.StringUtils;
|
|
|
import shop.alien.entity.result.R;
|
|
|
import shop.alien.entity.store.LifeSys;
|
|
|
import shop.alien.entity.store.UserLoginInfo;
|
|
|
+import shop.alien.entity.store.dto.SystemUserAddDto;
|
|
|
import shop.alien.entity.store.vo.SystemLoginVo;
|
|
|
import shop.alien.store.config.BaseRedisService;
|
|
|
import shop.alien.mapper.LifeSysMapper;
|
|
|
@@ -70,7 +71,7 @@ public class SystemServiceImpl implements SystemService {
|
|
|
);
|
|
|
if (lifeSys != null && lifeSys.getUserPassword().equals(encryptToMD5(password))) {
|
|
|
Map<String, String> tokenMap = new HashMap<>();
|
|
|
- tokenMap.put("phone", "123456");
|
|
|
+ tokenMap.put("phone", lifeSys.getPhone());
|
|
|
tokenMap.put("userName", lifeSys.getUserName());
|
|
|
tokenMap.put("userId", String.valueOf(lifeSys.getId()));
|
|
|
tokenMap.put("userType", "web");
|
|
|
@@ -130,6 +131,60 @@ public class SystemServiceImpl implements SystemService {
|
|
|
return R.fail("注册失败,请稍后重试");
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public R<LifeSys> addUser(SystemUserAddDto addDto) {
|
|
|
+ // 校验用户名是否已存在
|
|
|
+ LambdaQueryWrapper<LifeSys> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(LifeSys::getUserName, addDto.getUserName());
|
|
|
+ LifeSys existingUser = lifeSysMapper.selectOne(queryWrapper);
|
|
|
+ if (existingUser != null) {
|
|
|
+ return R.fail("该用户名已存在,请更换其他用户名");
|
|
|
+ }
|
|
|
+
|
|
|
+ // 校验邮箱是否已存在
|
|
|
+ LambdaQueryWrapper<LifeSys> emailQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ emailQueryWrapper.eq(LifeSys::getEmail, addDto.getEmail());
|
|
|
+ LifeSys existingEmail = lifeSysMapper.selectOne(emailQueryWrapper);
|
|
|
+ if (existingEmail != null) {
|
|
|
+ return R.fail("该邮箱已被使用,请更换其他邮箱");
|
|
|
+ }
|
|
|
+
|
|
|
+/* // 校验手机号是否已存在
|
|
|
+ LambdaQueryWrapper<LifeSys> phoneQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ phoneQueryWrapper.eq(LifeSys::getPhone, addDto.getPhone());
|
|
|
+ LifeSys existingPhone = lifeSysMapper.selectOne(phoneQueryWrapper);
|
|
|
+ if (existingPhone != null) {
|
|
|
+ return R.fail("该手机号已被使用,请更换其他手机号");
|
|
|
+ }*/
|
|
|
+
|
|
|
+ // 创建新用户
|
|
|
+ LifeSys lifeSys = new LifeSys();
|
|
|
+ lifeSys.setUserName(addDto.getUserName());
|
|
|
+ lifeSys.setRealName(addDto.getRealName());
|
|
|
+ lifeSys.setPhone(addDto.getPhone());
|
|
|
+ lifeSys.setEmail(addDto.getEmail());
|
|
|
+ // 密码使用MD5加密后存储
|
|
|
+// lifeSys.setUserPassword(encryptToMD5(addDto.getPassword()));
|
|
|
+ lifeSys.setUserPassword(addDto.getPassword());
|
|
|
+
|
|
|
+ // 处理多角色:将角色ID列表转换为逗号分隔的字符串
|
|
|
+ lifeSys.setRoleId(addDto.getRoleIds());
|
|
|
+
|
|
|
+ lifeSys.setDepartmentId(addDto.getDepartmentId());
|
|
|
+ lifeSys.setRemark(addDto.getRemark());
|
|
|
+ lifeSys.setStatus(addDto.getStatus() != null ? addDto.getStatus() : 1);
|
|
|
+ lifeSys.setDeleteFlag(0); // 未删除
|
|
|
+
|
|
|
+ // 保存用户
|
|
|
+ int result = lifeSysMapper.insert(lifeSys);
|
|
|
+ if (result > 0) {
|
|
|
+ // 清除密码信息,避免返回到前端
|
|
|
+ lifeSys.setUserPassword(null);
|
|
|
+ return R.data(lifeSys, "新增账号成功");
|
|
|
+ }
|
|
|
+ return R.fail("新增账号失败,请稍后重试");
|
|
|
+ }
|
|
|
+
|
|
|
public static String encryptToMD5(String input) {
|
|
|
try {
|
|
|
// 获取 MD5 算法的 MessageDigest 实例
|