feature(用户同步开发): 用户同步开发

用户同步开发

pom.xml

@@ -39,11 +39,7 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.dragoninfo</groupId>
-            <artifactId>dcuc-user-api</artifactId>
-            <version>2.0.1-tjdsj-SNAPSHOT</version>
-        </dependency>
+
         <!--监控配置-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -136,7 +132,7 @@
         <dependency>
             <groupId>com.dragoninfo</groupId>
             <artifactId>dcuc-user-api</artifactId>
-            <version>2.0.1-tjdsj-SNAPSHOT</version>
+            <version>2.0.2-tjdsj-SNAPSHOT</version>
         </dependency>
 
         <dependency>

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

@@ -310,17 +310,4 @@ public class AppController {
         return apps;
     }
 
-    @ApiOperation(value = "授权主体-应用信息同步")
-    @GetMapping(value = "sync")
-    public Result sync() {
-        /*AuthOrgInfo authOrgInfo = new AuthOrgInfo();
-        BeanUtils.copyProperties(vo, dto);
-        ResponseDTO responseDTO = serviceAuthResultFacade.updateServiceAuthResult(dto);
-        if (ResponseDTO.SUCCESS_CODE.equals(responseDTO.getStatusCode())) {
-            return Result.success(responseDTO.getMessage());
-        }
-        return Result.fail(responseDTO.getMessage());*/
-        return null;
-    }
-
 }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/app/vo/ResourceRequestParam.java

@@ -19,7 +19,13 @@ public class ResourceRequestParam {
      * 是否获取全量应用和服务资源数据
      */
     @ApiModelProperty(value = "是否获取全量应用和服务资源数据")
-    private boolean listingAll;
+    private Boolean listingAll;
+
+    /**
+     * 获取菜单资源是否同步获取 false 异步获取  true 同步获取  可为空,空默认false
+     */
+    @ApiModelProperty(value = "获取菜单资源是否同步获取 false 异步获取  true 同步获取  可为空,空默认false")
+    private Boolean menuSync;
 
     /**
      * 不全量获取时,获取资源数据参数封装集合

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

@@ -3,12 +3,12 @@ package com.dragoninfo.dcuc.authweb.restcontroller.sub;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.dragoninfo.dcuc.app.entity.ApplyInfo;
-import com.dragoninfo.dcuc.auth.auth.dto.attr.AttrInfoTreeDTO;
-import com.dragoninfo.dcuc.auth.auth.dto.attr.AttrRelAcceptDTO;
-import com.dragoninfo.dcuc.auth.auth.dto.attr.RelSearchDTO;
+import com.dragoninfo.dcuc.auth.sub.dto.AttrInfoTreeDTO;
+import com.dragoninfo.dcuc.auth.sub.dto.AttrRelAcceptDTO;
+import com.dragoninfo.dcuc.auth.sub.dto.RelSearchDTO;
 import com.dragoninfo.dcuc.auth.auth.enumresources.sub.AttrBelongTypeEnum;
 import com.dragoninfo.dcuc.auth.auth.enumresources.sub.AttrTypeEnum;
-import com.dragoninfo.dcuc.auth.auth.facade.attr.IAttrFacade;
+import com.dragoninfo.dcuc.auth.sub.facade.IAttrFacade;
 import com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.attr.AttrInfoTreeVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.attr.AttrRelAcceptVo;
 import com.dragoninfo.dcuc.authweb.util.VersionUtils;

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

@@ -3,7 +3,7 @@ package com.dragoninfo.dcuc.authweb.restcontroller.sub;
 import cn.hutool.core.bean.BeanUtil;
 import com.dragoninfo.dcuc.auth.auth.dto.AuthOrgInfoDTO;
 import com.dragoninfo.dcuc.auth.auth.entity.AuthOrgInfo;
-import com.dragoninfo.dcuc.auth.auth.facade.IAuthOrgInfoFacade;
+import com.dragoninfo.dcuc.auth.sub.facade.IAuthOrgInfoFacade;
 import com.dragoninfo.dcuc.auth.auth.vo.AuthOrgTreeNode;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.AuthOrgInfoVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.user.manager.utils.ImpExcelUtils;
@@ -126,19 +126,6 @@ public class AuthOrgInfoController {
         return null;
     }
 
-    @ApiOperation(value = "授权主体-机构信息同步")
-    @GetMapping(value = "sync")
-    public Result sync() {
-        /*AuthOrgInfo authOrgInfo = new AuthOrgInfo();
-        BeanUtils.copyProperties(vo, dto);
-        ResponseDTO responseDTO = serviceAuthResultFacade.updateServiceAuthResult(dto);
-        if (ResponseDTO.SUCCESS_CODE.equals(responseDTO.getStatusCode())) {
-            return Result.success(responseDTO.getMessage());
-        }
-        return Result.fail(responseDTO.getMessage());*/
-        return null;
-    }
-
 
     /**
      * 检查导入的数据是否存在重复

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

@@ -1,11 +1,10 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.sub;
 
 import com.dragoninfo.dcuc.auth.auth.entity.AuthUserInfo;
-import com.dragoninfo.dcuc.auth.auth.facade.IAuthUserInfoFacade;
+import com.dragoninfo.dcuc.auth.sub.facade.IAuthUserInfoFacade;
 import com.dragoninfo.dcuc.authweb.restcontroller.user.manager.utils.ImpExcelUtils;
 import com.dragoninfo.dcuc.duceap.facade.IDuceapUploadFacade;
 import com.dragoninfo.dcuc.duceap.upload.dto.DocContentDTO;
-import com.dragoninfo.duceap.core.response.Result;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.commons.util.json.JsonUtils;
 import com.dragonsoft.duceap.core.search.Searchable;
@@ -88,18 +87,6 @@ public class AuthUserInfoController {
         return null;
     }
 
-    @ApiOperation(value = "授权主体-人员信息同步")
-    @GetMapping(value = "sync")
-    public Result sync() {
-        /*AuthOrgInfo authOrgInfo = new AuthOrgInfo();
-        BeanUtils.copyProperties(vo, dto);
-        ResponseDTO responseDTO = serviceAuthResultFacade.updateServiceAuthResult(dto);
-        if (ResponseDTO.SUCCESS_CODE.equals(responseDTO.getStatusCode())) {
-            return Result.success(responseDTO.getMessage());
-        }
-        return Result.fail(responseDTO.getMessage());*/
-        return null;
-    }
 
     /**
      * 检查导入数据是否重复

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

@@ -1,6 +1,6 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.sub;
 
-import com.dragoninfo.dcuc.app.dto.sub.DataClaAcceptDTO;
+import com.dragoninfo.dcuc.app.sub.dto.DataClaAcceptDTO;
 import com.dragoninfo.dcuc.app.facade.sub.IDataClaFacade;
 import com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.data.DataClaAcceptVo;
 import com.dragoninfo.dcuc.authweb.util.VersionUtils;

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

@@ -1,6 +1,6 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.sub;
 
-import com.dragoninfo.dcuc.app.dto.sub.DataLevelDTO;
+import com.dragoninfo.dcuc.app.sub.dto.DataLevelDTO;
 import com.dragoninfo.dcuc.app.facade.sub.IDataLevelFacade;
 import com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.data.DataLevelVo;
 import com.dragoninfo.dcuc.authweb.util.VersionUtils;

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

@@ -1,6 +1,6 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.sub;
 
-import com.dragoninfo.dcuc.app.dto.sub.DataSecDTO;
+import com.dragoninfo.dcuc.app.sub.dto.DataSecDTO;
 import com.dragoninfo.dcuc.app.facade.sub.IDataSecFacade;
 import com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.data.DataSecVo;
 import com.dragoninfo.dcuc.authweb.util.VersionUtils;

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

@@ -0,0 +1,76 @@
+package com.dragoninfo.dcuc.authweb.restcontroller.sub;
+
+import com.dragoninfo.dcuc.app.facade.IResourceFacade;
+import com.dragoninfo.dcuc.auth.sub.facade.ISubSyncFacade;
+import com.dragoninfo.dcuc.authweb.util.VersionUtils;
+import com.dragoninfo.duceap.core.response.Result;
+import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 主客体资源同步Controller
+ * @author mazq
+ * @date 2021/5/27
+ */
+@RestController
+@RequestMapping(value = "/syncsvr/"+ VersionUtils.VERSION_UID)
+public class SubSyncController {
+
+    @Autowired
+    private ISubSyncFacade subSyncFacade;
+
+    @Autowired
+    private IResourceFacade resourceFacade;
+
+
+    @ApiOperation(value = "授权主体-人员信息同步")
+    @GetMapping(value = "userSync")
+    public Result userSync() {
+        ResponseStatus response = subSyncFacade.userSync();
+        if (ResponseStatus.SUCCESS_CODE.equals(response.getStatusCode())) {
+            return Result.success();
+        } else {
+            return Result.fail(response.getMessage());
+        }
+    }
+
+
+    @ApiOperation(value = "授权主体-机构信息同步")
+    @GetMapping(value = "orgSync")
+    public Result orgSync() {
+        ResponseStatus response = subSyncFacade.orgSync();
+        if (ResponseStatus.SUCCESS_CODE.equals(response.getStatusCode())) {
+            return Result.success();
+        } else {
+            return Result.fail(response.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "授权主体-服务信息同步")
+    @GetMapping(value = "serSync")
+    public Result serSync() {
+        ResponseStatus response = resourceFacade.subSerSync();
+        if (ResponseStatus.SUCCESS_CODE.equals(response.getStatusCode())) {
+            return Result.success();
+        } else {
+            return Result.fail(response.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "授权主体-应用信息同步")
+    @GetMapping(value = "appSync")
+    public Result appSync() {
+        ResponseStatus response = resourceFacade.subAppSync();
+        if (ResponseStatus.SUCCESS_CODE.equals(response.getStatusCode())) {
+            return Result.success();
+        } else {
+            return Result.fail(response.getMessage());
+        }
+    }
+
+
+}