refactor(优化类结构):

src/main/java/com/dragoninfo/dcuc/authweb/business/TokenCheckBusiness.java → src/main/java/com/dragoninfo/dcuc/authweb/business/HwIdentityBusiness.java

@@ -23,7 +23,7 @@ import java.util.List;
  **/
 @Slf4j
 @Service
-public class TokenCheckBusiness {
+public class HwIdentityBusiness {
 
     @Autowired
     private DcucAuthWebConfig dcucAuthWebConfig;

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

@@ -1,14 +1,18 @@
-package com.dragoninfo.dcuc.authweb.common;
+package com.dragoninfo.dcuc.authweb.business;
 
+import com.dragoninfo.dcuc.authweb.common.SysConstants;
 import com.dragoninfo.dcuc.user.admin.facade.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Created by Administrator on 2019/3/21.
+ * 管理范围
+ *
+ * @author Administrator
+ * @date 2019/3/21
  */
 @Component
-public class MtAuthService {
+public class MtAuthBusiness {
 
     @Autowired
     private IOrgMtAuthFacade orgMtAuthFacade;
@@ -22,12 +26,11 @@ public class MtAuthService {
     private IMgeMtAuthFacade mgeMtAuthFacade;
 
     /**
-     *
      * 获取用户各类型管理范围
      *
-     * @param userId
-     * @param type
-     * @return
+     * @param userId 用户ID
+     * @param type   类型
+     * @return 管理范围
      */
     public String getMtAuth(String userId, String type) {
         if (SysConstants.MT_ORG.equals(type)) {

src/main/java/com/dragoninfo/dcuc/authweb/common/SysConstants.java

@@ -1,33 +1,36 @@
 package com.dragoninfo.dcuc.authweb.common;
 
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
- * Created by Administrator on 2018/11/1.
+ * @author Administrator
+ * @date 2018/11/1
  */
 public class SysConstants {
 
-    /** 机构管理范围 **/
-    public final static String MT_ORG = "ORG";
-    /** 用户管理范围 **/
-    public final static String MT_USER = "USER";
-    /** 授权管理范围 **/
-    public final static String MT_APP = "APP";
-    /** 管理员管理范围 **/
-    public final static String MT_MGE = "MGE";
-    /** 临时管理范围 **/
-    public final static String MT_TEMP = "TEMP";
-
+    /**
+     * 机构管理范围
+     **/
+    public static final String MT_ORG = "ORG";
+    /**
+     * 用户管理范围
+     **/
+    public static final String MT_USER = "USER";
+    /**
+     * 授权管理范围
+     **/
+    public static final String MT_APP = "APP";
+    /**
+     * 管理员管理范围
+     **/
+    public static final String MT_MGE = "MGE";
+    /**
+     * 临时管理范围
+     **/
+    public static final String MT_TEMP = "TEMP";
     //列表导出的最大数量
-    public final static int EXPORT_NUMBER_MAX = 1000;
-
-    public static final String JMGZ = "******";
-    public static final BigDecimal JMGZ_BIGDECIMAL = new BigDecimal(-999);
-    public static final Date JMGZ_DATE = new Date(0);
-
-
+    public static final int EXPORT_NUMBER_MAX = 1000;
 
+    private SysConstants() {
+    }
 
 }

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

@@ -5,7 +5,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 /**
- * Created by Administrator on 2019/3/13.
+ * @author Administrator
+ * @date 2019/3/13
  */
 @ConfigurationProperties(prefix = "dcuc.authweb")
 @Data

src/main/java/com/dragoninfo/dcuc/authweb/interceptor/AuthBeforeResInterceptor.java

@@ -2,7 +2,7 @@ package com.dragoninfo.dcuc.authweb.interceptor;
 
 import cn.hutool.core.util.StrUtil;
 import com.dragoninfo.dcuc.app.facade.IApplyInfoFacade;
-import com.dragoninfo.dcuc.authweb.business.TokenCheckBusiness;
+import com.dragoninfo.dcuc.authweb.business.HwIdentityBusiness;
 import com.dragoninfo.dcuc.authweb.exception.EvidenceException;
 import com.dragoninfo.dcuc.common.Constants;
 import com.dragoninfo.dcuc.user.user.entity.UserInfo;
@@ -32,7 +32,7 @@ public class AuthBeforeResInterceptor implements HandlerInterceptor {
     private IApplyInfoFacade applyInfoFacade;
 
     @Autowired
-    private TokenCheckBusiness tokenCheckBusiness;
+    private HwIdentityBusiness hwIdentityBusiness;
 
     /**
      * 拦截器
@@ -80,7 +80,7 @@ public class AuthBeforeResInterceptor implements HandlerInterceptor {
                 throw new EvidenceException(HttpStatus.MULTIPLE_CHOICES.value(), "header参数不能为空");
             }
 
-            return tokenCheckBusiness.checkToken(userToken, appToken);
+            return hwIdentityBusiness.checkToken(userToken, appToken);
         }
         throw new EvidenceException(HttpStatus.MULTIPLE_CHOICES.value(), "请传入凭据");
     }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/controller/AuthServiceController.java

@@ -8,7 +8,7 @@ import com.dragoninfo.dcuc.auth.auth.dto.ServiceAuthResultDTO;
 import com.dragoninfo.dcuc.auth.auth.facade.IServiceAuthFacade;
 import com.dragoninfo.dcuc.auth.auth.facade.IServiceAuthResultFacade;
 import com.dragoninfo.dcuc.auth.auth.facade.IStaffAssignAuthInfoFacade;
-import com.dragoninfo.dcuc.authweb.business.TokenCheckBusiness;
+import com.dragoninfo.dcuc.authweb.business.HwIdentityBusiness;
 import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v1.vo.AppAuthRespVO;
 import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v1.vo.ServiceAuthResultVo;
 import com.dragoninfo.dcuc.authweb.util.VersionUtils;
@@ -62,14 +62,14 @@ public class AuthServiceController {
     private IUserFacade userFacade;
 
     @Autowired
-    private TokenCheckBusiness tokenCheckBusiness;
+    private HwIdentityBusiness hwIdentityBusiness;
 
     @PostMapping(value = "apps/authentication")
     @ApiOperation(value = "应用级鉴权")
     @ApiImplicitParams({@ApiImplicitParam(name = "appsAuthenticationReq", value = "应用级鉴权VO")})
     public ApiResult appsAuthentication(@RequestHeader(Constants.DCUC_USER_TOKEN) String userToken) {
 
-        boolean checkUserToken = tokenCheckBusiness.checkUserToken(userToken);
+        boolean checkUserToken = hwIdentityBusiness.checkUserToken(userToken);
 
         if (!checkUserToken) {
             return ApiResult.setFailMessage("用户令牌无效");

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

@@ -10,7 +10,7 @@ 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.authweb.common.MtAuthService;
+import com.dragoninfo.dcuc.authweb.business.MtAuthBusiness;
 import com.dragoninfo.dcuc.authweb.common.SysConstants;
 import com.dragoninfo.dcuc.authweb.restcontroller.app.vo.AppVo;
 import com.dragoninfo.dcuc.duceap.facade.IDuceapUploadFacade;
@@ -55,7 +55,7 @@ public class AppController {
     @Autowired
     private IApplyInfoFacade applyInfoFacade;
     @Autowired
-    private MtAuthService mtAuthService;
+    private MtAuthBusiness mtAuthBusiness;
     @Autowired
     private IUserInfoFacade userInfoFacade;
     @Autowired
@@ -204,7 +204,7 @@ public class AppController {
         List<Map<String, Object>> result = new ArrayList<>();
         SecurityUser user = (SecurityUser) ContextUtils.getUserInfo();
         //用户范围
-        String userMt = mtAuthService.getMtAuth(user.getId(), SysConstants.MT_USER);
+        String userMt = mtAuthBusiness.getMtAuth(user.getId(), SysConstants.MT_USER);
         if (StringUtils.isEmpty(userMt)) {
             return Result.success(result);
         }

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

@@ -5,7 +5,7 @@ import com.dragoninfo.dcuc.app.entity.ApplyInfo;
 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.common.MtAuthService;
+import com.dragoninfo.dcuc.authweb.business.MtAuthBusiness;
 import com.dragoninfo.dcuc.authweb.common.SysConstants;
 import com.dragoninfo.dcuc.authweb.restcontroller.app.vo.ManufacturerVo;
 import com.dragoninfo.dcuc.org.facade.IOrgInfoFacade;
@@ -45,7 +45,7 @@ public class ManufacturerInfoController extends BaseController<ManufacturerInfo,
     @Autowired
     private IApplyInfoFacade applyInfoFacade;
     @Autowired
-    private MtAuthService mtAuthService;
+    private MtAuthBusiness mtAuthBusiness;
 
     @Autowired
     private IOrgInfoFacade orgInfoFacade;
@@ -146,7 +146,7 @@ public class ManufacturerInfoController extends BaseController<ManufacturerInfo,
         List<ManufacturerInfo> manufacturerInfoList = new ArrayList<>();
         BaseSecurityUser user = ContextUtils.getUserInfo();
         //用户范围
-        String userMt = mtAuthService.getMtAuth(user.getId(), SysConstants.MT_USER);
+        String userMt = mtAuthBusiness.getMtAuth(user.getId(), SysConstants.MT_USER);
         //所有应用
         List<ApplyInfo> applyInfoList = applyInfoFacade.getAllList();
         //范围内加过的厂商

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/RoleAuthInfoController.java

@@ -11,7 +11,7 @@ import com.dragoninfo.dcuc.auth.auth.facade.IRoleInfoFacade;
 import com.dragoninfo.dcuc.auth.auth.facade.IStaffAssignAuthInfoFacade;
 import com.dragoninfo.dcuc.auth.auth.vo.RoleAuthParamVo;
 import com.dragoninfo.dcuc.auth.auth.vo.RoleInfoVO;
-import com.dragoninfo.dcuc.authweb.common.MtAuthService;
+import com.dragoninfo.dcuc.authweb.business.MtAuthBusiness;
 import com.dragoninfo.dcuc.authweb.common.SysConstants;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.RoleAuthUserVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.StaffAssignAuthInfoVo;
@@ -64,7 +64,7 @@ public class RoleAuthInfoController {
     @Autowired
     private IStaffAssignAuthInfoFacade staffAssignAuthInfoFacade;
     @Autowired
-    private MtAuthService mtAuthService;
+    private MtAuthBusiness mtAuthBusiness;
     @Autowired
     private ICodeListResourceFacade iCodeListResourceFacade;
 
@@ -170,7 +170,7 @@ public class RoleAuthInfoController {
         searchable.addSearchFilter("name",SearchOperator.ne,iUserInfoFacade.getRootUser());
         Page<UserInfo> page = iUserInfoFacade.userList(searchDTO);
         if (!iUserInfoFacade.getRootUser().equals(curUser.getName())) {
-            String mtIds = mtAuthService.getMtAuth(curUser.getId(), SysConstants.MT_APP);
+            String mtIds = mtAuthBusiness.getMtAuth(curUser.getId(), SysConstants.MT_APP);
             if (StringUtils.isEmpty(mtIds)) {
                 return Result.success(0L,null);
             }
@@ -199,7 +199,7 @@ public class RoleAuthInfoController {
 //        searchable.addSearchFilter("jobType",SearchOperator.notIn,jobType);
         Page<UserInfo> page = iUserInfoFacade.userList(searchable.toSearchDTO());
         if (!iUserInfoFacade.getRootUser().equals(curUser.getName())) {
-            String mtIds = mtAuthService.getMtAuth(curUser.getId(), SysConstants.MT_APP);
+            String mtIds = mtAuthBusiness.getMtAuth(curUser.getId(), SysConstants.MT_APP);
             if (StringUtils.isEmpty(mtIds)) {
                 return Result.success(0L,null);
             }
@@ -259,7 +259,7 @@ public class RoleAuthInfoController {
         appId = (String) appIdCondition.getValue();
         SecurityUser curUser = (SecurityUser) ContextUtils.getUserInfo();
         if (!iUserInfoFacade.getRootUser().equals(curUser.getName())) {
-            String mtIds = mtAuthService.getMtAuth(curUser.getId(), SysConstants.MT_APP);
+            String mtIds = mtAuthBusiness.getMtAuth(curUser.getId(), SysConstants.MT_APP);
             if (StringUtils.isEmpty(mtIds)) {
                 return Result.success(0L,null);
             }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/org/OrgInfoController.java

@@ -2,19 +2,17 @@ package com.dragoninfo.dcuc.authweb.restcontroller.org;
 
 import com.dragoninfo.dcuc.app.entity.ApplyInfo;
 import com.dragoninfo.dcuc.app.facade.IApplyInfoFacade;
-import com.dragoninfo.dcuc.authweb.common.MtAuthService;
+import com.dragoninfo.dcuc.authweb.business.MtAuthBusiness;
 import com.dragoninfo.dcuc.authweb.common.SysConstants;
 import com.dragoninfo.dcuc.authweb.restcontroller.org.vo.MergersVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.org.vo.OrgRangeVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.org.vo.OrgVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.org.vo.SortVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.statisics.vo.OrgTreeNodeVo;
-
 import com.dragoninfo.dcuc.authweb.util.UserUtils;
 import com.dragoninfo.dcuc.authweb.util.VersionUtils;
 import com.dragoninfo.dcuc.org.entity.OrgInfo;
 import com.dragoninfo.dcuc.org.facade.IOrgInfoFacade;
-
 import com.dragoninfo.dcuc.org.vo.OrgTreeNode;
 import com.dragoninfo.dcuc.user.admin.entity.OrgMtAuth;
 import com.dragoninfo.dcuc.user.admin.facade.*;
@@ -74,7 +72,7 @@ public class OrgInfoController {
     @Autowired
     private IApplyInfoFacade applyInfoFacade;
     @Autowired
-    private MtAuthService mtAuthService;
+    private MtAuthBusiness mtAuthBusiness;
     @Autowired
     private IMgeMtAuthFacade iMgeMtAuthFacade;
 
@@ -95,7 +93,7 @@ public class OrgInfoController {
         String type = (String) params.get("type");
         //获取管理范围ids
         SecurityUser curUser = (SecurityUser) ContextUtils.getUserInfo();
-        String mtAuthIds = mtAuthService.getMtAuth(curUser.getId(), type);
+        String mtAuthIds = mtAuthBusiness.getMtAuth(curUser.getId(), type);
         if (StringUtils.isEmpty(id)) {
             //获取机构树根节点列表
             List<Map<String, Object>> result = this.treeRootList(mtAuthIds);
@@ -138,7 +136,7 @@ public class OrgInfoController {
         String userId = orgRangeVo.getUserId();
         //获取管理范围ids
         SecurityUser curUser = (SecurityUser) ContextUtils.getUserInfo();
-        String mtAuthIds = mtAuthService.getMtAuth(curUser.getId(),mtType);
+        String mtAuthIds = mtAuthBusiness.getMtAuth(curUser.getId(), mtType);
         //当临时表没有数据时候，获取登录人的权限范围
         if (StringUtils.isEmpty(mtAuthIds)&&SysConstants.MT_TEMP.equals(orgRangeVo.getMtType())){
             mtAuthIds=iAppMtAuthFacade.mgeAppRightRangeStr(ContextUtils.getUserInfo().getId());
@@ -631,7 +629,7 @@ public class OrgInfoController {
      * @return
      */
     public List<Map<String, Object>> checkTreeNode(List<Map<String, Object>> treeNodes, String type, String targetUserId) {
-        String mtAuthIds = mtAuthService.getMtAuth(targetUserId, type);
+        String mtAuthIds = mtAuthBusiness.getMtAuth(targetUserId, type);
         for (Map<String, Object> treeNode : treeNodes) {
             String orgId = (String) treeNode.get("id");
             String path = (String) treeNode.get("path");
@@ -719,7 +717,7 @@ public class OrgInfoController {
             @RequestParam(value = "id", required = false) String id) {
         //获取管理范围ids
         SecurityUser curUser = (SecurityUser) ContextUtils.getUserInfo();
-        String mtAuthIds = mtAuthService.getMtAuth(curUser.getId(), type);
+        String mtAuthIds = mtAuthBusiness.getMtAuth(curUser.getId(), type);
         if (StringUtils.isEmpty(id)) {
             List<Map<String, Object>> result = this.treeRootList(mtAuthIds);
             return Result.success(result);