zgty/zt-dsc
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	zt-gateway/src/main/resources/application.yaml
#	zt-module-rule/zt-module-rule-server/src/main/java/com/zt/plat/module/rule/framework/liteflow/component/action/DataSetComponent.java
#	zt-module-rule/zt-module-rule-server/src/main/java/com/zt/plat/module/rule/framework/liteflow/component/base/BaseRuleComponent.java
This commit is contained in:
chenbowen
2025-10-15 09:49:45 +08:00
parent 88e2766b97 89d99215d4
commit c0a2e10fcc
247 changed files with 11129 additions and 2763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/dept/DeptExternalCodeApi.java Normal file
View File

@@ -0,0 +1,38 @@
package com.zt.plat.module.system.api.dept;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.module.system.api.dept.dto.DeptExternalCodeRespDTO;
import com.zt.plat.module.system.enums.ApiConstants;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@FeignClient(name = ApiConstants.NAME)
@Tag(name = "RPC 服务 - 部门外部组织编码映射")
@RequestMapping(ApiConstants.PREFIX + "/dept-external-code")
public interface DeptExternalCodeApi {
@GetMapping("/get-by-system-and-external")
@Operation(summary = "根据外部系统与外部组织编码查询映射")
CommonResult<DeptExternalCodeRespDTO> getBySystemCodeAndExternalCode(
@RequestParam("systemCode") @Parameter(description = "外部系统标识", required = true) String systemCode,
@RequestParam("externalDeptCode") @Parameter(description = "外部组织编码", required = true) String externalDeptCode);
@GetMapping("/get-by-system-and-dept")
@Operation(summary = "根据外部系统与部门编号查询映射")
CommonResult<DeptExternalCodeRespDTO> getBySystemCodeAndDeptId(
@RequestParam("systemCode") @Parameter(description = "外部系统标识", required = true) String systemCode,
@RequestParam("deptId") @Parameter(description = "部门编号", required = true) Long deptId);
@GetMapping("/list-by-dept")
@Operation(summary = "根据部门编号查询映射列表")
CommonResult<List<DeptExternalCodeRespDTO>> getListByDeptId(
@RequestParam("deptId") @Parameter(description = "部门编号", required = true) Long deptId);
}

45
zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/dept/dto/DeptExternalCodeRespDTO.java Normal file
View File

@@ -0,0 +1,45 @@
package com.zt.plat.module.system.api.dept.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Schema(description = "RPC - 部门外部组织编码映射 Response DTO")
@Data
public class DeptExternalCodeRespDTO {
@Schema(description = "映射编号", example = "1024")
private Long id;
@Schema(description = "部门编号", example = "2048")
private Long deptId;
@Schema(description = "部门名称", example = "技术部")
private String deptName;
@Schema(description = "部门编码", example = "DEPT_001")
private String deptCode;
@Schema(description = "外部系统标识", example = "ERP")
private String systemCode;
@Schema(description = "外部组织编码", example = "100200")
private String externalDeptCode;
@Schema(description = "外部组织名称", example = "总部-华东区")
private String externalDeptName;
@Schema(description = "状态", example = "0")
private Integer status;
@Schema(description = "备注")
private String remark;
@Schema(description = "创建时间")
private LocalDateTime createTime;
@Schema(description = "最后更新时间")
private LocalDateTime updateTime;
}

5
zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/enums/ErrorCodeConstants.java
View File

@@ -20,6 +20,8 @@ public interface ErrorCodeConstants {
ErrorCode AUTH_TEST_LOGIN_NOT_ALLOWED = new ErrorCode(1_002_000_009, "测试登录接口仅在测试环境和本地开发环境下可用");
ErrorCode AUTH_OAUTH2_CALLBACK_ERROR = new ErrorCode(1_002_000_010, "OAuth2回调处理失败：{}");
ErrorCode AUTH_LOGIN_INTERNAL_USER_PASSWORD_NOT_ALLOWED = new ErrorCode(1_002_000_011, "内部用户不允许使用账号密码登录，请通过e办进行统一登录");
ErrorCode AUTH_LOGIN_EBAN_TOKEN_INVALID = new ErrorCode(1_002_000_012, "token 无效");
ErrorCode AUTH_LOGIN_EBAN_USER_NOT_SYNC = new ErrorCode(1_002_000_013, "用户未同步到此应用，请联系管理员进行同步");
// ========== 菜单模块 1-002-001-000 ==========
ErrorCode MENU_NAME_DUPLICATE = new ErrorCode(1_002_001_000, "已经存在该名字的菜单");
@@ -65,6 +67,9 @@ public interface ErrorCodeConstants {
ErrorCode DEPT_TENANT_RELATION_EXISTS = new ErrorCode(1_002_004_008, "当前租户已经关联组织机构");
ErrorCode DEPT_CODE_NOT_NULL = new ErrorCode(1_002_004_009, "部门编码不能为空");
ErrorCode DEPT_CODE_DUPLICATE = new ErrorCode(1_002_004_010, "已经存在该编码的部门");
ErrorCode DEPT_EXTERNAL_RELATION_EXISTS = new ErrorCode(1_002_004_011, "已经存在该部门在外部系统({})的编码映射");
ErrorCode DEPT_EXTERNAL_CODE_DUPLICATE = new ErrorCode(1_002_004_012, "已经存在该外部系统({})的外部组织编码({})");
ErrorCode DEPT_EXTERNAL_RELATION_NOT_EXISTS = new ErrorCode(1_002_004_013, "组织外部编码映射不存在");
// ========== 岗位模块 1-002-005-000 ==========