Merge remote-tracking branch 'origin/dev' into dev

pom.xml

@@ -237,8 +237,8 @@
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>dev</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
-                <config.username/>
+                <config.username>nacos</config.username>
-                <config.password/>
+                <config.password>P@ssword25</config.password>
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>
@@ -250,8 +250,8 @@
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>prod</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
-                <config.username/>
+                <config.username>nacos</config.username>
-                <config.password/>
+                <config.password>P@ssword25</config.password>
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>
@@ -263,8 +263,8 @@
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>local</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
-                <config.username/>
+                <config.username>nacos</config.username>
-                <config.password/>
+                <config.password>P@ssword25</config.password>
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>

zt-dependencies/pom.xml

@@ -87,6 +87,7 @@
         <netty.version>4.1.116.Final</netty.version>
         <mqtt.version>1.2.5</mqtt.version>
         <pf4j-spring.version>0.9.0</pf4j-spring.version>
+        <okhttp3.version>4.12.0</okhttp3.version>
         <!-- 规则引擎 -->
         <liteflow.version>2.15.1</liteflow.version>
         <vertx.version>4.5.13</vertx.version>

zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/enums/dept/DeptSourceEnum.java

@@ -13,7 +13,8 @@ import lombok.Getter;
 public enum DeptSourceEnum {
 
     EXTERNAL(1, "外部部门"),  // 系统创建的部门
-    SYNC(2, "同步部门");     // 通过 OrgSyncService 同步的部门
+    SYNC(2, "同步部门"),     // 通过 OrgSyncService 同步的部门
+    IWORK(3, "iWork 同步");  // 通过 iWork 同步的部门
 
     /**
      * 类型

zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/enums/user/UserSourceEnum.java

@@ -13,7 +13,8 @@ import lombok.Getter;
 public enum UserSourceEnum {
 
     EXTERNAL(1, "外部用户"),  // 系统创建、注册等方式产生的用户
-    SYNC(2, "同步用户");     // 通过 UserSyncService 同步的用户
+    SYNC(2, "同步用户"),     // 通过 UserSyncService 同步的用户
+    IWORK(3, "iWork 用户");  // 通过 iWork 全量/单条同步产生的用户
 
     /**
      * 类型

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/integration/iwork/vo/IWorkFullSyncReqVO.java

@@ -0,0 +1,53 @@
+package com.zt.plat.module.system.controller.admin.integration.iwork.vo;
+
+import com.zt.plat.module.system.enums.integration.IWorkSyncEntityTypeEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import lombok.Data;
+
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * iWork 全量同步请求
+ */
+@Data
+public class IWorkFullSyncReqVO {
+
+    @Schema(description = "起始页码，从 1 开始", example = "1")
+    @Min(1)
+    private Integer startPage = 1;
+
+    @Schema(description = "最大处理页数，null 表示处理至 iWork 返回的末页", example = "10")
+    @Min(1)
+    private Integer maxPages;
+
+    @Schema(description = "每次分页从 iWork 拉取的记录数", example = "100")
+    @Min(1)
+    @Max(500)
+    private Integer pageSize = 100;
+
+    @Schema(description = "同步范围列表，默认同步全部。可选：subcompany、department、jobTitle、user")
+    private List<String> scopes;
+
+    @Schema(description = "是否包含已失效（canceled=1）的记录", example = "false")
+    private Boolean includeCanceled = Boolean.FALSE;
+
+    public Set<IWorkSyncEntityTypeEnum> resolveScopes() {
+        EnumSet<IWorkSyncEntityTypeEnum> defaults = EnumSet.allOf(IWorkSyncEntityTypeEnum.class);
+        if (scopes == null || scopes.isEmpty()) {
+            return defaults;
+        }
+        Set<IWorkSyncEntityTypeEnum> resolved = scopes.stream()
+                .map(IWorkSyncEntityTypeEnum::fromCode)
+                .filter(java.util.Objects::nonNull)
+                .collect(Collectors.toCollection(() -> EnumSet.noneOf(IWorkSyncEntityTypeEnum.class)));
+        if (resolved.isEmpty()) {
+            return defaults;
+        }
+        return resolved;
+    }
+}

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/integration/iwork/vo/IWorkFullSyncRespVO.java

@@ -0,0 +1,34 @@
+package com.zt.plat.module.system.controller.admin.integration.iwork.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * iWork 全量同步响应
+ */
+@Data
+public class IWorkFullSyncRespVO {
+
+    @Schema(description = "本次处理的总页数")
+    private Integer processedPages;
+
+    @Schema(description = "每次分页请求的条数")
+    private Integer pageSize;
+
+    @Schema(description = "分部统计信息")
+    private IWorkSyncEntityStatVO subcompanyStat = new IWorkSyncEntityStatVO();
+
+    @Schema(description = "部门统计信息")
+    private IWorkSyncEntityStatVO departmentStat = new IWorkSyncEntityStatVO();
+
+    @Schema(description = "岗位统计信息")
+    private IWorkSyncEntityStatVO jobTitleStat = new IWorkSyncEntityStatVO();
+
+    @Schema(description = "人员统计信息")
+    private IWorkSyncEntityStatVO userStat = new IWorkSyncEntityStatVO();
+
+    @Schema(description = "每个批次的详细统计")
+    private List<IWorkSyncBatchStatVO> batches;
+}