From a441a1665bc8dd78b70cc842ad9777ff0ec6daee Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sat, 23 Aug 2025 02:11:45 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java | 104 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 88 insertions(+), 16 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 83fdc8f..5743639 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
@@ -7,13 +7,22 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
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;
import com.ruoyi.system.service.UserAccountService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -22,43 +31,72 @@
@RestController
@RequestMapping("/im/user")
+@Slf4j
public class UserController extends BaseController {
@Autowired
UserAccountService userAccountService;
+ @Autowired
+ private ImApiServcie imApiServcie;
+
/**
* 获取会员列表
*/
- @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())) {
+ queryWrapper.and(wrapper -> wrapper
+ .eq(UserAccount::getId, vo.getKeyword())
+ .or()
+ .eq(UserAccount::getPhoneNumber, vo.getKeyword())
+ .or()
+ .eq(UserAccount::getAccount, vo.getKeyword())
+ .or()
+ .eq(UserAccount::getNickname, vo.getKeyword())
+ );
+ }
+
+ // 添加其他条件
+ queryWrapper
+ .eq(ObjectUtil.isNotEmpty(vo.getAccountType()), UserAccount::getAccountType, vo.getAccountType())
+ .eq(ObjectUtil.isNotEmpty(vo.getStatus()), UserAccount::getStatus, vo.getStatus())
+ .between(ObjectUtil.isAllNotEmpty(vo.getStartTime(), vo.getEndTime()),
+ UserAccount::getCreateTime, vo.getStartTime(), vo.getEndTime());
+
+ // 默认按创建时间倒序
+ queryWrapper.orderByDesc(UserAccount::getCreateTime);
startPage();
- List<UserAccount> list = userAccountService.list(new LambdaQueryWrapper<UserAccount>()
- .eq(UserAccount::getId, vo.getKeyword())
- .or()
- .eq(UserAccount::getPhoneNumber, vo.getKeyword())
- .or()
- .eq(UserAccount::getAccount, vo.getKeyword())
- .or()
- .eq(UserAccount::getNickname, vo.getKeyword())
- .eq(ObjectUtil.isNotEmpty(vo.getAccountType()),UserAccount::getAccountType,vo.getAccountType())
- .eq(ObjectUtil.isNotEmpty(vo.getStatus()),UserAccount::getStatus,vo.getStatus())
- .between(UserAccount::getCreateTime,vo.getStartTime(),vo.getEndTime())
- );
- return getDataTable(list);
+ List<UserAccount> list = userAccountService.list(queryWrapper);
+ List<UserAccountOut> toList = ConverterUtil.convertToList(list, UserAccountOut.class);
+ return getDataTable(toList);
}
/**
* 修改会员
*/
- @PreAuthorize("@ss.hasPermi('im:user:updateUserAccount')")
- @GetMapping("/updateUserAccount")
+// @PreAuthorize("@ss.hasPermi('im:user:updateUserAccount')")
+ @PostMapping("/updateUserAccount")
public AjaxResult updateUserAccount(UserAccountUpdateVo vo) {
try {
UserAccount userAccount = userAccountService.getById(vo.getId());
+ 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();
logger.error("修改会员失败！");
@@ -66,4 +104,38 @@
return AjaxResult.success();
}
+ /**
+ * 创建会员
+ */
+ @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){
+ e.printStackTrace();
+ log.error("-----------批量注册报错------------");
+ return Result.error("注册失败，请稍后再试！");
+ }
+ }
+
+
}
--
Gitblit v1.9.3