fix(属性树结构查询修改): 属性树结构查询修改

属性树结构查询修改

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/attr/controller/AttrController.java

@@ -54,11 +54,15 @@ public class AttrController {
     @ApiOperation(value = "根据父级id，删除主客体属性")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "parentId", value = "parentId属性父类id"),
-            @ApiImplicitParam(name = "attrType", value = "属性类别  SUB:主体属性 OBJ:客体属性")
+            @ApiImplicitParam(name = "attrType", value = "属性类别  SUB:主体属性 OBJ:客体属性"),
+            @ApiImplicitParam(name = "attrBelongType", value = "属性所属的主客体类别  USER:人员 ORG:机构 APP:应用 FUN:功能  SER:服务")
     })
     @GetMapping(value = "deleteByParentId")
-    public Result deleteByParentId(@RequestParam("parentId") String parentId, @RequestParam("attrType") String attrType) {
-        Boolean b = attrFacade.deleteByParentId(parentId,attrType);
+    public Result deleteByParentId(@RequestParam("parentId") String parentId,
+                                   @RequestParam("attrType") String attrType,
+                                   @RequestParam("attrBelongType") String attrBelongType
+                                   ) {
+        Boolean b = attrFacade.deleteByParentId(parentId,attrBelongType,attrType);
         if (b) {
             return Result.success();
         } else {
@@ -67,13 +71,10 @@ public class AttrController {
     }
 
     @ApiOperation(value = "根据属性所属类别获取属性列表,返回树结构")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "attrBelongType", value = "parentId属性父类id"),
-            @ApiImplicitParam(name = "attrType", value = "属性类别  SUB:主体属性 OBJ:客体属性")
-    })
+    @ApiImplicitParam(name = "attrType", value = "属性类别  SUB:主体属性 OBJ:客体属性")
     @GetMapping(value = "getAttrTreeList")
-    public Result getAttrTreeList(@RequestParam("attrBelongType") String attrBelongType, @RequestParam("attrType") String attrType) {
-         List<AttrAcceptDTO> list = attrFacade.getAttrTreeList(attrBelongType,attrType);
+    public Result getAttrTreeList(@RequestParam("attrType") String attrType) {
+         List<AttrAcceptDTO> list = attrFacade.getAttrTreeList(attrType);
          return Result.success(list);
     }
 
@@ -95,7 +96,7 @@ public class AttrController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "attrId", value = "parentId属性父类id"),
             @ApiImplicitParam(name = "attrType", value = "属性类别  SUB:主体属性 OBJ:客体属性"),
-            @ApiImplicitParam(name = "attrBelongType", value = "属性所属的主客体类别  USER:人员 ORG:机构 APP:应用")
+            @ApiImplicitParam(name = "attrBelongType", value = "属性所属的主客体类别  USER:人员 ORG:机构 APP:应用 FUN:功能  SER:服务")
     })
     @GetMapping(value = "attrRelToIds")
     public Result<List<String>> attrRelToIds(@RequestParam("attrId") String attrId,

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/attr/vo/AttrAcceptVo.java

@@ -23,7 +23,7 @@ public class AttrAcceptVo {
     @ApiModelProperty(value = "属性类别  SUB:主体属性 OBJ:客体属性")
     private String attrType;
 
-    @ApiModelProperty(value = "属性所属的主客体类别  USER:人员 ORG:机构 APP:应用")
+    @ApiModelProperty(value = "属性所属的主客体类别  USER:人员 ORG:机构 APP:应用 FUN:功能  SER:服务")
     private String attrBelongType;
 
     @ApiModelProperty(value = "属性名称")

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/attr/vo/AttrRelAcceptVo.java

@@ -20,7 +20,7 @@ public class AttrRelAcceptVo {
     @ApiModelProperty(value = "属性类别  SUB:主体属性 OBJ:客体属性")
     private String attrType;
 
-    @ApiModelProperty(value = "属性所属的主客体类别  USER:人员 ORG:机构 APP:应用")
+    @ApiModelProperty(value = "属性所属的主客体类别  USER:人员 ORG:机构 APP:应用 FUN:功能  SER:服务")
     private String attrBelongType;
 
     @ApiModelProperty(value = "主客体id集合")

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/attr/vo/RelSearchVo.java

@@ -24,7 +24,7 @@ public class RelSearchVo {
     @ApiModelProperty(value = "属性类别  SUB:主体属性 OBJ:客体属性")
     private String attrType;
 
-    @ApiModelProperty(value = "属性所属的主客体类别  USER:人员 ORG:机构 APP:应用")
+    @ApiModelProperty(value = "属性所属的主客体类别  USER:人员 ORG:机构 APP:应用 FUN:功能  SER:服务")
     private String attrBelongType;
 
     @ApiModelProperty(value = "主客体名称")