feature(权限自助申请接口补充): 权限自助申请接口补充

1.查询已被添加为红名单的功能id
2.查询未添加白名单人员列表
3.查询已申请的功能权限

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/list/controller/RedListController.java

@@ -48,7 +48,7 @@ public class RedListController {
     }
 
     @ApiOperation(value = "功能红名单添加")
-    @PostMapping("userWhiteListAdd")
+    @PostMapping("funRedListAdd")
     public Result userWhiteListAdd(@RequestBody List<AppFunRedListAddVo> addVoList) {
         if(CollectionUtils.isEmpty(addVoList)) {
             return Result.fail();
@@ -89,4 +89,13 @@ public class RedListController {
         return Result.success();
     }
 
+    @ApiOperation(value = "查询已被添加为红名单的功能id")
+    @ApiImplicitParam(name = "appId", value = "appId 应用id 非必选,不填时查询所有")
+    @GetMapping("funIdsInRedList")
+    public Result<List<String>> funIdsInRedList(@RequestParam(value = "appId", required = false) String appId) {
+        List<String> funIds = redListFacade.funIdsInRedList(appId);
+        return Result.success(funIds);
+    }
+
+
 }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/selfauth/controller/SelfAuthAppLyController.java

@@ -129,5 +129,15 @@ public class SelfAuthAppLyController {
        return Result.success(resultVos);
     }
 
-
+    @ApiOperation(value = "获取申请人已被授权的功能id")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "userId", value = "用户id"),
+            @ApiImplicitParam(name = "appId", value = "应用id 非必填,不选时查询所有应用")
+    })
+    @GetMapping(value = "userHasAuthFunIds")
+    public Result<List<String>> userHasAuthFunIds(@RequestParam("userId") String userId,
+                                                  @RequestParam(value = "appId" ,required = false) String appId) {
+        List<String> funIds = appFunResultFacade.userHasAuthFunIds(userId, appId);
+        return Result.success(funIds);
+    }
 }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/sub/AuthUserInfoController.java

@@ -2,16 +2,24 @@ package com.dragoninfo.dcuc.authweb.restcontroller.sub;
 
 import com.dragoninfo.dcuc.auth.sub.dto.AuthUserDTO;
 import com.dragoninfo.dcuc.auth.sub.facade.IAuthUserInfoFacade;
+import com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.user.AuthUserVo;
 import com.dragoninfo.duceap.core.response.Result;
 import com.dragonsoft.duceap.core.search.Searchable;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+import java.util.stream.Collectors;
 
+/**
+ * @author wangrs
+ * @date 2021-04-27
+ */
 @Api(tags = {"授权管理-主客体管理-用户信息"})
 @RestController
 @RequestMapping(value = "authsvr/v2/authuserinfo")
@@ -31,9 +39,11 @@ public class AuthUserInfoController {
     @ApiOperation(value = "用户信息详情")
     @ApiImplicitParam(name = "id", value = "id")
     @GetMapping(value = "/detail/{id}")
-    public AuthUserDTO detail(@PathVariable(value = "id") String id) {
+    public AuthUserVo detail(@PathVariable(value = "id") String id) {
         AuthUserDTO authUserInfo = userInfoFacade.get(id);
-        return authUserInfo;
+        AuthUserVo authUserVo = new AuthUserVo();
+        BeanUtils.copyProperties(authUserInfo,authUserVo);
+        return authUserVo;
     }
 
     @ApiOperation(value = "用户信息删除")
@@ -44,4 +54,20 @@ public class AuthUserInfoController {
         return Result.success();
     }
 
+    @ApiOperation(value = "机构下未添加白名单的人员")
+    @ApiImplicitParam(name = "searchable", value = "searchable 查询条件：orgId：= ; name：like； idcard：like")
+    @PostMapping("whiteListUserPage")
+    public Result whiteListUserPage(Searchable searchable) {
+        Page<AuthUserDTO> userPage = userInfoFacade.whiteListUserPage(searchable.toSearchDTO());
+        List<AuthUserDTO> content = userPage.getContent();
+        List<AuthUserVo> voList = content.stream().map(item -> {
+            AuthUserVo vo = new AuthUserVo();
+            BeanUtils.copyProperties(item, vo);
+            return vo;
+        }).collect(Collectors.toList());
+        return Result.success(userPage.getTotalElements(), voList);
+    }
+
+
+
 }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/sub/vo/user/AuthUserVo.java

@@ -1,81 +1,110 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.user;
 
+import io.swagger.annotations.ApiModelProperty;
+
 /**
  * @author mazq
  * @date 2021/6/11
  */
 public class AuthUserVo {
 
+    @ApiModelProperty(value = "id")
     private String id;
 
     /**
      * 身份证
      */
+    @ApiModelProperty(value = "身份证")
     private String idcard;
 
     /**
      * 姓名
      */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
     /**
      * 性别
      */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
     /**
      * 用户类型
      */
+    @ApiModelProperty(value = "用户类型")
     private String userType;
 
     /**
      * 警号
      */
+    @ApiModelProperty(value = "警号")
     private String policeNumber;
 
+    /**
+     * 所在机构id
+     */
+    @ApiModelProperty(value = "所在机构id")
+    private String orgId;
+
     /**
      * 所在机构编码
      */
+    @ApiModelProperty(value = "所在机构编码")
     private String orgCode;
 
     /**
      * 所在机构名称
      */
+    @ApiModelProperty(value = "所在机构名称")
     private String orgName;
 
     /**
      * 人员身份类型10：民警 15：现役特警 20：辅警 25：外部党政人员 30：在编文员  99999：其他工勤人员
      */
+    @ApiModelProperty(value = "人员身份类型")
     private String manType;
 
+    /**
+     * 辅警类型 （10：合同工、20：聘用、 30：事业编、 90：其它）
+     */
+    @ApiModelProperty(value = "辅警类型 （10：合同工、20：聘用、 30：事业编、 90：其它）")
+    private String auxiliaryType;
+
     /**
      * 警种
      */
+    @ApiModelProperty(value = "警种")
     private String policeCategory;
 
     /**
      * 职级
      */
+    @ApiModelProperty(value = "职级")
     private String title;
 
     /**
      * 警衔
      */
+    @ApiModelProperty(value = "警衔")
     private String rank;
 
     /**
      * 业务域标签
      */
+    @ApiModelProperty(value = "业务域标签")
     private String policeBusiness;
 
     /**
      * 删除标识
      */
+    @ApiModelProperty(value = "删除标识")
     private String deleted;
 
     /**
      * 所属区域
      */
+    @ApiModelProperty(value = "所属区域")
     private String area;
 
 }