1. 修复 iwork api 与 controller 中的 vo dto 不对应的问题
This commit is contained in:
@@ -0,0 +1,20 @@
|
|||||||
|
package com.zt.plat.module.system.api.iwork.dto;
|
||||||
|
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* iWork 集成接口公用的请求字段(API 专用,不依赖 VO)。
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class IWorkBaseReqDTO {
|
||||||
|
|
||||||
|
@Schema(description = "配置的 iWork 凭证 appId;为空时使用默认凭证", example = "iwork-app")
|
||||||
|
private String appId;
|
||||||
|
|
||||||
|
@Schema(description = "iWork 操作人用户编号", example = "1")
|
||||||
|
private String operatorUserId;
|
||||||
|
|
||||||
|
@Schema(description = "是否强制刷新 token", example = "false")
|
||||||
|
private Boolean forceRefreshToken;
|
||||||
|
}
|
||||||
@@ -1,21 +1,60 @@
|
|||||||
package com.zt.plat.module.system.api.iwork.dto;
|
package com.zt.plat.module.system.api.iwork.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* iWork 操作结果响应 DTO
|
* iWork 操作结果响应 DTO(结构对齐 VO,独立定义)。
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
public class IWorkOperationRespDTO {
|
public class IWorkOperationRespDTO {
|
||||||
|
|
||||||
@Schema(description = "是否成功")
|
@Schema(description = "iWork 返回的原始数据结构")
|
||||||
|
private Payload payload;
|
||||||
|
|
||||||
|
@Schema(description = "是否判断为成功")
|
||||||
private Boolean success;
|
private Boolean success;
|
||||||
|
|
||||||
@Schema(description = "iWork 返回的操作编号或实例编号")
|
@Schema(description = "返回提示信息")
|
||||||
private String operationId;
|
|
||||||
|
|
||||||
@Schema(description = "提示信息")
|
|
||||||
private String message;
|
private String message;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public static class Payload {
|
||||||
|
|
||||||
|
@Schema(description = "iWork 返回的业务状态码,例如 SUCCESS")
|
||||||
|
private String code;
|
||||||
|
|
||||||
|
@Schema(description = "iWork 返回的数据体")
|
||||||
|
private PayloadData data;
|
||||||
|
|
||||||
|
@Schema(description = "错误信息对象,通常为空对象")
|
||||||
|
private Map<String, Object> errMsg;
|
||||||
|
|
||||||
|
@Schema(description = "返回失败时的详细信息")
|
||||||
|
private ReqFailMsg reqFailMsg;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public static class PayloadData {
|
||||||
|
|
||||||
|
@Schema(description = "iWork 生成的请求编号 requestid")
|
||||||
|
@JsonProperty("requestid")
|
||||||
|
private Long requestId;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public static class ReqFailMsg {
|
||||||
|
|
||||||
|
@Schema(description = "失败时的关键参数集合")
|
||||||
|
private Map<String, Object> keyParameters;
|
||||||
|
|
||||||
|
@Schema(description = "失败消息对象")
|
||||||
|
private Map<String, Object> msgInfo;
|
||||||
|
|
||||||
|
@Schema(description = "其他附加参数,例如 doAutoApprove")
|
||||||
|
private Map<String, Object> otherParams;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.zt.plat.module.system.api.iwork.dto;
|
|||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 发起 iWork 流程请求 DTO
|
* 发起 iWork 流程请求 DTO
|
||||||
@@ -9,7 +10,8 @@ import lombok.Data;
|
|||||||
* 与 IWorkWorkflowCreateReqVO 字段一一对应,便于 Feign 调用。
|
* 与 IWorkWorkflowCreateReqVO 字段一一对应,便于 Feign 调用。
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
public class IWorkWorkflowCreateReqDTO {
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
public class IWorkWorkflowCreateReqDTO extends IWorkBaseReqDTO {
|
||||||
|
|
||||||
@Schema(description = "用印申请人(iWork 人员 ID)", example = "1001")
|
@Schema(description = "用印申请人(iWork 人员 ID)", example = "1001")
|
||||||
private String jbr;
|
private String jbr;
|
||||||
|
|||||||
@@ -2,20 +2,27 @@ package com.zt.plat.module.system.api.iwork.dto;
|
|||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 作废 / 干预 iWork 流程请求 DTO
|
* 作废 / 干预 iWork 流程请求 DTO
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
public class IWorkWorkflowVoidReqDTO {
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
public class IWorkWorkflowVoidReqDTO extends IWorkBaseReqDTO {
|
||||||
|
|
||||||
@Schema(description = "iWork 实例编号", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "流程请求编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "REQ-001")
|
||||||
private String instanceId;
|
private String requestId;
|
||||||
|
|
||||||
@Schema(description = "操作人 iWork 用户编号", requiredMode = Schema.RequiredMode.REQUIRED)
|
|
||||||
private String operatorUserId;
|
|
||||||
|
|
||||||
@Schema(description = "作废原因")
|
@Schema(description = "作废原因")
|
||||||
private String reason;
|
private String reason;
|
||||||
|
|
||||||
|
@Schema(description = "额外参数")
|
||||||
|
private Map<String, Object> extraParams;
|
||||||
|
|
||||||
|
@Schema(description = "额外 Form 数据")
|
||||||
|
private Map<String, String> formExtras;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user