用户列表、新增用户
This commit is contained in:
@@ -1,6 +1,10 @@
|
|||||||
package com.zmzm.finance.common.controller;
|
package com.zmzm.finance.common.controller;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
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 lombok.extern.slf4j.Slf4j;
|
||||||
import com.zmzm.finance.common.entity.Customer;
|
import com.zmzm.finance.common.entity.Customer;
|
||||||
import com.zmzm.finance.common.entity.WumenUser;
|
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.common.service.WumenUserService;
|
||||||
import com.zmzm.finance.util.R;
|
import com.zmzm.finance.util.R;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
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.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@RestController("commonUser")
|
@RestController("commonUser")
|
||||||
@RequestMapping("common/user")
|
@RequestMapping("common/user")
|
||||||
public class UserController {
|
public class UserController {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private UserServiceImpl userService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private WumenUserService wumenUserService;
|
private WumenUserService wumenUserService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private CustomerService customerService;
|
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")
|
@RequestMapping("/getUser")
|
||||||
public R getUserContribution(){
|
public R getUserContribution(){
|
||||||
|
|||||||
Reference in New Issue
Block a user