#

luxiaotao1123

2024-02-21 7d3040d4c742af5e13f7327e7397a0524c1ffdec

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java

@@ -16,14 +16,13 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;

@RestController
@RequestMapping("/api")
public class UserController extends BaseController {

    public static final String COMMON_PASSWORD = "123456";

    @Autowired
    private UserService userService;
@@ -34,6 +33,14 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<User, BaseParam> pageParam = new PageParam<>(baseParam, User.class);
        return R.ok().add(userService.page(pageParam, pageParam.buildWrapper(true)));
    }

    @PreAuthorize("hasAuthority('system:user:list')")
    @PostMapping("/user/page1")
    public R page1(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<User, BaseParam> pageParam = new PageParam<>(baseParam, User.class);
        return R.ok().add(userService.pageRel(pageParam));
    }

    @PreAuthorize("hasAuthority('system:user:list')")
@@ -52,6 +59,14 @@
    @OperationLog("添加用户")
    @PostMapping("/user/save")
    public R save(@RequestBody User user) {

        user.setPassword(userService.encodePassword(COMMON_PASSWORD));

        user.setCreateBy(getLoginUserId());
        user.setCreateTime(new Date());
        user.setUpdateBy(getLoginUserId());
        user.setUpdateTime(new Date());

        if (!userService.save(user)) {
            return R.error("添加失败");
        }
@@ -62,6 +77,14 @@
    @OperationLog("修改用户")
    @PostMapping("/user/update")
    public R update(@RequestBody User user) {

        if (!Cools.isEmpty(user.getPassword())) {
            user.setPassword(userService.encodePassword(user.getPassword()));
        }

        user.setUpdateBy(getLoginUserId());
        user.setUpdateTime(new Date());

        if (!userService.updateById(user)) {
            return R.error("修改失败");
        }
@@ -98,4 +121,19 @@
        ExcelUtil.build(ExcelUtil.create(userService.list(), User.class), response);
    }

    @PreAuthorize("hasAuthority('system:user:update')")
    @OperationLog("重置密码")
    @PostMapping("/user/reset/pwd")
    public R resetPwd(@RequestBody User user) {
        if (!Cools.isEmpty(user.getPassword())) {
            user.setPassword(userService.encodePassword(user.getPassword()));
        }
        user.setUpdateBy(getLoginUserId());
        user.setUpdateTime(new Date());
        if (!userService.updateById(user)) {
            return R.error("重置失败");
        }
        return R.ok("重置成功");
    }

}