From 0e56b5f69158762cc9474187d414aedc5aa9fa42 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 20 Aug 2025 18:32:32 +0800
Subject: [PATCH] 1
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountVo.java | 7 +++
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountUpdateVo.java | 63 +++++++++++++++++++++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java | 34 ++++++++++++++--
3 files changed, 99 insertions(+), 5 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 fbf3f1e..83fdc8f 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
@@ -1,10 +1,14 @@
package com.ruoyi.web.controller.user;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.StringUtils;
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 org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +18,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
+import java.util.Objects;
@RestController
@RequestMapping("/im/user")
@@ -23,7 +28,7 @@
UserAccountService userAccountService;
/**
- * 获取用户列表
+ * 获取会员列表
*/
@PreAuthorize("@ss.hasPermi('im:user:list')")
@GetMapping("/list")
@@ -31,15 +36,34 @@
{
startPage();
List<UserAccount> list = userAccountService.list(new LambdaQueryWrapper<UserAccount>()
- .eq(UserAccount::getId, vo.getId())
+ .eq(UserAccount::getId, vo.getKeyword())
.or()
- .eq(UserAccount::getPhoneNumber, vo.getPhoneNumber())
+ .eq(UserAccount::getPhoneNumber, vo.getKeyword())
.or()
- .eq(UserAccount::getAccount, vo.getAccount())
+ .eq(UserAccount::getAccount, vo.getKeyword())
.or()
- .eq(UserAccount::getNickname, vo.getNickname())
+ .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);
}
+ /**
+ * 修改会员
+ */
+ @PreAuthorize("@ss.hasPermi('im:user:updateUserAccount')")
+ @GetMapping("/updateUserAccount")
+ public AjaxResult updateUserAccount(UserAccountUpdateVo vo) {
+
+ try {
+ UserAccount userAccount = userAccountService.getById(vo.getId());
+ }catch (Exception e){
+ e.printStackTrace();
+ logger.error("修改会员失败！");
+ }
+ return AjaxResult.success();
+ }
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountUpdateVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountUpdateVo.java
new file mode 100644
index 0000000..4acaeb1
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountUpdateVo.java
@@ -0,0 +1,63 @@
+package com.ruoyi.system.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @program: ruoyiim
+ * @description:
+ * @create: 2025-08-20 15:31
+ **/
+@Data
+public class UserAccountUpdateVo {
+
+
+ // 自增ID主键
+ @TableId(type = IdType.AUTO) // 主键自增
+ private Integer id;
+
+ // 手机号（唯一）
+ private String phoneNumber;
+
+ // 密码
+ private String password;
+
+ // 账号类型: 0:真实 1:虚拟
+ private Integer accountType = 0;
+
+ // 昵称
+ private String nickname;
+
+ // 账号状态: 0:正常 1:禁用
+ private Integer status = 0;
+
+ // 个性签名
+ private String signature;
+
+ // 是否支持昵称搜索
+ private Boolean supportNicknameSearch = true;
+
+ // 是否支持手机搜索
+ private Boolean supportPhoneSearch = true;
+
+ // 是否支持ID搜索
+ private Boolean supportIdSearch = true;
+
+ // 是否支持用户名搜索
+ private Boolean supportUsernameSearch = true;
+
+ // 是否申请删除账号
+ private Boolean requestDelete = true;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountVo.java
index 166d958..07ce4f6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountVo.java
@@ -13,6 +13,8 @@
@Data
public class UserAccountVo {
+ private String keyword;
+
// 自增ID主键
private Integer id;
@@ -69,4 +71,9 @@
private Date updateTime;
private Boolean deleted;
+
+ //开始时间
+ private Date startTime;
+ //结束时间
+ private Date endTime;
}
--
Gitblit v1.9.3