添加修改密码、重置密码

whyczh

2021-07-01 2e0bc686f2100782fa1d331cc98b5f65ba19c206

 src/main/java/com/whyc/controller/UserController.java

@@ -14,6 +14,7 @@
import com.whyc.service.JobService;
import com.whyc.service.LoginService;
import com.whyc.service.UserService;
import com.whyc.util.DigestsUtil;
import com.whyc.util.UserExcelVerify;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
@@ -50,14 +51,14 @@

    @PostMapping
    @ApiOperation(value = "添加用户")
    @RequiresPermissions(value = {"user:add","user:update"},logical = Logical.OR)
    //@RequiresPermissions(value = {"user:add","user:update"},logical = Logical.OR)
    public Response add(@RequestBody User user){
        return userService.add(user);
    }

    @GetMapping
    @ApiOperation(value = "查询用户byId")
    @RequiresPermissions(value = {"user:get"})
    //@RequiresPermissions(value = {"user:get"})
    public Response getById(@RequestParam int id){
        User user = userService.getById(id);
        if (user==null){
@@ -68,44 +69,67 @@

    @GetMapping("/all")
    @ApiOperation(value = "查询所有用户")
    @RequiresPermissions(value = {"user:get"})
    //@RequiresPermissions(value = {"user:get"})
    public List<User> getAll(){
        return userService.getAll();
    }

    @GetMapping("/page")
    @ApiOperation(value = "查询用户分页")
    @RequiresPermissions(value = {"user:get"})
    //@RequiresPermissions(value = {"user:get"})
    public IPage<User> getPage(@RequestParam int pageNum,@RequestParam int pageSize){
        Page<Object> page = new Page<>(pageNum, pageSize);
        return userService.getAllWithPage(page);
    }
    @PostMapping("/search")
    @ApiOperation(value = "查询用户分页-根据筛选条件")
    @RequiresPermissions(value = {"user:get"})
    //@RequiresPermissions(value = {"user:get"})
    public Response<IPage<User>> getPageByCondition(@RequestParam int pageNum,@RequestParam int pageSize,@RequestBody User user){
        return userService.getPageByCondition(pageNum,pageSize,user);
    }

    @GetMapping("validatePassword")
    @ApiOperation(value = "验证密码")
    public boolean validatePassword(@RequestParam int id, @RequestParam String password){
        return userService.validatePassword(id,password);
    }
    @GetMapping("getSaltPassword")
    @ApiOperation(value = "获取加密密码")
    public String getSaltPassword(@RequestParam String password,@RequestParam String salt){
        return DigestsUtil.sha1(password,salt);
    }
    @PutMapping("updatePassword")
    @ApiOperation(value = "修改密码")
    public Response updatePassword(@RequestParam int id,@RequestParam String password){
        return userService.updatePassword(id,password);
    }

    @PutMapping("resetPassword")
    @ApiOperation(value = "重置密码")
    public Response resetPassword(@RequestParam int id){
        return userService.resetPassword(id);
    }


    @PutMapping
    @ApiOperation(value = "编辑用户")
    @RequiresPermissions(value = {"user:update"})
    //@RequiresPermissions(value = {"user:update"})
    public Response update(@RequestBody User user){
        return userService.update(user);
    }

    @PutMapping("freezeUser")
    @ApiOperation(value = "冻结用户")
    @RequiresPermissions(value = {"user:update"})
    public Response updateUserFreeze(@RequestParam int id){
        return userService.updateUserFreeze(id);
    @ApiOperation(value = "启动/冻结用户")
    //@RequiresPermissions(value = {"user:update"})
    public Response updateUserFreeze(@RequestParam int id,@RequestParam int state){
        return userService.updateUserFreeze(id,state);
    }

    @PutMapping("deleteUser")
    @ApiOperation(value = "删除用户")
    @RequiresPermissions(value = {"user:delete"})
    //@RequiresPermissions(value = {"user:delete"})
    public Response delete(@RequestParam int id){
        return userService.deleteUser(id);
        return userService.delete(id);
    }

    /**
@@ -129,6 +153,7 @@
    public Response addDept(@RequestBody Dept dept){
        return deptService.add(dept);
    }

    @PutMapping("updateDept")
    @ApiOperation(value = "编辑部门")
    public Response update(@RequestBody Dept dept){