From fb8b8df0141efd790686658443928eea77017efe Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Mon, 15 Dec 2025 13:37:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E3=80=81?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/controller/UserController.java     | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/main/java/com/zmzm/finance/common/controller/UserController.java b/src/main/java/com/zmzm/finance/common/controller/UserController.java
index f550b05..0d9446e 100644
--- a/src/main/java/com/zmzm/finance/common/controller/UserController.java
+++ b/src/main/java/com/zmzm/finance/common/controller/UserController.java
@@ -1,6 +1,10 @@
 package com.zmzm.finance.common.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zmzm.finance.common.entity.User;
+import com.zmzm.finance.common.service.impl.UserServiceImpl;
+import com.zmzm.finance.util.MD5Utils;
 import lombok.extern.slf4j.Slf4j;
 import com.zmzm.finance.common.entity.Customer;
 import com.zmzm.finance.common.entity.WumenUser;
@@ -8,19 +12,44 @@ import com.zmzm.finance.common.service.CustomerService;
 import com.zmzm.finance.common.service.WumenUserService;
 import com.zmzm.finance.util.R;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import java.util.Map;
 
 @Slf4j
 @RestController("commonUser")
 @RequestMapping("common/user")
 public class UserController {
 
+    @Autowired
+    private UserServiceImpl userService;
     @Autowired
     private WumenUserService wumenUserService;
     @Autowired
     private CustomerService customerService;
 
+    //用户列表
+    @RequestMapping("/getUserList")
+    public R getUserList(@RequestBody Map<String,Object> params){
+        Page<User> userList = userService.page(new Page<>(Long.parseLong(params.get("page").toString()),
+                Long.parseLong(params.get("limit").toString())));
+        return R.ok().put("userList",userList);
+    }
+
+    //新增用户
+    @RequestMapping("/addUser")
+    public R addUser(@RequestBody User user){
+        long count = userService.count(new LambdaQueryWrapper<User>().eq(User::getAccount, user.getAccount()));
+        if(count>0){
+            return R.error(500,"账号已注册");
+        }
+        String saltMD5 = MD5Utils.getSaltMD5(user.getPassword());
+        user.setPassword(saltMD5);
+        userService.save(user);
+        return R.ok();
+    }
+
     //测试用户
     @RequestMapping("/getUser")
     public R getUserContribution(){