From 1ff642981afabeea08cdf2ffc6607dafd6979b97 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 19 Sep 2025 02:53:26 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java | 63 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
index 095fe20..94ce615 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
@@ -2,6 +2,8 @@
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -9,7 +11,10 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.im.comm.Result;
import com.ruoyi.im.dto.RegisterDto;
+import com.ruoyi.im.out.UserAccountOut;
import com.ruoyi.im.service.ImApiServcie;
+import com.ruoyi.im.util.ConverterUtil;
+import com.ruoyi.im.util.PhoneNumberValidatorUtil;
import com.ruoyi.system.domain.UserAccount;
import com.ruoyi.system.domain.vo.UserAccountUpdateVo;
import com.ruoyi.system.domain.vo.UserAccountVo;
@@ -23,6 +28,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.Collection;
import java.util.List;
import java.util.Objects;
@@ -40,23 +46,24 @@
/**
* 获取会员列表
*/
- @PreAuthorize("@ss.hasPermi('im:user:list')")
+// @PreAuthorize("@ss.hasPermi('im:user:list')")
@GetMapping("/list")
public TableDataInfo list(UserAccountVo vo)
{
// 创建查询条件包装器
+
LambdaQueryWrapper<UserAccount> queryWrapper = new LambdaQueryWrapper<>();
// 只有当 keyword 不为空时才添加 OR 条件
- if (ObjectUtil.isNotEmpty(vo.getKeyword())) {
+ if (ObjectUtil.isNotEmpty(vo.getKeywords())) {
queryWrapper.and(wrapper -> wrapper
- .eq(UserAccount::getId, vo.getKeyword())
+ .eq(UserAccount::getId, vo.getKeywords())
.or()
- .eq(UserAccount::getPhoneNumber, vo.getKeyword())
+ .like(UserAccount::getPhoneNumber, vo.getKeywords())
.or()
- .eq(UserAccount::getAccount, vo.getKeyword())
+ .like(UserAccount::getAccount, vo.getKeywords())
.or()
- .eq(UserAccount::getNickname, vo.getKeyword())
+ .like(UserAccount::getNickname, vo.getKeywords())
);
}
@@ -69,14 +76,24 @@
// 默认按创建时间倒序
queryWrapper.orderByDesc(UserAccount::getCreateTime);
+ startPage();
List<UserAccount> list = userAccountService.list(queryWrapper);
- return getDataTable(list);
+
+ PageInfo<UserAccount> pageInfo = new PageInfo<>(list);
+
+ List<UserAccountOut> toList = ConverterUtil.convertToList(list, UserAccountOut.class);
+ TableDataInfo rspData = new TableDataInfo();
+ rspData.setCode(HttpStatus.SUCCESS);
+ rspData.setMsg("查询成功");
+ rspData.setRows(toList);
+ rspData.setTotal(pageInfo.getTotal());
+ return rspData;
}
/**
* 修改会员
*/
- @PreAuthorize("@ss.hasPermi('im:user:updateUserAccount')")
+// @PreAuthorize("@ss.hasPermi('im:user:updateUserAccount')")
@PostMapping("/updateUserAccount")
public AjaxResult updateUserAccount(UserAccountUpdateVo vo) {
@@ -85,6 +102,11 @@
if(ObjectUtil.isEmpty(userAccount)){
return AjaxResult.error("会员不存在！");
}
+ PhoneNumberValidatorUtil.ValidationResult result = PhoneNumberValidatorUtil.validatePhoneNumber(vo.getPhoneNumber());
+ if(!result.isValid()){
+ return AjaxResult.error("手机号格式不正确！");
+ }
+ vo.setAccountId(userAccount.getCloudMessageAccount());
return imApiServcie.updateUserAccount(vo);
}catch (Exception e){
e.printStackTrace();
@@ -94,17 +116,36 @@
}
/**
- * 批量注册
+ * 创建会员
*/
@PostMapping("/batchRegister")
public Result batchRegister(@Validated RegisterDto dto){
try {
+ if(null == dto.getType()){
+ return Result.error("类型不能为空");
+ }else if(dto.getType() == 2){
+ if(StringUtils.isEmpty(dto.getAccount())){
+ return Result.error("账号不能为空");
+ }
+ if(StringUtils.isEmpty(dto.getPassword())){
+ return Result.error("密码不能为空");
+ }
+ if(StringUtils.isEmpty(dto.getNickname())){
+ return Result.error("昵称不能为空");
+ }
+ }else if (dto.getType() == 1){
+ if(dto.getNumber() <= 0){
+ return Result.error("数量不能为空");
+ }else if(dto.getNumber() > 100){
+ return Result.error("批量注册最多一次100");
+ }
+ }
return imApiServcie.batchRegister(dto);
}catch (Exception e){
- log.error("批量注册报错：",e);
+ e.printStackTrace();
+ log.error("-----------批量注册报错------------");
return Result.error("注册失败，请稍后再试！");
}
}
-
}
--
Gitblit v1.9.3