Merge remote-tracking branch 'base-version/main' into dev

# Conflicts:
#	zt-dependencies/pom.xml

zt-dependencies/pom.xml

@@ -26,14 +26,11 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.43</revision>
         <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
         <!-- 统一依赖管理 -->
         <spring.boot.version>3.4.5</spring.boot.version>
         <spring.cloud.version>2024.0.1</spring.cloud.version>
         <spring.cloud.alibaba.version>2023.0.3.2</spring.cloud.alibaba.version>
-        <!-- 分布式事务相关 -->
-        <seata.version>2.4.0</seata.version>
         <!-- Web 相关 -->
         <springdoc.version>2.8.3</springdoc.version>
         <knife4j.version>4.6.0</knife4j.version>
@@ -88,8 +85,6 @@
         <netty.version>4.1.116.Final</netty.version>
         <mqtt.version>1.2.5</mqtt.version>
         <pf4j-spring.version>0.9.0</pf4j-spring.version>
-        <docx4j.version>11.4.7</docx4j.version>
-        <docx4j-jaxb.version>11.4.7</docx4j-jaxb.version>
         <!-- 规则引擎 -->
         <liteflow.version>2.15.1</liteflow.version>
         <vertx.version>4.5.13</vertx.version>
@@ -135,20 +130,6 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- 分布式事务：Seata -->
-            <!-- 显式覆盖 Spring Cloud Alibaba BOM 中的 Seata 1.8.0，升级到 2.4.0 以支持达梦数据库 -->
-            <!-- 注意：Seata 2.2.0+ 改为使用 org.apache.seata groupId -->
-            <dependency>
-                <groupId>org.apache.seata</groupId>
-                <artifactId>seata-all</artifactId>
-                <version>${seata.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.seata</groupId>
-                <artifactId>seata-spring-boot-starter</artifactId>
-                <version>${seata.version}</version>
-            </dependency>
-
             <!-- 业务组件 -->
             <dependency>
                 <groupId>io.github.mouzt</groupId>
@@ -488,6 +469,12 @@
                 <version>${podam.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>${okhttp3.version}</version>
+            </dependency>
+
             <!-- 工作流相关 -->
             <dependency>
                 <groupId>org.flowable</groupId>
@@ -724,17 +711,6 @@
                 <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
                 <version>${mqtt.version}</version>
             </dependency>
-            <!-- docx4j - Word文档处理 -->
-            <dependency>
-                <groupId>org.docx4j</groupId>
-                <artifactId>docx4j-JAXB-ReferenceImpl</artifactId>
-                <version>${docx4j-jaxb.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.docx4j</groupId>
-                <artifactId>docx4j-core</artifactId>
-                <version>${docx4j.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

zt-module-system/zt-module-system-server/pom.xml

@@ -67,10 +67,10 @@
             <artifactId>zt-spring-boot-starter-redis</artifactId>
         </dependency>
 
-        <!-- Reactive HTTP client for iWork integration -->
+        <!-- HTTP client for iWork integration -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
         </dependency>
 
         <dependency>

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

@@ -1,12 +1,19 @@
 package com.zt.plat.module.system.controller.admin.integration.iwork;
 
 import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.module.system.controller.admin.integration.iwork.vo.IWorkDepartmentQueryReqVO;
+import com.zt.plat.module.system.controller.admin.integration.iwork.vo.IWorkJobTitleQueryReqVO;
 import com.zt.plat.module.system.controller.admin.integration.iwork.vo.IWorkOperationRespVO;
+import com.zt.plat.module.system.controller.admin.integration.iwork.vo.IWorkOrgRespVO;
+import com.zt.plat.module.system.controller.admin.integration.iwork.vo.IWorkOrgSyncReqVO;
+import com.zt.plat.module.system.controller.admin.integration.iwork.vo.IWorkSubcompanyQueryReqVO;
 import com.zt.plat.module.system.controller.admin.integration.iwork.vo.IWorkUserInfoReqVO;
 import com.zt.plat.module.system.controller.admin.integration.iwork.vo.IWorkUserInfoRespVO;
+import com.zt.plat.module.system.controller.admin.integration.iwork.vo.IWorkUserQueryReqVO;
 import com.zt.plat.module.system.controller.admin.integration.iwork.vo.IWorkWorkflowCreateReqVO;
 import com.zt.plat.module.system.controller.admin.integration.iwork.vo.IWorkWorkflowVoidReqVO;
 import com.zt.plat.module.system.service.integration.iwork.IWorkIntegrationService;
+import com.zt.plat.module.system.service.integration.iwork.IWorkOrgRestService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -30,6 +37,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 public class IWorkIntegrationController {
 
     private final IWorkIntegrationService integrationService;
+    private final IWorkOrgRestService orgRestService;
 
     @PostMapping("/user/resolve")
     @Operation(summary = "根据外部标识获取 iWork 用户编号")
@@ -48,4 +56,54 @@ public class IWorkIntegrationController {
     public CommonResult<IWorkOperationRespVO> voidWorkflow(@Valid @RequestBody IWorkWorkflowVoidReqVO reqVO) {
         return success(integrationService.voidWorkflow(reqVO));
     }
+
+    // ----------------- 人力组织接口 -----------------
+
+    @PostMapping("/hr/subcompany/page")
+    @Operation(summary = "获取 iWork 分部列表")
+    public CommonResult<IWorkOrgRespVO> listSubcompanies(@Valid @RequestBody IWorkSubcompanyQueryReqVO reqVO) {
+        return success(orgRestService.listSubcompanies(reqVO));
+    }
+
+    @PostMapping("/hr/department/page")
+    @Operation(summary = "获取 iWork 部门列表")
+    public CommonResult<IWorkOrgRespVO> listDepartments(@Valid @RequestBody IWorkDepartmentQueryReqVO reqVO) {
+        return success(orgRestService.listDepartments(reqVO));
+    }
+
+    @PostMapping("/hr/job-title/page")
+    @Operation(summary = "获取 iWork 岗位列表")
+    public CommonResult<IWorkOrgRespVO> listJobTitles(@Valid @RequestBody IWorkJobTitleQueryReqVO reqVO) {
+        return success(orgRestService.listJobTitles(reqVO));
+    }
+
+    @PostMapping("/hr/user/page")
+    @Operation(summary = "获取 iWork 人员列表")
+    public CommonResult<IWorkOrgRespVO> listUsers(@Valid @RequestBody IWorkUserQueryReqVO reqVO) {
+        return success(orgRestService.listUsers(reqVO));
+    }
+
+    @PostMapping("/hr/subcompany/sync")
+    @Operation(summary = "同步分部信息至 iWork")
+    public CommonResult<IWorkOrgRespVO> syncSubcompanies(@Valid @RequestBody IWorkOrgSyncReqVO reqVO) {
+        return success(orgRestService.syncSubcompanies(reqVO));
+    }
+
+    @PostMapping("/hr/department/sync")
+    @Operation(summary = "同步部门信息至 iWork")
+    public CommonResult<IWorkOrgRespVO> syncDepartments(@Valid @RequestBody IWorkOrgSyncReqVO reqVO) {
+        return success(orgRestService.syncDepartments(reqVO));
+    }
+
+    @PostMapping("/hr/job-title/sync")
+    @Operation(summary = "同步岗位信息至 iWork")
+    public CommonResult<IWorkOrgRespVO> syncJobTitles(@Valid @RequestBody IWorkOrgSyncReqVO reqVO) {
+        return success(orgRestService.syncJobTitles(reqVO));
+    }
+
+    @PostMapping("/hr/user/sync")
+    @Operation(summary = "同步人员信息至 iWork")
+    public CommonResult<IWorkOrgRespVO> syncUsers(@Valid @RequestBody IWorkOrgSyncReqVO reqVO) {
+        return success(orgRestService.syncUsers(reqVO));
+    }
 }

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

@@ -0,0 +1,24 @@
+package com.zt.plat.module.system.controller.admin.integration.iwork.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * iWork 部门查询参数。
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IWorkDepartmentQueryReqVO extends IWorkOrgBaseQueryReqVO {
+
+    @Schema(description = "部门编码")
+    private String departmentCode;
+
+    @Schema(description = "部门名称")
+    private String departmentName;
+
+    @Schema(description = "所属分部ID")
+    private String subcompanyId;
+}

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

@@ -0,0 +1,21 @@
+package com.zt.plat.module.system.controller.admin.integration.iwork.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * iWork 岗位查询参数。
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IWorkJobTitleQueryReqVO extends IWorkOrgBaseQueryReqVO {
+
+    @Schema(description = "岗位编码")
+    private String jobTitleCode;
+
+    @Schema(description = "岗位名称")
+    private String jobTitleName;
+}