feature(管理员模块修改到auth-service): 管理员模块修改到auth-service

管理员模块修改到auth-service

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

@@ -1,5 +1,6 @@
 package com.dragoninfo.dcuc.authweb.business;
 
+import com.dragoninfo.dcuc.auth.admin.facade.*;
 import com.dragoninfo.dcuc.authweb.common.SysConstants;
 import com.dragoninfo.dcuc.user.admin.facade.*;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -29,9 +29,4 @@ public class DcucAuthWebConfig {
      */
     private CheckTypeEnum checkTypeEnum = CheckTypeEnum.TOKEN;
 
-    /**
-     * ADMIN ID
-     */
-    private String RootUserId;
-
 }

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

@@ -151,6 +151,8 @@ public class AppController {
             , example = "40288a8b699fc2500169a33b20540000")})
     @DeleteMapping(value = "/app/{id}")
     public Result<Object> del(@PathVariable("id") String id) {
+        //TODO
+        //权限中心对施工人员和厂商未做管理
 //        try {
 //            boolean flag = authUserInfoFacade.extUsersByAppIdJudge(id);
 //            if (flag) {

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/audit/MgeAuditRptController.java

@@ -1,12 +1,12 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.audit;
 
+import com.dragoninfo.dcuc.auth.admin.entity.MgeLog;
+import com.dragoninfo.dcuc.auth.admin.enumresource.AdminObjectTypeEnum;
+import com.dragoninfo.dcuc.auth.admin.facade.IMenuMtAuthFacade;
+import com.dragoninfo.dcuc.auth.admin.facade.IMgeLogFacade;
+import com.dragoninfo.dcuc.auth.sub.vo.UserMgeLogRptVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.audit.vo.MgeLogVo;
 import com.dragoninfo.dcuc.org.facade.IOrgInfoFacade;
-import com.dragoninfo.dcuc.user.admin.entity.MgeLog;
-import com.dragoninfo.dcuc.user.admin.enumresources.AdminObjectTypeEnum;
-import com.dragoninfo.dcuc.user.admin.facade.IMenuMtAuthFacade;
-import com.dragoninfo.dcuc.user.admin.facade.IMgeLogFacade;
-import com.dragoninfo.dcuc.user.user.vo.UserMgeLogRptVo;
 import com.dragoninfo.duceap.core.response.Result;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
@@ -44,9 +44,9 @@ public class MgeAuditRptController {
         searchDTO.setSort("");
         Searchable searchable = Searchable.toSearchable(searchDTO);
         searchable.addSort(Sort.Direction.DESC, "operate_time");
-        Page<com.dragoninfo.dcuc.user.user.vo.UserMgeLogRptVo> userMgeLogSummary = iMgeLogFacade.findUserMgeLogSummary(searchDTO);
+        Page<UserMgeLogRptVo> userMgeLogSummary = iMgeLogFacade.findUserMgeLogSummary(searchDTO);
         List<UserMgeLogRptVo> vos = new ArrayList<>();
-        for (com.dragoninfo.dcuc.user.user.vo.UserMgeLogRptVo userMgeLogRptVo : userMgeLogSummary) {
+        for (UserMgeLogRptVo userMgeLogRptVo : userMgeLogSummary) {
             UserMgeLogRptVo vo = new UserMgeLogRptVo();
             BeanUtils.copyProperties(userMgeLogRptVo, vo);
             vos.add(vo);

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

@@ -1,6 +1,7 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.auth;
 
 import com.alibaba.fastjson.JSON;
+import com.dragoninfo.dcuc.auth.admin.facade.IAppMtAuthFacade;
 import com.dragoninfo.dcuc.auth.auth.dto.OrgQuotaOpeDTO;
 import com.dragoninfo.dcuc.auth.auth.entity.OrgQuotaAuthInfo;
 import com.dragoninfo.dcuc.auth.auth.facade.IOrgQuotaAuthFacade;

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

@@ -12,7 +12,6 @@ import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.RoleFunRsRlVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.RoleInfoVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.RoleQuotaVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.StaffAssignAuthInfoVo;
-import com.dragoninfo.dcuc.user.user.enumresources.YesNotEnum;
 import com.dragoninfo.duceap.core.response.Result;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.base.entity.security.SecurityUser;
@@ -136,7 +135,7 @@ public class RoleInfoController {
             SecurityUser user = (SecurityUser) ContextUtils.getUserInfo();
             roleInfoVo.setInitNumber(0);
             roleInfoVo.setCreator(user.getId());
-            roleInfoVo.setIsActive(YesNotEnum.YES.getValue());
+            roleInfoVo.setIsActive(BooleanEnum.TRUE.getValue());
             roleInfoVo.setPoliceCategory(StringUtils.isEmpty(roleInfoVo.getPoliceCategory()) ? null : roleInfoVo.getPoliceCategory());
             roleInfoVo.setCreateTime(new Date());
             //TODO
@@ -257,7 +256,9 @@ public class RoleInfoController {
         Condition condition = searchable.getSearchFilterByKey("applicationId_eq");
         if (null == condition) return Result.fail("400", "applicationId 不能为空");
         String applicationId = (String) condition.getValue();
-        if (StringUtils.isBlank(applicationId)) return Result.fail("400", "applicationId 不能为空");
+        if (StringUtils.isBlank(applicationId)){
+            return Result.fail("400", "applicationId 不能为空");
+        }
         Page<RoleInfoVO> page = iRoleInfoFacade.getRoleQuotaList(searchDTO);
         return Result.success(page.getTotalElements(), page.getContent());
     }
@@ -325,7 +326,9 @@ public class RoleInfoController {
     public Result<List<StaffAssignAuthInfoVo>> userRole(SearchDTO searchDTO) {
         Searchable searchable = Searchable.toSearchable(searchDTO);
         String staffId = (String) searchable.getSearchFilterByKey("staffId_eq").getValue();
-        if (StringUtils.isBlank(staffId)) return Result.fail("300", "staffId 不能为空");
+        if (StringUtils.isBlank(staffId)) {
+            return Result.fail("300", "staffId 不能为空");
+        }
         Page<StaffAssignAuthInfo> page = iStaffAssignAuthInfoFacade.findForPage(searchable.toSearchDTO());
         List<StaffAssignAuthInfoVo> vos = new ArrayList<>();
         for (StaffAssignAuthInfo source : page.getContent()) {

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/login/DcucLoginController.java

@@ -154,14 +154,7 @@ public class DcucLoginController {
     }
 
     private boolean isRootUser(String id) {
-        String rootUserId = dcucAuthWebConfig.getRootUserId();
-        if(StringUtils.isBlank(rootUserId)) {
-            return false;
-        }
-        if(rootUserId.equals(id)) {
-            return true;
-        }
-        return false;
+        return userInfoFacade.isRootUser(id);
     }
 
 }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/user/manager/AdminManagerController.java

@@ -1,16 +1,16 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.user.manager;
 
+import com.dragoninfo.dcuc.auth.admin.enumresource.InitMenuEnum;
+import com.dragoninfo.dcuc.auth.admin.facade.*;
+import com.dragoninfo.dcuc.auth.admin.vo.AdminAuditVO;
+import com.dragoninfo.dcuc.auth.sub.dto.AdminMgeDto;
+import com.dragoninfo.dcuc.auth.sub.dto.AuthUserDTO;
 import com.dragoninfo.dcuc.authweb.common.SysConstants;
 import com.dragoninfo.dcuc.authweb.restcontroller.user.manager.vo.AdminVo;
 import com.dragoninfo.dcuc.authweb.util.VersionUtils;
+import com.dragoninfo.dcuc.duceap.enums.UserTypeEnum;
 import com.dragoninfo.dcuc.duceap.facade.ICodeListResourceFacade;
-import com.dragoninfo.dcuc.duceap.facade.IDuceapUploadFacade;
 import com.dragoninfo.dcuc.org.facade.IOrgInfoFacade;
-import com.dragoninfo.dcuc.user.admin.enumresources.InitMenuEnum;
-import com.dragoninfo.dcuc.user.admin.vo.AdminAuditVO;
-import com.dragoninfo.dcuc.user.user.dto.AdminMgeDto;
-import com.dragoninfo.dcuc.user.user.entity.UserInfo;
-import com.dragoninfo.dcuc.user.user.enumresources.UserTypeEnum;
 import com.dragoninfo.duceap.core.enums.ResultEnum;
 import com.dragoninfo.duceap.core.response.Result;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
@@ -32,7 +32,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -61,8 +60,6 @@ public class AdminManagerController extends BaseController {
 
     @Autowired
     private IAppMtAuthFacade iAppMtAuthFacade;
-    @Resource
-    private IDuceapUploadFacade uploadhandler;
 
     @Autowired
     private ICodeListResourceFacade codeListResourceFacade;
@@ -112,7 +109,7 @@ public class AdminManagerController extends BaseController {
     @ApiOperation(value = "获取管理员列表")
     @ApiImplicitParam(name = "searchDTO", value = "查询条件")
     @PostMapping(value = "admins")
-    public Result<List<UserInfo>> adminList(SearchDTO searchDTO) {
+    public Result<List<AuthUserDTO>> adminList(SearchDTO searchDTO) {
         Searchable searchable = Searchable.toSearchable(searchDTO);
         //org移除条件
         Condition orgId_eq = (Condition) searchable.getSearchParams().get("orgId_eq");
@@ -123,7 +120,7 @@ public class AdminManagerController extends BaseController {
         }
         //type org之前代表管理机构的权限列表
         String type = "AppMtAuth";
-        Page<UserInfo> userInfoPage = new PageImpl<UserInfo>();
+        Page<AuthUserDTO> userInfoPage = new PageImpl<>();
         AdminMgeDto dto=new AdminMgeDto(type,orgId,searchable.toSearchDTO());
         searchable.addSearchFilter("orgId", SearchOperator.eq, orgId);
         userInfoPage = iManageInfoFacade.rightRangeManagerList(dto);
@@ -150,14 +147,14 @@ public class AdminManagerController extends BaseController {
     @ApiOperation(value = "获取授权管理员列表")
     @ApiImplicitParam(name = "searchDTO", value = "查询条件")
     @PostMapping(value = "auth/admins")
-    public Result<List<UserInfo>> authAdminList(SearchDTO searchDTO) {
+    public Result<List<AuthUserDTO>> authAdminList(SearchDTO searchDTO) {
         Searchable searchable = Searchable.toSearchable(searchDTO);
         //org移除条件
         Condition orgId_eq = (Condition) searchable.getSearchParams().get("orgId_eq");
         String orgId = orgId_eq.getValue().toString();
         searchable.removeSearchFilter("orgId_eq");
         String type = "OrgMtAuth";
-        Page<UserInfo> userInfoPage = new PageImpl<UserInfo>();
+        Page<AuthUserDTO> userInfoPage = new PageImpl<>();
         AdminMgeDto dto=new AdminMgeDto(type,orgId,searchable.toSearchDTO());
         searchable.addSearchFilter("orgId", SearchOperator.eq, orgId);
         userInfoPage = iManageInfoFacade.rightRangeManagerList(dto);
@@ -176,7 +173,7 @@ public class AdminManagerController extends BaseController {
     @ApiOperation(value = "获取非管理员的警员 ")
     @ApiImplicitParam(name = "searchDTO", value = "查询条件")
     @PostMapping(value = "admin/unAdminPolices")
-    public Result<List<UserInfo>> userList(SearchDTO searchDTO) {
+    public Result<List<AuthUserDTO>> userList(SearchDTO searchDTO) {
         Searchable searchable = Searchable.toSearchable(searchDTO);
         String orgId =(String) searchable.getSearchParams().get("orgId");
         if(orgId == null){
@@ -184,7 +181,7 @@ public class AdminManagerController extends BaseController {
         }
         searchable.addSearchFilter("userType", SearchOperator.ne, UserTypeEnum.EXTERNAL.getValue());
         AdminMgeDto adminMgeDto=new AdminMgeDto("AppMtAuth",orgId,searchDTO);
-        Page<UserInfo> userInfoPage = iManageInfoFacade.getUserInfoByOrgId(adminMgeDto);
+        Page<AuthUserDTO> userInfoPage = iManageInfoFacade.getUserInfoByOrgId(adminMgeDto);
         return Result.success(userInfoPage.getTotalElements(), userInfoPage.getContent());
     }
 

src/main/resources/application-authweb.yml

@@ -2,5 +2,4 @@ dcuc:
   authweb:
     app-code: QXXT0000000000000001
     auth-access: true
-    check-type-enum: token
-    root-user-id: 402881cb4era66f4014b0ghd0b875485
+    check-type-enum: token