#

luxiaotao1123

2024-02-22 b9efed08b3cf24f3f30b915b17557efd93195940

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

@@ -4,15 +4,19 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.common.annotation.OperationLog;
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
import com.zy.asrs.wcs.system.entity.User;
import com.zy.asrs.wcs.system.entity.UserRole;
import com.zy.asrs.wcs.system.service.UserRoleService;
import com.zy.asrs.wcs.system.service.UserService;
import com.zy.asrs.wcs.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
@@ -26,6 +30,8 @@

    @Autowired
    private UserService userService;
    @Autowired
    private UserRoleService userRoleService;

    @PreAuthorize("hasAuthority('system:user:list')")
    @PostMapping("/user/page")
@@ -33,6 +39,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')")
@@ -51,6 +65,18 @@
    @OperationLog("添加用户")
    @PostMapping("/user/save")
    public R save(@RequestBody User user) {
        if (!Cools.isEmpty(user.getUsername())
                && userService.count(new LambdaQueryWrapper<User>().eq(User::getUsername, user.getUsername())) > 0) {
            return R.error("登录账号已存在");
        }
        if (!Cools.isEmpty(user.getNickname())
                && userService.count(new LambdaQueryWrapper<User>().eq(User::getNickname, user.getNickname())) > 0) {
            return R.error("用户名称已存在");
        }
        if (!Cools.isEmpty(user.getPhone())
                && userService.count(new LambdaQueryWrapper<User>().eq(User::getPhone, user.getPhone())) > 0) {
            return R.error("手机号已存在");
        }

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

@@ -69,6 +95,21 @@
    @OperationLog("修改用户")
    @PostMapping("/user/update")
    public R update(@RequestBody User user) {
        if (!Cools.isEmpty(user.getUsername()) && userService.count(new LambdaQueryWrapper<User>()
                .eq(User::getUsername, user.getUsername())
                .ne(User::getId, user.getId())) > 0) {
            return R.error("登录账号已存在");
        }
        if (!Cools.isEmpty(user.getNickname()) && userService.count(new LambdaQueryWrapper<User>()
                .eq(User::getNickname, user.getNickname())
                .ne(User::getId, user.getId())) > 0) {
            return R.error("用户名称已存在");
        }
        if (!Cools.isEmpty(user.getPhone()) && userService.count(new LambdaQueryWrapper<User>()
                .eq(User::getPhone, user.getPhone())
                .ne(User::getId, user.getId())) > 0) {
            return R.error("手机号已存在");
        }

        if (!Cools.isEmpty(user.getPassword())) {
            user.setPassword(userService.encodePassword(user.getPassword()));
@@ -86,9 +127,15 @@
    @PreAuthorize("hasAuthority('system:user:remove')")
    @OperationLog("删除用户")
    @PostMapping("/user/remove/{ids}")
    @Transactional
    public R remove(@PathVariable Long[] ids) {
        if (!userService.removeByIds(Arrays.asList(ids))) {
            return R.error("删除失败");
        for (Long userId : ids) {
            if (!userService.removeById(userId)) {
                throw new CoolException("服务器内部错误");
            }
            if (!userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, userId))) {
                throw new CoolException("服务器内部错误");
            }
        }
        return R.ok("删除成功");
    }