Merge branch 'mazq-authApiModify-230222' into 'develop'

Mazq auth api modify 230222

See merge request dcuc-tjdsj/auth-back!134

src/main/java/com/dragoninfo/dcuc/authweb/business/MtAuthBusiness.java → src/main/java/com/dragoninfo/dcuc/authweb/business/impl/MtAuthBusiness.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.authweb.business;
+package com.dragoninfo.dcuc.authweb.business.impl;
 
 import com.dragoninfo.dcuc.auth.admin.facade.*;
 import com.dragoninfo.dcuc.authweb.common.SysConstants;

src/main/java/com/dragoninfo/dcuc/authweb/config/DcucAuthWebConfig.java

@@ -28,6 +28,4 @@ public class DcucAuthWebConfig {
      * 凭据鉴权类型
      */
     private CheckTypeEnum checkTypeEnum = CheckTypeEnum.TOKEN;
-
-
 }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v2/controller/DataAuthApiV2Controller.java

@@ -2,17 +2,14 @@ package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v2.controller
 
 import cn.hutool.core.util.StrUtil;
 import com.auth0.jwt.JWT;
-import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.dragoninfo.dcuc.auth.auth.api.IApiDataAuthFacade;
 import com.dragoninfo.dcuc.auth.auth.dto.data.DataAuthV2ReqDTO;
 import com.dragoninfo.dcuc.auth.auth.vo.DataAuthV2ReqVO;
 import com.dragoninfo.dcuc.auth.auth.dto.data.DataAuthV2RespDTO;
 import com.dragoninfo.dcuc.auth.auth.vo.DataAuthV2RespVO;
-import com.dragoninfo.dcuc.auth.sub.dto.AuthUserDTO;
-import com.dragoninfo.dcuc.auth.sub.facade.IAuthUserInfoFacade;
-import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.enums.BusinessRespEnum;
-import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo.ResultRespVO;
+import com.dragoninfo.dcuc.auth.api.vo.BusinessRespEnum;
+import com.dragoninfo.dcuc.auth.api.vo.ResultRespVO;
 import com.dragoninfo.dcuc.authweb.util.VersionUtils;
 import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
@@ -31,7 +28,6 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * 数据鉴权

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/controller/AuthV4Controller.java

@@ -1,22 +1,27 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.auth0.jwt.JWT;
-import com.auth0.jwt.interfaces.DecodedJWT;
+import com.dragoninfo.dcuc.auth.api.vo.BusinessRespEnum;
+import com.dragoninfo.dcuc.auth.api.vo.ResultRespVO;
 import com.dragoninfo.dcuc.auth.auth.api.IApiDataAuthFacade;
 import com.dragoninfo.dcuc.auth.auth.dto.AppDataSensitiveLevelDTO;
 import com.dragoninfo.dcuc.auth.auth.dto.AppFunInfoDTO;
 import com.dragoninfo.dcuc.auth.auth.dto.DataItemsDto;
 import com.dragoninfo.dcuc.auth.auth.dto.RoleApiDto;
+import com.dragoninfo.dcuc.auth.auth.dto.data.DataAuthV2ReqDTO;
+import com.dragoninfo.dcuc.auth.auth.dto.data.DataAuthV2RespDTO;
 import com.dragoninfo.dcuc.auth.auth.facade.IRoleFacade;
 import com.dragoninfo.dcuc.auth.auth.facade.IServiceAuthFlowFacade;
 import com.dragoninfo.dcuc.auth.auth.facade.IStaffAssignAuthInfoFacade;
 import com.dragoninfo.dcuc.auth.auth.vo.ServiceAuthenticationResVO;
-import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.enums.BusinessRespEnum;
-import com.dragoninfo.dcuc.auth.sub.dto.AuthUserDTO;
-import com.dragoninfo.dcuc.auth.sub.facade.IAuthUserInfoFacade;
+import com.dragoninfo.dcuc.auth.sub.vo.AuthUserVo;
+import com.dragoninfo.dcuc.auth.token.facade.IAuthTokenFacade;
+import com.dragoninfo.dcuc.auth.token.vo.TokenDetailRespVo;
+import com.dragoninfo.dcuc.auth.token.vo.UserTokenInfoRespVO;
 import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo.*;
 import com.dragoninfo.dcuc.common.utils.LangUtil;
+import com.dragoninfo.dcuc.common.utils.ResponseUtil;
+import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,8 +29,11 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -40,24 +48,21 @@ import java.util.List;
 @RequestMapping(value = "/api/auth-service/v4/")
 public class AuthV4Controller {
 
-    @Autowired
-    private IAuthUserInfoFacade userFacade;
-
     @Autowired
     private IStaffAssignAuthInfoFacade staffAssignAuthInfoFacade;
 
     @Autowired
     private IServiceAuthFlowFacade serviceAuthFlowFacade;
 
-    @Autowired
-    private IAuthUserInfoFacade authUserInfoFacade;
-
     @Autowired
     private IRoleFacade roleFacade;
 
     @Autowired
     private IApiDataAuthFacade apiDataAuthFacade;
 
+    @Autowired
+    private IAuthTokenFacade authTokenFacade;
+
     /**
      * 应用级鉴权
      *
@@ -72,13 +77,19 @@ public class AuthV4Controller {
             return ResultRespVO.resultEnumMessage(BusinessRespEnum.TOKEN_FAIL);
         }
 
-        DecodedJWT decode = JWT.decode(appTokenId);
-        String idcard = decode.getClaim("idCard").asString();
+        TokenDetailRespVo tokenInfo = authTokenFacade.getByAppTokenId(appTokenId, true, false);
 
-        AuthUserDTO userInfo = userFacade.findByIdcard(idcard);
+        AuthUserVo userInfo = tokenInfo.getUserInfo();
         if (userInfo == null) {
             return ResultRespVO.respRequestErrorMessage("用户不存在");
         }
+
+        // 缓存应用令牌
+        UserTokenInfoRespVO userToken = tokenInfo.getUserToken();
+        int expiredTime = (int) ((userToken.getExpireAt().getTime() - System.currentTimeMillis()) / 1000);
+
+        authTokenFacade.cacheStandardUserToken(userInfo.getIdcard(), userToken.getId(), expiredTime);
+
         String userId = userInfo.getId();
         List<AppDataSensitiveLevelDTO> appList = staffAssignAuthInfoFacade.getAppLitByUserId(userId);
 
@@ -106,23 +117,19 @@ public class AuthV4Controller {
         String taskId = functionAuthReqVO.getTaskId();
 
         if (StrUtil.isBlank(appTokenId)) {
-            return ResultRespVO.resultEnumMessage(BusinessRespEnum.TOKEN_FAIL);
+            return ResultRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
         }
-
-        DecodedJWT decode = JWT.decode(appTokenId);
-        String idcard = decode.getClaim("idCard").asString();
-        String appCode = decode.getClaim("appCode").asString();
-
-
-        AuthUserDTO userInfo = authUserInfoFacade.findByIdcard(idcard);
+        TokenDetailRespVo tokenInfo = authTokenFacade.getByAppTokenId(appTokenId, true, false);
+        AuthUserVo userInfo = tokenInfo.getUserInfo();
         if (userInfo == null) {
-            return ResultRespVO.respRequestErrorMessage("idcard无权限，或身份证错误");
+            return ResultRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
         }
+        String appCode = tokenInfo.getAppToken().getAppId();
 
         RoleApiDto roleApiDto = new RoleApiDto();
         roleApiDto.setAppCode(appCode);
         roleApiDto.setUserId(userInfo.getId());
-        roleApiDto.setIdcard(idcard);
+        roleApiDto.setIdcard(userInfo.getIdcard());
         List<AppFunInfoDTO> menus = roleFacade.getMenus(roleApiDto);
 
         StringBuilder functionAuthBuilder = new StringBuilder();
@@ -147,14 +154,17 @@ public class AuthV4Controller {
         String appTokenId = serviceAuthReqVO.getAppTokenId();
         String taskId = serviceAuthReqVO.getTaskId();
         if (StrUtil.isBlank(appTokenId)) {
-            return ResultRespVO.resultEnumMessage(BusinessRespEnum.TOKEN_FAIL);
+            return ResultRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
         }
 
-        DecodedJWT decode = JWT.decode(appTokenId);
-        String appCode = decode.getClaim("appCode").asString();
-        String idcard = decode.getClaim("idcard").asString();
+        TokenDetailRespVo tokenInfo = authTokenFacade.getByAppTokenId(appTokenId, true, false);
+        AuthUserVo userInfo = tokenInfo.getUserInfo();
+        if (userInfo == null) {
+            return ResultRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
+        }
+        String appCode = tokenInfo.getAppToken().getAppId();
 
-        List<ServiceAuthenticationResVO> serviceAuthenticationResVOList = serviceAuthFlowFacade.serviceAuthentication(idcard, appCode, "", "");
+        List<ServiceAuthenticationResVO> serviceAuthenticationResVOList = serviceAuthFlowFacade.serviceAuthentication(userInfo.getIdcard(), appCode, "", "");
 
         StringBuilder serviceAuthBuilder = new StringBuilder();
 
@@ -175,16 +185,41 @@ public class AuthV4Controller {
      */
     @PostMapping("dataAuth")
     public ResultRespVO<List<DataAuthRespVO>> dataAuth(@RequestBody DataAuthReqVO dataAuthReqVO) {
-        String resourceId = dataAuthReqVO.getResourceId();
-        String taskId = dataAuthReqVO.getTaskId();
+        String appTokenId = dataAuthReqVO.getAppTokenId();
+
+        if (StrUtil.isBlank(appTokenId)) {
+            return ResultRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
+        }
 
-        // todo 数据级鉴权
+        String resourceId = dataAuthReqVO.getResourceId();
+        if (StrUtil.isBlank(resourceId)) {
+            return ResultRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
+        }
 
-        DataAuthRespVO dataAuthRespVO = new DataAuthRespVO();
+        TokenDetailRespVo tokenInfo = authTokenFacade.getByAppTokenId(appTokenId, true, false);
+        AuthUserVo userInfo = tokenInfo.getUserInfo();
+        if (null == userInfo) {
+            return ResultRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
+        }
 
-        List<DataAuthRespVO> dataAuthRespVOList = new ArrayList<>();
-        dataAuthRespVOList.add(dataAuthRespVO);
-        return ResultRespVO.success(dataAuthRespVOList);
+        DataAuthV2ReqDTO v2ReqDTO = new DataAuthV2ReqDTO();
+        v2ReqDTO.setIdcard(userInfo.getIdcard());
+        v2ReqDTO.setResourceId(resourceId);
+
+        ResponseDTO<DataAuthV2RespDTO> dto = apiDataAuthFacade.dataItemsCheckV2(v2ReqDTO);
+        if (!ResponseUtil.isSuccess(dto)) {
+            return ResultRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
+        } else {
+            DataAuthV2RespDTO respDTO = (DataAuthV2RespDTO) dto.getResult();
+            Set<String> resultSet = respDTO.getItemIdentifier();
+            List<DataAuthRespVO> collect = Optional.ofNullable(resultSet).orElse(Collections.emptySet()).stream().map(e -> {
+                DataAuthRespVO vo = new DataAuthRespVO();
+                vo.setResourceId(resourceId);
+                vo.setItemIdentifier(e);
+                return vo;
+            }).collect(Collectors.toList());
+            return ResultRespVO.success(collect);
+        }
     }
 
     @PostMapping("userOrgDataAuth")

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/enums/BusinessRespEnum.java

@@ -1,68 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.enums;
-
-import com.dragonsoft.duceap.base.enums.ICodeEnum;
-
-/**
- * <p>
- * 业务通用响应码
- * </p>
- *
- * @author huangzqa
- * @date 2022/8/1
- */
-public enum BusinessRespEnum implements ICodeEnum {
-    /**
-     * 操作成功
-     */
-    SUCCESS("0000", "鉴权成功"),
-
-    /**
-     * 鉴权失败
-     */
-    AUTH_FAIL("0001", "鉴权失败"),
-
-    /**
-     * 令牌失效
-     */
-    TOKEN_FAIL("0002", "令牌失效"),
-
-    /**
-     * 权限冻结
-     */
-    PERMISSION_FREEZE("0003", "权限冻结"),
-
-    // 自行定义状态码
-    /**
-     * 请求参数异常
-     */
-    PARAM_ERROR("9001", "请求参数异常"),
-
-    /**
-     * 服务异常
-     */
-    SERVER_ERROR("9002", "服务异常"),
-    /**
-     * 未知异常
-     */
-    UNKNOWN_ERROR("9999", "未知异常");
-
-    private final String value;
-
-    private final String label;
-
-
-    BusinessRespEnum(String value, String label) {
-        this.value = value;
-        this.label = label;
-    }
-
-    @Override
-    public String getValue() {
-        return this.value;
-    }
-
-    @Override
-    public String getLabel() {
-        return this.label;
-    }
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/vo/MessageRespVO.java

@@ -1,107 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo;
-
-import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.enums.BusinessRespEnum;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * <p>
- * 用户令牌校验返回
- * </p>
- *
- * @author huangzqa
- * @date 2022/8/1
- */
-@Data
-public class MessageRespVO {
-
-    /**
-     * “0000” 表示令牌有效；
-     * 其他值表示无效或接口调用出错
-     */
-    @JsonProperty("status_code")
-    private String statusCode;
-
-    /**
-     * 状态码对应的详细描述
-     */
-    private String message;
-
-    /**
-     * 设置业务枚举
-     *
-     * @param businessRespEnum 业务枚举
-     */
-    public void setBusinessRespEnum(BusinessRespEnum businessRespEnum) {
-        setStatusCode(businessRespEnum.getValue());
-        setMessage(businessRespEnum.getLabel());
-    }
-
-
-    /**
-     * 设置业务枚举
-     *
-     * @param businessRespEnum 业务枚举
-     */
-    public static MessageRespVO messageEnumMessage(BusinessRespEnum businessRespEnum) {
-        MessageRespVO messageRespVO = new MessageRespVO();
-        messageRespVO.setBusinessRespEnum(businessRespEnum);
-        return messageRespVO;
-    }
-
-    /**
-     * 设置请求参数异常
-     *
-     * @param message 异常信息
-     */
-    public static MessageRespVO requestErrorMessage(String message) {
-        return messageEnumMessage(BusinessRespEnum.PARAM_ERROR, message);
-    }
-
-    /**
-     * 设置请求参数异常
-     *
-     * @param businessRespEnum 枚举
-     * @param message          异常信息
-     */
-    public static MessageRespVO messageEnumMessage(BusinessRespEnum businessRespEnum, String message) {
-        MessageRespVO messageRespVO = new MessageRespVO();
-        messageRespVO.setStatusCode(businessRespEnum.getValue());
-        messageRespVO.setMessage(message);
-        return messageRespVO;
-    }
-
-    /**
-     * 是否成功
-     *
-     * @return 是否成功
-     */
-    @JsonIgnore
-    public boolean isRespSuccess() {
-        return this.statusCode.equalsIgnoreCase(BusinessRespEnum.SUCCESS.getValue());
-    }
-
-    /**
-     * 是否失败
-     *
-     * @return 是否失败
-     */
-    @JsonIgnore
-    public boolean isRespFail() {
-        return !isRespSuccess();
-    }
-
-    /**
-     * 转发Result返回
-     *
-     * @param <T> 泛型
-     * @return Result返回
-     */
-    public <T> ResultRespVO<T> toResultRespVO() {
-        ResultRespVO<T> objectResultRespVO = new ResultRespVO<>();
-        objectResultRespVO.setStatusCode(statusCode);
-        objectResultRespVO.setMessage(message);
-        return objectResultRespVO;
-    }
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/vo/ResultRespVO.java

@@ -1,54 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo;
-
-import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.enums.BusinessRespEnum;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 用户令牌校验返回
- * </p>
- *
- * @author huangzqa
- * @date 2022/8/1
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class ResultRespVO<T> extends MessageRespVO {
-
-    /***
-     * 返回内容
-     */
-    private T result;
-
-    public static <T> ResultRespVO<T> success(T result) {
-        ResultRespVO<T> objectResultRespVO = new ResultRespVO<>();
-        objectResultRespVO.setBusinessRespEnum(BusinessRespEnum.SUCCESS);
-        objectResultRespVO.setResult(result);
-        return objectResultRespVO;
-    }
-
-    /**
-     * 设置枚举消息
-     *
-     * @param businessRespEnum 枚举类型
-     * @param <T>              泛型
-     * @return 消息
-     */
-    public static <T> ResultRespVO<T> resultEnumMessage(BusinessRespEnum businessRespEnum) {
-        ResultRespVO<T> objectResultRespVO = new ResultRespVO<>();
-        objectResultRespVO.setBusinessRespEnum(businessRespEnum);
-        return objectResultRespVO;
-    }
-
-    /**
-     * 设置请求参数异常
-     *
-     * @param message 异常信息
-     */
-    public static <T> ResultRespVO<T> respRequestErrorMessage(String message) {
-        ResultRespVO<T> objectResultRespVO = resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
-        objectResultRespVO.setMessage(message);
-        return objectResultRespVO;
-    }
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/app/AppController.java

@@ -1,17 +1,10 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.app;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.dragoninfo.dcuc.app.dto.ApplyInfoDTO;
 import com.dragoninfo.dcuc.app.entity.ApplyInfo;
 import com.dragoninfo.dcuc.app.facade.IApplyInfoFacade;
-import com.dragoninfo.dcuc.app.facade.IManufacturerInfoFacade;
-import com.dragoninfo.dcuc.auth.auth.vo.ApplicationInfoVO;
-import com.dragoninfo.dcuc.auth.power.facade.IApplicationInfoFacade;
-import com.dragoninfo.dcuc.auth.sub.dto.AuthOrgDTO;
 import com.dragoninfo.dcuc.auth.sub.facade.IAuthOrgInfoFacade;
-import com.dragoninfo.dcuc.authweb.business.MtAuthBusiness;
 import com.dragoninfo.dcuc.authweb.restcontroller.app.vo.AppVo;
 import com.dragoninfo.dcuc.duceap.facade.IDuceapUploadFacade;
 import com.dragoninfo.duceap.core.enums.ResultEnum;

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/app/ManufacturerInfoController.java

@@ -5,7 +5,7 @@
 //import com.dragoninfo.dcuc.app.entity.ManufacturerInfo;
 //import com.dragoninfo.dcuc.app.facade.IApplyInfoFacade;
 //import com.dragoninfo.dcuc.app.facade.IManufacturerInfoFacade;
-//import com.dragoninfo.dcuc.authweb.business.MtAuthBusiness;
+//import com.dragoninfo.dcuc.authweb.business.impl.MtAuthBusiness;
 //import com.dragoninfo.dcuc.authweb.common.SysConstants;
 //import com.dragoninfo.dcuc.authweb.restcontroller.app.vo.ManufacturerVo;
 //import com.dragoninfo.dcuc.org.facade.IOrgInfoFacade;

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

@@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.dragoninfo.dcuc.auth.sub.dto.AuthOrgDTO;
 import com.dragoninfo.dcuc.auth.sub.dto.OrgTreeNodeDTO;
 import com.dragoninfo.dcuc.auth.sub.facade.IAuthOrgInfoFacade;
-import com.dragoninfo.dcuc.authweb.business.MtAuthBusiness;
+import com.dragoninfo.dcuc.authweb.business.impl.MtAuthBusiness;
 import com.dragoninfo.dcuc.authweb.common.SysConstants;
 import com.dragoninfo.dcuc.authweb.restcontroller.org.vo.OrgRangeVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.org.AuthOrgVo;
@@ -18,13 +18,11 @@ import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.base.entity.security.SecurityUser;
 import com.dragonsoft.duceap.base.utils.UserContextUtils;
-import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
 import com.dragonsoft.duceap.commons.util.string.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.collections.ListUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;

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

@@ -3,7 +3,7 @@ package com.dragoninfo.dcuc.authweb.restcontroller.sub;
 import com.dragoninfo.dcuc.auth.sub.dto.AuthUserDTO;
 import com.dragoninfo.dcuc.auth.sub.enumresource.JobTypeEnum;
 import com.dragoninfo.dcuc.auth.sub.facade.IAuthUserInfoFacade;
-import com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.user.AuthUserVo;
+import com.dragoninfo.dcuc.auth.sub.vo.AuthUserVo;
 import com.dragoninfo.duceap.core.response.Result;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.core.search.Searchable;

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

@@ -1,114 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.user;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author mazq
- * @date 2021/6/11
- */
-@ApiModel("人员信息Vo")
-@Data
-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;
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/vo/ahfk/AhfkAppResultVo.java

@@ -1,26 +0,0 @@
-package com.dragoninfo.dcuc.authweb.vo.ahfk;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 安徽FK应用返回
- *
- * @author huangzqa
- * @date 2021/1/22
- **/
-@Data
-public class AhfkAppResultVo implements Serializable {
-
-    /**
-     * 应用名称
-     */
-    private String appName;
-
-    /**
-     * 应用代码
-     */
-    private String appCode;
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/vo/ahfk/AhfkFunctionResultVo.java

@@ -1,36 +0,0 @@
-package com.dragoninfo.dcuc.authweb.vo.ahfk;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 安徽FK功能资源返回
- *
- * @author huangzqa
- * @date 2021/1/22
- **/
-@Data
-public class AhfkFunctionResultVo implements Serializable {
-
-    /**
-     * 应用代码
-     */
-    private String appCode;
-
-    /**
-     * 资源代码
-     */
-    private String resourceCode;
-
-    /**
-     * 资源名称
-     */
-    private String resourceName;
-
-    /**
-     * 上级资源名称
-     */
-    private String upResourceCode;
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/vo/ahfk/AhfkRoleResultVo.java

@@ -1,26 +0,0 @@
-package com.dragoninfo.dcuc.authweb.vo.ahfk;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 安徽FK角色返回
- *
- * @author huangzqa
- * @date 2021/1/22
- **/
-@Data
-public class AhfkRoleResultVo implements Serializable {
-
-    /**
-     * 角色代码
-     */
-    private String roleCode;
-
-    /**
-     * 角色名称
-     */
-    private String roleName;
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/vo/ahfk/AhfkStatisticsAppReqVo.java

@@ -1,18 +0,0 @@
-package com.dragoninfo.dcuc.authweb.vo.ahfk;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author huangzqa
- * @date 2021/1/25
- **/
-@Data
-public class AhfkStatisticsAppReqVo {
-
-    /**
-     * 应用代码
-     */
-    private List<String> appCode;
-}

src/main/java/com/dragoninfo/dcuc/authweb/vo/ahfk/AhfkStatisticsAppRespVo.java

@@ -1,21 +0,0 @@
-package com.dragoninfo.dcuc.authweb.vo.ahfk;
-
-import lombok.Data;
-
-/**
- * @author huangzqa
- * @date 2021/1/25
- **/
-@Data
-public class AhfkStatisticsAppRespVo {
-
-    /**
-     * 应用代码
-     */
-    private String appCode;
-
-    /**
-     * 数量
-     */
-    private Integer number;
-}

src/main/java/com/dragoninfo/dcuc/authweb/vo/ahfk/AhfkStatisticsFuncReqVo.java

@@ -1,23 +0,0 @@
-package com.dragoninfo.dcuc.authweb.vo.ahfk;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author huangzqa
- * @date 2021/1/25
- **/
-@Data
-public class AhfkStatisticsFuncReqVo {
-
-    /**
-     * 应用代码
-     */
-    private String appCode;
-
-    /**
-     * 资源代码
-     */
-    private List<String> resourceCode;
-}

src/main/java/com/dragoninfo/dcuc/authweb/vo/ahfk/AhfkStatisticsFuncRespVo.java

@@ -1,26 +0,0 @@
-package com.dragoninfo.dcuc.authweb.vo.ahfk;
-
-import lombok.Data;
-
-/**
- * @author huangzqa
- * @date 2021/1/25
- **/
-@Data
-public class AhfkStatisticsFuncRespVo {
-
-    /**
-     * 应用代码
-     */
-    private String appCode;
-
-    /**
-     * 资源代码
-     */
-    private String resourceCode;
-
-    /**
-     * 数量
-     */
-    private Integer number;
-}

src/main/java/com/dragoninfo/dcuc/authweb/vo/ahfk/AhfkStatisticsOrgRoleReqVo.java

@@ -1,23 +0,0 @@
-package com.dragoninfo.dcuc.authweb.vo.ahfk;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author huangzqa
- * @date 2021/1/25
- **/
-@Data
-public class AhfkStatisticsOrgRoleReqVo {
-
-    /**
-     * 机构代码
-     */
-    private List<String> orgCode;
-
-    /**
-     * 角色代码
-     */
-    private List<String> roleCode;
-}

src/main/java/com/dragoninfo/dcuc/authweb/vo/ahfk/AhfkStatisticsOrgRoleRespVo.java

@@ -1,34 +0,0 @@
-package com.dragoninfo.dcuc.authweb.vo.ahfk;
-
-import lombok.Data;
-
-/**
- * @author huangzqa
- * @date 2021/1/25
- **/
-@Data
-public class AhfkStatisticsOrgRoleRespVo {
-
-    /**
-     * 机构代码
-     */
-    private String orgCode;
-
-    /**
-     * 角色代码
-     */
-    private String roleCode;
-    /**
-     * 角色名称
-     */
-    private String roleName;
-    /**
-     * 应用名称
-     */
-    private String appName;
-
-    /**
-     * 数量
-     */
-    private Integer number;
-}