用户管理类调整

common/src/main/java/com/lantone/common/vo/LoginVO.java

@@ -4,10 +4,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 
 /**
- * @Description: 用户登录参数
+ * @Description: 登录以后返回token—接口入参
  * @author: rengb
  * @time: 2021/1/5 18:27
  */
@@ -15,11 +15,11 @@ import javax.validation.constraints.NotEmpty;
 @Setter
 public class LoginVO {
 
-    @NotEmpty
+    @NotBlank(message = "用户名不能为空")
     @ApiModelProperty(value = "用户名", required = true)
     private String username;
 
-    @NotEmpty
+    @NotBlank(message = "密码不能为空")
     @ApiModelProperty(value = "密码", required = true)
     private String password;
 

security-center/src/main/java/com/lantone/security/facade/DictionaryInfoManagementFacade.java

@@ -22,7 +22,7 @@ import java.util.Date;
  * </p>
  */
 @Component
-public class DictionaryInfoManagementFacade{
+public class DictionaryManagementFacade {
     @Autowired
     private DictionaryInfoFacade dictionaryInfoFacade;
 

security-center/src/main/java/com/lantone/security/facade/UserAdminFacade.java

@@ -50,7 +50,7 @@ import java.util.Map;
  * @time: 2021/7/20 12:39
  */
 @Component
-public class UserAdminFacade {
+public class UserManagementFacade {
 
     @Autowired
     private AuthService authService;

security-center/src/main/java/com/lantone/security/web/DataAuthManagementController.java

@@ -25,14 +25,12 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
- * @ClassName: DataAuthController
  * @Description: 数据权限API
- * @Author songxl
- * @Date 2021/7/21
- * @Version 1.0
+ * @author: songxl
+ * @time: 2021/7/20 12:39
  */
 @RestController
-@Api(value = "数据权限API", tags = "DataAuthManagementController")
+@Api(value = "数据权限API", tags = { "数据权限API" })
 @RequestMapping("/dataAuthManage")
 public class DataAuthManagementController {
     @Autowired
@@ -55,7 +53,7 @@ public class DataAuthManagementController {
     @ApiOperation(value = "启用禁用数据权限[by:songxl]")
     @PostMapping("/disableAuth")
     @Transactional
-    public CommonResult<Boolean> disableAuth(@RequestParam @Valid @NotNull(message = "数据权限id为空") Long id,@RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
+    public CommonResult<Boolean> disableAuth(@RequestParam @Valid @NotNull(message = "数据权限id为空") Long id, @RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
         return CommonResult.success(dataAuthHandleFacade.disableDataAuth(id, status));
     }
 

security-center/src/main/java/com/lantone/security/web/DictionaryManagementController.java

@@ -2,10 +2,10 @@ package com.lantone.security.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
-import com.lantone.common.vo.SaveDictionaryVO;
 import com.lantone.common.vo.GetDictionaryVO;
+import com.lantone.common.vo.SaveDictionaryVO;
 import com.lantone.dblayermbg.entity.DictionaryInfo;
-import com.lantone.security.facade.DictionaryInfoManagementFacade;
+import com.lantone.security.facade.DictionaryManagementFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,18 +19,16 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.validation.Valid;
 
 /**
- * @ClassName: DictionaryManagementController
- * @Description: 字典管理
- * @Author cy
- * @Date 2021/7/29
- * @Version 1.0
+ * @Description: 字典管理API
+ * @author: cy
+ * @time: 2021/7/20 12:39
  */
 @RestController
 @Api(value = "字典管理API", tags = { "字典管理API" })
 @RequestMapping("/dictionaryManage")
 public class DictionaryManagementController {
     @Autowired
-    private DictionaryInfoManagementFacade dictionaryInfoFacade;
+    private DictionaryManagementFacade dictionaryManagementFacade;
 
     @ApiOperation(value = "新增/修改字典[by:cy]",
             notes = "id:新增操作为null<br>" +
@@ -42,7 +40,7 @@ public class DictionaryManagementController {
     @PostMapping("/saveDictionary")
     @Transactional
     public CommonResult<Object> saveDictionary(@RequestBody @Valid SaveDictionaryVO saveDictionaryVO) {
-        return CommonResult.success(dictionaryInfoFacade.saveDictionary(saveDictionaryVO));
+        return CommonResult.success(dictionaryManagementFacade.saveDictionary(saveDictionaryVO));
     }
 
     @ApiOperation(value = "查看字典管理[by:cy]",
@@ -50,7 +48,7 @@ public class DictionaryManagementController {
                     "groupType:代码类别，<br>")
     @PostMapping("/getDictionary")
     public CommonResult<IPage<DictionaryInfo>> getDictionary(@RequestBody GetDictionaryVO getDictionaryVO) {
-        return CommonResult.success(dictionaryInfoFacade.getDictionary(getDictionaryVO));
+        return CommonResult.success(dictionaryManagementFacade.getDictionary(getDictionaryVO));
     }
 
     @ApiOperation(value = "删除字典管理[by:cy]",
@@ -58,6 +56,6 @@ public class DictionaryManagementController {
     @PostMapping("/deleteDictionary")
     @Transactional
     public CommonResult<Boolean> deleteDictionary(@RequestParam Integer id) {
-        return CommonResult.success(dictionaryInfoFacade.deleteDictionary(id));
+        return CommonResult.success(dictionaryManagementFacade.deleteDictionary(id));
     }
 }

security-center/src/main/java/com/lantone/security/web/FuncManagementController.java

@@ -23,14 +23,12 @@ import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
- * @ClassName: FuncManagementController
  * @Description: 功能管理API
- * @Author songxl
- * @Date 2021/7/27
- * @Version 1.0
+ * @author: songxl
+ * @time: 2021/7/20 12:39
  */
 @RestController
-@Api(value = "功能管理API", tags = "FuncManagementController")
+@Api(value = "功能管理API", tags = { "功能管理API" })
 @RequestMapping("/funcManage")
 public class FuncManagementController {
     @Autowired
@@ -52,14 +50,14 @@ public class FuncManagementController {
     @ApiOperation(value = "修改功能菜单 [by:songxl]")
     @PostMapping("/updateMenu")
     @Transactional
-    public CommonResult<Boolean> updateMenu(@RequestBody  @Valid UpdateMenuVO updateMenuVO) {
+    public CommonResult<Boolean> updateMenu(@RequestBody @Valid UpdateMenuVO updateMenuVO) {
         return CommonResult.success(funcManagementFacade.updateMenu(updateMenuVO));
     }
 
     @ApiOperation(value = "获取菜单详情 [by:songxl]")
     @PostMapping("/getMenuById")
     public CommonResult<GetMenuByIdDTO> getMenuById(@RequestParam @Valid @NotNull(message = "功能菜单编号为空") Long id, @RequestParam @Valid @NotNull(message = "系统编号为空") Long softwareId) {
-        return CommonResult.success(funcManagementFacade.getMenuById(id,softwareId));
+        return CommonResult.success(funcManagementFacade.getMenuById(id, softwareId));
     }
 
     @ApiOperation(value = "删除功能菜单 [by:songxl]")
@@ -72,7 +70,7 @@ public class FuncManagementController {
     @ApiOperation(value = "启用禁用功能菜单 [by:songxl]")
     @PostMapping("/disableMenu")
     @Transactional
-    public CommonResult<Boolean> disableMenu(@RequestParam @Valid @NotNull(message = "功能菜单id为空") Long id,@RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
+    public CommonResult<Boolean> disableMenu(@RequestParam @Valid @NotNull(message = "功能菜单id为空") Long id, @RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
         return CommonResult.success(funcManagementFacade.disableMenu(id, status));
     }
 

security-center/src/main/java/com/lantone/security/web/HospitalManagementController.java

@@ -1,6 +1,5 @@
 package com.lantone.security.web;
 
-
 import com.lantone.security.facade.HospitalManagementFacade;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,12 +7,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 组织管理API
+ * @Description: 组织管理API
+ * @author: songxl
+ * @time: 2021/7/20 12:39
  */
 @RestController
-@Api(value = "组织管理API", tags = "HospitalManagementController")
+@Api(value = "组织管理API", tags = { "组织管理API" })
 @RequestMapping("/hospitalManage")
 public class HospitalManagementController {
     @Autowired
     private HospitalManagementFacade hospitalManagementFacade;
-}
+
+}

security-center/src/main/java/com/lantone/security/web/HospitalSetManagementController.java

@@ -1,4 +1,5 @@
 package com.lantone.security.web;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
 import com.lantone.common.vo.GetHospitalSetVO;
@@ -14,14 +15,13 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+
 import javax.validation.Valid;
 
 /**
- * @ClassName: HospitalSetManagementController
- * @Description: 参数管理
- * @Author cy
- * @Date 2021/7/30
- * @Version 1.0
+ * @Description: 参数管理API
+ * @author: cy
+ * @time: 2021/7/20 12:39
  */
 @RestController
 @Api(value = "参数管理API", tags = { "参数管理API" })

security-center/src/main/java/com/lantone/security/web/RegionManagementController.java

@@ -23,11 +23,9 @@ import javax.validation.Valid;
 import java.util.List;
 
 /**
- * @ClassName: RegionManagementController
- * @Description: 病区管理
- * @Author cy
- * @Date 2021/7/27
- * @Version 1.0
+ * @Description: 病区管理API
+ * @author: cy
+ * @time: 2021/7/20 12:39
  */
 @RestController
 @Api(value = "病区管理API", tags = { "病区管理API" })
@@ -74,7 +72,7 @@ public class RegionManagementController {
 
 
     @ApiOperation(value = "删除病区管理[by:cy]",
-            notes =  "id:病区id，必填<br>")
+            notes = "id:病区id，必填<br>")
     @PostMapping("/deleteRegion")
     @Transactional
     public CommonResult<Boolean> deleteRegion(@RequestParam Integer id) {
@@ -82,7 +80,7 @@ public class RegionManagementController {
     }
 
     @ApiOperation(value = "获取科室列表[by:cy]",
-            notes =  "标记（0-返回科室列表 1-返回互斥科室列表），必填<br>")
+            notes = "标记（0-返回科室列表 1-返回互斥科室列表），必填<br>")
     @PostMapping("/getDeptList")
     public CommonResult<List<Dept>> getDeptList(@RequestBody @Valid GetDeptListVO getDeptListVO) {
         return CommonResult.success(sysRegionFacade.getDept(getDeptListVO));

security-center/src/main/java/com/lantone/security/web/RoleManagementController.java

@@ -26,14 +26,12 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @ClassName: RoleManagementController
  * @Description: 角色管理API
- * @Author songxl
- * @Date 2021/7/27
- * @Version 1.0
+ * @author: songxl
+ * @time: 2021/7/20 12:39
  */
 @RestController
-@Api(value = "角色管理API", tags = "RoleManagementController")
+@Api(value = "角色管理API", tags = { "角色管理API" })
 @RequestMapping("/roleManage")
 public class RoleManagementController {
     @Autowired
@@ -71,8 +69,8 @@ public class RoleManagementController {
     @ApiOperation(value = "禁用|启用角色 [by:songxl]")
     @PostMapping("/disableRole")
     @Transactional
-    public CommonResult<Boolean> disableRole(@RequestParam @Valid @NotNull(message = "角色编号为空") Long roleId,@RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
-        return CommonResult.success(roleManagementFacade.disableRole(roleId,status));
+    public CommonResult<Boolean> disableRole(@RequestParam @Valid @NotNull(message = "角色编号为空") Long roleId, @RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
+        return CommonResult.success(roleManagementFacade.disableRole(roleId, status));
     }
 
     @ApiOperation(value = "通过角色id获取角色详情 [by:songxl]")
@@ -80,11 +78,13 @@ public class RoleManagementController {
     public CommonResult<GetRoleDTO> getRoleById(@RequestParam @Valid @NotNull(message = "角色编号为空") Long roleId) {
         return CommonResult.success(roleManagementFacade.getRoleById(roleId));
     }
+
     @ApiOperation(value = "获取当前登录用户的功能权限树 [by:songxl]")
     @PostMapping("/getUserMenuResourceTree")
-    public CommonResult<Map<Long,List<UserMenuResourceTreeDTO>>> getUserMenuResourceTree() {
+    public CommonResult<Map<Long, List<UserMenuResourceTreeDTO>>> getUserMenuResourceTree() {
         return CommonResult.success(roleManagementFacade.getUserMenuResourceTree());
     }
+
     @ApiOperation(value = "获取当前登录用户创建的角色列表 [by:songxl]")
     @PostMapping("/getCreateRoles")
     public CommonResult<List<GetCreateRoleDTO>> getCreateRoles() {

security-center/src/main/java/com/lantone/security/web/UserAdminController.java

@@ -8,7 +8,7 @@ import com.lantone.common.dto.GetUserDTO;
 import com.lantone.common.vo.AddUserVO;
 import com.lantone.common.vo.LoginVO;
 import com.lantone.common.vo.UpdateUserVO;
-import com.lantone.security.facade.UserAdminFacade;
+import com.lantone.security.facade.UserManagementFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,22 +27,22 @@ import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
- * @Description: 用户管理
- * @author: rengb
- * @time: 2021/1/5 18:27
+ * @Description: 用户管理API
+ * @author: songxl
+ * @time: 2021/7/20 12:39
  */
 @RestController
-@Api(tags = "UserAdminController", description = "用户管理")
-@RequestMapping("/userAdmin")
-public class UserAdminController {
+@Api(value = "用户管理API", tags = { "用户管理API" })
+@RequestMapping("/userManage")
+public class UserManagementController {
 
     @Autowired
-    private UserAdminFacade userAdminFacade;
+    private UserManagementFacade userManagementFacade;
 
     @ApiOperation(value = "登录以后返回token")
     @RequestMapping(value = "/login", method = RequestMethod.POST)
     public CommonResult login(@Validated @RequestBody LoginVO loginVO) {
-        return userAdminFacade.login(loginVO);
+        return userManagementFacade.login(loginVO);
     }
 
     @ApiOperation(value = "登出功能")
@@ -78,44 +78,46 @@ public class UserAdminController {
     @PostMapping("/addUser")
     @Transactional
     public CommonResult<Boolean> addUser(@RequestBody @Valid AddUserVO addUserVO) {
-        return CommonResult.success(userAdminFacade.addUser(addUserVO));
+        return CommonResult.success(userManagementFacade.addUser(addUserVO));
     }
+
     @ApiOperation(value = "修改用户 [by:songxl]")
     @PostMapping("/updateUser")
     @Transactional
     public CommonResult<Boolean> updateUser(@RequestBody @Valid UpdateUserVO updateUserVO) {
-        return CommonResult.success(userAdminFacade.updateUser(updateUserVO));
+        return CommonResult.success(userManagementFacade.updateUser(updateUserVO));
     }
 
     @ApiOperation(value = "删除用户 [by:songxl]")
     @PostMapping("/deleteUser")
     @Transactional
     public CommonResult<Boolean> deleteUser(@RequestParam @Valid @NotNull(message = "用户编号为空") Long userId) {
-        return CommonResult.success(userAdminFacade.deleteUser(userId));
+        return CommonResult.success(userManagementFacade.deleteUser(userId));
     }
 
 
     @ApiOperation(value = "禁用|启用用户 [by:songxl]")
     @PostMapping("/disableUser")
     @Transactional
-    public CommonResult<Boolean> disableUser(@RequestParam @Valid @NotNull(message = "用户编号为空") Long userId,@RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
-        return CommonResult.success(userAdminFacade.disableUser(userId,status));
+    public CommonResult<Boolean> disableUser(@RequestParam @Valid @NotNull(message = "用户编号为空") Long userId, @RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
+        return CommonResult.success(userManagementFacade.disableUser(userId, status));
     }
 
     @ApiOperation(value = "查看用户 [by:songxl]")
     @PostMapping("/getUserById")
-    public CommonResult<GetUserDTO> getUserById(@RequestParam @Valid @NotNull(message = "用户编号为空") Long userId,Long local) {
-        return CommonResult.success(userAdminFacade.getUserById(userId,local));
+    public CommonResult<GetUserDTO> getUserById(@RequestParam @Valid @NotNull(message = "用户编号为空") Long userId, Long local) {
+        return CommonResult.success(userManagementFacade.getUserById(userId, local));
     }
+
     @ApiOperation(value = "获取登录用户的组织机构树 [by:songxl]")
     @PostMapping("/getHospitalTree")
     public CommonResult<List<GetHospitalTreeDTO>> getLoginUserHospitalTree() {
-        return CommonResult.success(userAdminFacade.getLoginUserHospitalTree());
+        return CommonResult.success(userManagementFacade.getLoginUserHospitalTree());
     }
 
-//    @ApiOperation(value = "获取当前用户所在组织的用户列表 [by:songxl]")
-//    @PostMapping("/getUserPage")
-//    public CommonResult<List<GetHospitalTreeDTO>> getUserPage(GetUserPageVO getUserPageVO) {
-//        return CommonResult.success(userAdminFacade.getLoginUserHospitalTree());
-//    }
+    //    @ApiOperation(value = "获取当前用户所在组织的用户列表 [by:songxl]")
+    //    @PostMapping("/getUserPage")
+    //    public CommonResult<List<GetHospitalTreeDTO>> getUserPage(GetUserPageVO getUserPageVO) {
+    //        return CommonResult.success(userAdminFacade.getLoginUserHospitalTree());
+    //    }
 }