相关功能注释补全

common/src/main/java/com/lantone/common/dto/MenuDTO.java

@@ -34,7 +34,7 @@ public class MenuDTO implements Serializable {
 
     @ApiModelProperty(value = "功能名称")
     private String name;
-    @ApiModelProperty(value = "功能名称")
+    @ApiModelProperty(value = "父类功能名称")
     private String parentName;
 
     @ApiModelProperty(value = "类型：0:目录，1菜单，2按钮，3：超链接")

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

@@ -45,6 +45,4 @@ public class DataAuthVO extends Page implements Serializable {
     @ApiModelProperty("系统列表")
     private List<SysSoftwareVO> softwareVOS;
 
-    @ApiModelProperty("角色列表")
-    private List<Long> roles;
 }

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

@@ -23,8 +23,6 @@ public class RoleSoftwareMenuVo implements Serializable {
     @ApiModelProperty(value = "服务id")
     private Long softwareId;
 
-    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
-    private String isDeleted;
 
 
 }

dblayer-mbg/src/main/resources/mapper/DataAuthMapper.xml

@@ -94,6 +94,7 @@
         AND auth.is_deleted = 'N'
         AND rauth.is_deleted = 'N'
         AND sauth.is_deleted = 'N'
+        AND auth.creator = #{dataAuthVO.creator}
         <if test="dataAuthVO.status != null ">
             AND auth.`status` = #{dataAuthVO.status}
         </if>

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

@@ -27,6 +27,13 @@ import com.lantone.dblayermbg.entity.Dept;
 import com.lantone.dblayermbg.entity.Hospital;
 import com.lantone.dblayermbg.entity.RoleSoftwareDataAuth;
 import com.lantone.dblayermbg.entity.SoftwareDataAuth;
+import com.lantone.dblayermbg.facade.DataAuthDetailFacade;
+import com.lantone.dblayermbg.facade.DataAuthFacade;
+import com.lantone.dblayermbg.facade.DeptFacade;
+import com.lantone.dblayermbg.facade.DoctorFacade;
+import com.lantone.dblayermbg.facade.HospitalFacade;
+import com.lantone.dblayermbg.facade.RoleSoftwareDataAuthFacade;
+import com.lantone.dblayermbg.facade.SoftwareDataAuthFacade;
 import com.lantone.dblayermbg.service.impl.DataAuthServiceImpl;
 import com.lantone.security.enums.CRUDEnum;
 import com.lantone.security.enums.DataAuthDataTypeEnum;
@@ -55,7 +62,7 @@ import java.util.stream.Collectors;
  * @Version 1.0
  */
 @Component
-public class DataAuthHandleFacade extends DataAuthServiceImpl {
+public class DataAuthHandleFacade  {
     @Autowired
     private DataAuthFacade dataAuthFacade;
     @Autowired
@@ -225,7 +232,7 @@ public class DataAuthHandleFacade extends DataAuthServiceImpl {
         //        dataAuth.setCreator(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
         BeanUtils.copyProperties(serviceDataAuthVO.getDataAuthVO(), dataAuth);
         dataAuth.setGmtCreate(DateUtil.now());
-        dataAuth.setCreator("1");
+        dataAuth.setCreator("1");//###当前登录人
         boolean dataAuthInsert = dataAuthFacade.save(dataAuth);
         if (dataAuthInsert) {
             //2.插入成功获取新生成的数据权限名称编号data_auth_id
@@ -373,7 +380,7 @@ public class DataAuthHandleFacade extends DataAuthServiceImpl {
             Asserts.fail("数据权限ID为空");
         }
         DataAuthDTO dataAuthDTO = new DataAuthDTO();
-        List<SoftwareRoleDataAuthDetailDTO> serviceRoleDataAuthDetailDTOS = this.baseMapper.getDataAuthById(serviceDataAuthVO);
+        List<SoftwareRoleDataAuthDetailDTO> serviceRoleDataAuthDetailDTOS = dataAuthFacade.getBaseMapper().getDataAuthById(serviceDataAuthVO);
         if (ListUtil.isNotEmpty(serviceRoleDataAuthDetailDTOS)) {
             //1.添加数据权限信息
             dataAuthDTO.setId(serviceRoleDataAuthDetailDTOS.get(0).getDataAuthId());
@@ -390,7 +397,7 @@ public class DataAuthHandleFacade extends DataAuthServiceImpl {
                 //4.1添加数据权限详情列表
                 //                List<ServiceRoleDataAuthDetailDTO> oneServiceRoleDataAuthDetailDTOS = serviceRoleDataAuthDetailDTOS.stream()
                 //                        .filter(serviceRoleDataAuthDetailDTO -> serviceRoleDataAuthDetailDTO.getServiceId() == id).collect(Collectors.toList());
-                List<SoftwareRoleDataAuthDetailDTO> oneServiceRoleDataAuthDetailDTOS = this.baseMapper.getOneSoftwareRoleDataAuthDetail(id, serviceDataAuthVO.getDataAuthVO().getId());
+                List<SoftwareRoleDataAuthDetailDTO> oneServiceRoleDataAuthDetailDTOS = dataAuthFacade.getBaseMapper().getOneSoftwareRoleDataAuthDetail(id, serviceDataAuthVO.getDataAuthVO().getId());
 
                 List<DataAuthDetailDTO> dataAuthDetailDTOS = new ArrayList<>();
                 //4.2.1是否获取当前组织-科室信息 dataAuthDetailDTOS去重
@@ -559,6 +566,7 @@ public class DataAuthHandleFacade extends DataAuthServiceImpl {
      * @MethodName getDataAuthPage
      */
     public IPage<DataAuthDTO> getDataAuthPage(DataAuthVO dataAuthVO) {
+        dataAuthVO.setCreator(1l);//###当前登录人
         return dataAuthFacade.getBaseMapper().getDataAuthPage(dataAuthVO);
     }
 }

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

@@ -15,6 +15,11 @@ import com.lantone.dblayermbg.entity.MenuResource;
 import com.lantone.dblayermbg.entity.Resource;
 import com.lantone.dblayermbg.entity.RoleSoftwareMenu;
 import com.lantone.dblayermbg.entity.SoftwareMenu;
+import com.lantone.dblayermbg.facade.MenuFacade;
+import com.lantone.dblayermbg.facade.MenuResourceFacade;
+import com.lantone.dblayermbg.facade.ResourceFacade;
+import com.lantone.dblayermbg.facade.RoleSoftwareMenuFacade;
+import com.lantone.dblayermbg.facade.SoftwareMenuFacade;
 import com.lantone.security.enums.CRUDEnum;
 import com.lantone.security.enums.IsDeleteEnum;
 import org.springframework.beans.BeanUtils;

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

@@ -27,14 +27,17 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @Api( value = "数据权限API",tags = "DataAuthController")
 @RequestMapping("/data/auth")
-public class DataAuthController {
+public class DataAuthManagementController {
     @Autowired
     private DataAuthHandleFacade dataAuthHandleFacade;
 
     @ApiOperation(value = "新增数据权限[by:songxl]",
             notes = "dataAuthVO:数据权限对象，必填<br>" +
+                    "name:数据权限对象-数据权限名称，必填<br>" +
+                    "status:数据权限对象-1:默认启用，必填<br>" +
+                    "softwareVOS:数据权限对象-系统列表，必填<br>" +
                     "roles:角色列表，必填<br>" +
-                    "type:操作码 1：新增；2：修改 ；3：删除；5:启用禁用")
+                    "type:操作码 1：新增；2：修改；3：删除；5:启用禁用")
     @PostMapping("/addAuth")
     @Transactional
     public CommonResult<Boolean> addAuth(@RequestBody SoftwareDataAuthVO softwareDataAuthVO) {
@@ -43,6 +46,7 @@ public class DataAuthController {
 
     @ApiOperation(value = "修改数据权限[by:songxl]",
             notes = "dataAuthVO:数据权限对象，必填<br>" +
+                    "id:数据权限对象-数据权限id，必填<br>" +
                     "roles:角色列表，必填<br>" +
                     "type:操作码 1：新增；2：修改；3：删除；5:启用禁用")
     @PostMapping("/updateAuth")
@@ -52,6 +56,7 @@ public class DataAuthController {
     }
     @ApiOperation(value = "启用禁用数据权限[by:songxl]",
             notes = "dataAuthVO:数据权限对象，必填<br>" +
+                    "id:数据权限对象-数据权限id，必填<br>" +
                     "roles:角色列表，必填<br>" +
                     "type:操作码 1：新增；2：修改；3：删除；5:启用禁用")
     @PostMapping("/disableAuth")
@@ -62,6 +67,7 @@ public class DataAuthController {
 
     @ApiOperation(value = "删除数据权限[by:songxl]",
             notes = "dataAuthVO:数据权限对象，必填<br>" +
+                    "id:数据权限对象-数据权限id，必填<br>" +
                     "roles:角色列表，必填<br>" +
                     "type:操作码 1：新增；2：修改；3：删除；5:启用禁用")
     @PostMapping("/deleteAuth")
@@ -72,6 +78,7 @@ public class DataAuthController {
 
     @ApiOperation(value = "通过数据权限id和角色id获取数据权限详情[by:songxl]",
             notes = "dataAuthVO:数据权限对象，必填<br>" +
+                    "id:数据权限对象-数据权限id，必填<br>" +
                     "roles:角色列表，必填<br>" +
                     "type:操作码 1：新增；2：修改；3：删除；5:启用禁用")
     @PostMapping("/getDataAuthById")
@@ -89,8 +96,7 @@ public class DataAuthController {
     }
 
     @ApiOperation(value = "获取数据权限列表[by:songxl]",
-            notes = "id:医院编号，必填<br>" +
-                    "depts:该医院的科室列表" )
+            notes = "" )
     @PostMapping("/getDataAuthPage")
     public CommonResult<IPage<DataAuthDTO>> getDataAuthPage(@RequestBody DataAuthVO dataAuthVO) {
         return CommonResult.success(dataAuthHandleFacade.getDataAuthPage(dataAuthVO));

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

@@ -31,8 +31,7 @@ public class FuncManagementController {
     private FuncManagementFacade funcManagementFacade;
 
     @ApiOperation(value = "获取功能菜单列表 [by:songxl]",
-            notes = "RoleServiceMenuVo:角色系统功能菜单对象，必填<br>" +
-                    "roles:角色列表，必填<br>" +
+            notes = "roles:角色id列表，必填<br>" +
                     "serviceId:服务id ，必填<br>")
     @PostMapping("/getMenus")
     public CommonResult<List<MenuDTO>> getMenus(@RequestBody RoleSoftwareMenuVo roleServiceMenuVo) {
@@ -40,7 +39,11 @@ public class FuncManagementController {
     }
 
     @ApiOperation(value = "添加功能菜单 [by:songxl]",
-            notes = "menuVO:功能菜单对象，必填<br>" +
+            notes = "parentId:父级编号，必填<br>" +
+                    "softwares:服务id列表，必填<br>" +
+                    "name:功能名称，必填<br>" +
+                    "type:类型：0:目录，1菜单，2按钮，3：超链接，必填<br>" +
+                    "status:状态 0:禁用，1：启用，必填<br>" +
                     "opeType:操作码 1：新增；2：修改 ；3：删除；5:启用禁用")
     @PostMapping("/addMenu")
     @Transactional
@@ -48,7 +51,12 @@ public class FuncManagementController {
         return CommonResult.success(funcManagementFacade.CRUDOperation(menuVO));
     }
     @ApiOperation(value = "修改功能菜单 [by:songxl]",
-            notes = "menuVO:功能菜单对象，必填<br>" +
+            notes = "Id:编号，必填<br>" +
+                    "parentId:父级编号，必填<br>" +
+                    "softwares:服务id列表，必填<br>" +
+                    "name:功能名称，必填<br>" +
+                    "type:类型：0:目录，1菜单，2按钮，3：超链接，必填<br>" +
+                    "status:状态 0:禁用，1：启用，必填<br>" +
                     "opeType:操作码 1：新增；2：修改 ；3：删除；5:启用禁用")
     @PostMapping("/updateMenu")
     @Transactional
@@ -56,13 +64,13 @@ public class FuncManagementController {
         return CommonResult.success(funcManagementFacade.CRUDOperation(menuVO));
     }
     @ApiOperation(value = "获取菜单详情 [by:songxl]",
-            notes = "menuVO:功能菜单对象")
+            notes = "Id:编号，必填<br>" )
     @PostMapping("/getMenuById")
     public CommonResult<MenuDTO> getMenuById(@RequestBody MenuVO menuVO) {
         return CommonResult.success(funcManagementFacade.getMenuById(menuVO));
     }
     @ApiOperation(value = "删除功能菜单 [by:songxl]",
-            notes = "menuVO:功能菜单对象，必填<br>" +
+            notes = "Id:编号，必填<br>" +
                     "opeType:操作码 1：新增；2：修改 ；3：删除；5:启用禁用")
     @PostMapping("/deleteMenu")
     @Transactional
@@ -70,7 +78,7 @@ public class FuncManagementController {
         return CommonResult.success(funcManagementFacade.CRUDOperation(menuVO));
     }
     @ApiOperation(value = "启用禁用功能菜单 [by:songxl]",
-            notes = "menuVO:功能菜单对象，必填<br>" +
+            notes = "Id:编号，必填<br>" +
                     "opeType:操作码 1：新增；2：修改 ；3：删除；5:启用禁用")
     @PostMapping("/disableMenu")
     @Transactional

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

@@ -0,0 +1,81 @@
+package com.lantone.security.web;
+
+import com.lantone.common.api.CommonResult;
+import com.lantone.common.dto.MenuDTO;
+import com.lantone.common.vo.MenuVO;
+import com.lantone.common.vo.RoleSoftwareMenuVo;
+import com.lantone.security.facade.FuncManagementFacade;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @ClassName: FuncManagementController
+ * @Description: 功能管理API
+ * @Author songxl
+ * @Date 2021/7/27
+ * @Version 1.0
+ */
+@RestController
+@Api(value = "功能管理API", tags = "FuncManagementController")
+@RequestMapping("/func/management")
+public class RoleManagementController {
+    @Autowired
+    private FuncManagementFacade funcManagementFacade;
+
+    @ApiOperation(value = "获取功能菜单列表 [by:songxl]",
+            notes = "RoleServiceMenuVo:角色系统功能菜单对象，必填<br>" +
+                    "roles:角色列表，必填<br>" +
+                    "serviceId:服务id ，必填<br>")
+    @PostMapping("/getMenus")
+    public CommonResult<List<MenuDTO>> getMenus(@RequestBody RoleSoftwareMenuVo roleServiceMenuVo) {
+        return CommonResult.success(funcManagementFacade.getMenusTree(roleServiceMenuVo));
+    }
+
+    @ApiOperation(value = "添加功能菜单 [by:songxl]",
+            notes = "menuVO:功能菜单对象，必填<br>" +
+                    "opeType:操作码 1：新增；2：修改 ；3：删除；5:启用禁用")
+    @PostMapping("/addMenu")
+    @Transactional
+    public CommonResult<Boolean> addMenu(@RequestBody MenuVO menuVO) {
+        return CommonResult.success(funcManagementFacade.CRUDOperation(menuVO));
+    }
+    @ApiOperation(value = "修改功能菜单 [by:songxl]",
+            notes = "menuVO:功能菜单对象，必填<br>" +
+                    "opeType:操作码 1：新增；2：修改 ；3：删除；5:启用禁用")
+    @PostMapping("/updateMenu")
+    @Transactional
+    public CommonResult<Boolean> updateMenu(@RequestBody MenuVO menuVO) {
+        return CommonResult.success(funcManagementFacade.CRUDOperation(menuVO));
+    }
+    @ApiOperation(value = "获取菜单详情 [by:songxl]",
+            notes = "menuVO:功能菜单对象")
+    @PostMapping("/getMenuById")
+    public CommonResult<MenuDTO> getMenuById(@RequestBody MenuVO menuVO) {
+        return CommonResult.success(funcManagementFacade.getMenuById(menuVO));
+    }
+    @ApiOperation(value = "删除功能菜单 [by:songxl]",
+            notes = "menuVO:功能菜单对象，必填<br>" +
+                    "opeType:操作码 1：新增；2：修改 ；3：删除；5:启用禁用")
+    @PostMapping("/deleteMenu")
+    @Transactional
+    public CommonResult<Boolean> deleteMenu(@RequestBody MenuVO menuVO) {
+        return CommonResult.success(funcManagementFacade.CRUDOperation(menuVO));
+    }
+    @ApiOperation(value = "启用禁用功能菜单 [by:songxl]",
+            notes = "menuVO:功能菜单对象，必填<br>" +
+                    "opeType:操作码 1：新增；2：修改 ；3：删除；5:启用禁用")
+    @PostMapping("/disableMenu")
+    @Transactional
+    public CommonResult<Boolean> disableMenu(@RequestBody MenuVO menuVO) {
+        return CommonResult.success(funcManagementFacade.CRUDOperation(menuVO));
+    }
+
+}