fix bugs

8 months ago · 09e091f2e1
parent b8107fe9ab
commit 09e091f2e1
5 changed files with 40 additions and 22 deletions
--- a/know_sub_business/src/main/java/com/supervision/knowsub/controller/system/UserController.java
+++ b/know_sub_business/src/main/java/com/supervision/knowsub/controller/system/UserController.java
@ -4,11 +4,8 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.supervision.knowsub.exception.BusinessException;
 import com.supervision.knowsub.service.UserManageService;
-import com.supervision.knowsub.vo.user.LoginReqVO;
-import com.supervision.knowsub.vo.user.LoginResVO;
-import com.supervision.knowsub.vo.user.UserInfoReqVo;
+import com.supervision.knowsub.vo.user.*;
 import com.supervision.knowsub.dto.user.UserInfoDTO;
-import com.supervision.knowsub.vo.user.UserStatusReqVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@ -61,7 +58,7 @@ public class UserController {

    @Operation(summary = "删除用户信息")
    @DeleteMapping("/delete")
-    public Boolean deleteRole(@Parameter(name = "id") @RequestParam(name="id") String id) {
+    public Boolean deleteUser(@Parameter(name = "id") @RequestParam(name="id") String id) {
        return userManageService.deleteUser(id);
    }
    @Operation(summary = "查看用户信息列表")
@ -78,9 +75,9 @@ public class UserController {


    @Operation(summary = "重置用户密码")
-    @GetMapping("/resetPW")
-    public Boolean resetPW(@Parameter(name = "id") @RequestParam(name="id") String id) {
-        return userManageService.resetPW(id);
+    @PutMapping("/resetPW")
+    public Boolean resetPW(@RequestBody UserPwReqVo userPwReqVo) {
+        return userManageService.resetPW(userPwReqVo);
    }


--- a/know_sub_business/src/main/java/com/supervision/knowsub/service/UserManageService.java
+++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/UserManageService.java
@ -2,11 +2,8 @@ package com.supervision.knowsub.service;

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.supervision.knowsub.model.SystemUser;
-import com.supervision.knowsub.vo.user.LoginReqVO;
-import com.supervision.knowsub.vo.user.LoginResVO;
-import com.supervision.knowsub.vo.user.UserInfoReqVo;
+import com.supervision.knowsub.vo.user.*;
 import com.supervision.knowsub.dto.user.UserInfoDTO;
-import com.supervision.knowsub.vo.user.UserStatusReqVo;

 import java.util.List;

@ -29,7 +26,7 @@ public interface UserManageService {

    IPage<UserInfoDTO> list(String userName, String deptId, String roleId, String roleName,Integer pageNum, Integer pageSize);

-    Boolean resetPW(String id);
+    Boolean resetPW(UserPwReqVo userPwReqVo);

    void updateUserStatus(UserStatusReqVo userStatusReqVo);
 }
--- a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/DeptManageServiceImpl.java
+++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/DeptManageServiceImpl.java
@ -26,6 +26,8 @@ public class DeptManageServiceImpl implements DeptManageService {
        Assert.notEmpty(deptInfoReqVo.getDeptName(), "部门名称不能为空");
        Assert.notEmpty(deptInfoReqVo.getDeptCode(), "部门编码不能为空");

+        Long count = systemDeptService.lambdaQuery().eq(SystemDept::getDeptCode, deptInfoReqVo.getDeptCode()).count();
+        Assert.isTrue(count == 0, "部门编码已存在");
        SystemDept systemDept = new SystemDept();
        systemDept.setDeptCode(deptInfoReqVo.getDeptCode());
        systemDept.setDeptName(deptInfoReqVo.getDeptName());
@ -45,6 +47,11 @@ public class DeptManageServiceImpl implements DeptManageService {
        Assert.notEmpty(deptInfoReqVo.getDeptName(), "部门名称不能为空");
        Assert.notEmpty(deptInfoReqVo.getDeptCode(), "部门编码不能为空");

+        Long count = systemDeptService.lambdaQuery()
+                .eq(SystemDept::getDeptCode, deptInfoReqVo.getDeptCode())
+                .ne(SystemDept::getId, deptInfoReqVo.getId()).count();
+        Assert.isTrue(count == 0, "部门编码已存在,请换一个部门编码");
+
        SystemDept systemDept = new SystemDept();
        systemDept.setId(deptInfoReqVo.getId());
        systemDept.setDeptCode(deptInfoReqVo.getDeptCode());
--- a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/UserManageServiceImpl.java
+++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/UserManageServiceImpl.java
@ -20,11 +20,8 @@ import com.supervision.knowsub.service.UserManageService;
 import com.supervision.knowsub.service.UserRoleRelationManageService;
 import com.supervision.knowsub.util.TokenUtil;
 import com.supervision.knowsub.util.UserUtil;
-import com.supervision.knowsub.vo.user.LoginReqVO;
-import com.supervision.knowsub.vo.user.LoginResVO;
-import com.supervision.knowsub.vo.user.UserInfoReqVo;
+import com.supervision.knowsub.vo.user.*;
 import com.supervision.knowsub.dto.user.UserInfoDTO;
-import com.supervision.knowsub.vo.user.UserStatusReqVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@ -58,6 +55,9 @@ public class UserManageServiceImpl implements UserManageService {
        if (user.isEmpty() || !UserUtil.checkUserPassword(reqVO.getPassword(), user.get().getUserPd())) {
            throw new BusinessException("用户名或密码有误！");
        }
+        if (user.get().getStatus() == 1){
+            throw new BusinessException("该用户已被停用，请联系管理员！");
+        }
        UserInfo userInfoToken = BeanUtil.copyProperties(user.get(), UserInfo.class);
        // 更新用户最近的登录时间
        systemUserService.lambdaUpdate().set(SystemUser::getRecentLoginTime, LocalDateTime.now()).eq(SystemUser::getId, user.get().getId()).update();
@ -146,7 +146,7 @@ public class UserManageServiceImpl implements UserManageService {
        Assert.notEmpty(id, "用户id不能为空");
        SystemUser systemUser = systemUserService.getById(id);
        Assert.notNull(systemUser, "用户不存在");
-        Assert.isTrue(systemUser.getStatus() == 0, "该用户已启用，不能删除");
+        Assert.isFalse(systemUser.getStatus() == 0, "该用户已启用，不能删除");

        systemUserService.removeById(id);

@ -185,10 +185,13 @@ public class UserManageServiceImpl implements UserManageService {
    }

    @Override
-    public Boolean resetPW(String id) {
-        Assert.notEmpty(id, "用户id不能为空");
-        return systemUserService.lambdaUpdate().set(SystemUser::getUserPd, UserUtil.signPassword(defaultPassword))
-                .eq(SystemUser::getId, id).update();
+    public Boolean resetPW(UserPwReqVo userPwReqVo) {
+        Assert.notEmpty(userPwReqVo.getId(), "用户id不能为空");
+        Assert.notEmpty(userPwReqVo.getPassword(), "密码不能为空");
+
+        return systemUserService.lambdaUpdate()
+                .set(SystemUser::getUserPd, UserUtil.signPassword(userPwReqVo.getPassword()))
+                .eq(SystemUser::getId, userPwReqVo.getId()).update();
    }

    @Override
--- a/know_sub_model/src/main/java/com/supervision/knowsub/vo/user/UserPwReqVo.java
+++ b/know_sub_model/src/main/java/com/supervision/knowsub/vo/user/UserPwReqVo.java
@ -0,0 +1,14 @@
+package com.supervision.knowsub.vo.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class UserPwReqVo {
+
+    @Schema(description = "用户id")
+    private String id;
+
+    @Schema(description = "新密码")
+    private String password;
+}