From 01bd03652fef2399c2acfb1930d044b106393f85 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 21 Aug 2025 03:35:37 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java | 69 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 14 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..095fe20 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,19 @@
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.service.ImApiServcie;
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,10 +28,14 @@
@RestController
@RequestMapping("/im/user")
+@Slf4j
public class UserController extends BaseController {
@Autowired
UserAccountService userAccountService;
+
+ @Autowired
+ private ImApiServcie imApiServcie;
/**
* 获取会员列表
@@ -34,19 +44,32 @@
@GetMapping("/list")
public TableDataInfo list(UserAccountVo vo)
{
- 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())
- );
+ // 创建查询条件包装器
+ 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);
+ List<UserAccount> list = userAccountService.list(queryWrapper);
return getDataTable(list);
}
@@ -54,11 +77,15 @@
* 修改会员
*/
@PreAuthorize("@ss.hasPermi('im:user:updateUserAccount')")
- @GetMapping("/updateUserAccount")
+ @PostMapping("/updateUserAccount")
public AjaxResult updateUserAccount(UserAccountUpdateVo vo) {
try {
UserAccount userAccount = userAccountService.getById(vo.getId());
+ if(ObjectUtil.isEmpty(userAccount)){
+ return AjaxResult.error("会员不存在！");
+ }
+ return imApiServcie.updateUserAccount(vo);
}catch (Exception e){
e.printStackTrace();
logger.error("修改会员失败！");
@@ -66,4 +93,18 @@
return AjaxResult.success();
}
+ /**
+ * 批量注册
+ */
+ @PostMapping("/batchRegister")
+ public Result batchRegister(@Validated RegisterDto dto){
+ try {
+ return imApiServcie.batchRegister(dto);
+ }catch (Exception e){
+ log.error("批量注册报错：",e);
+ return Result.error("注册失败，请稍后再试！");
+ }
+ }
+
+
}
--
Gitblit v1.9.3