Merge branch 'dev' into 'test'

Dev

See merge request jygk/dsc!24

zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/iwork/dto/IWorkWorkflowCreateReqDTO.java

@@ -36,9 +36,9 @@ public class IWorkWorkflowCreateReqDTO extends IWorkBaseReqDTO {
 
     @Schema(description = "用印材料附件 URL（必填）")
     private String xyywjUrl;
-    
-    @Schema(description = "用印材料附件文件名（必填）")
-    private String xyywjFileName;
+
+    @Schema(description = "业务回调标识（回调分发使用，≤255 字符）")
+    private String bizCallbackKey;
 
     @Schema(description = "用印事项")
     private String yysx;

zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/mq/iwork/IWorkBizCallbackMessage.java

@@ -0,0 +1,23 @@
+package com.zt.plat.module.system.mq.iwork;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class IWorkBizCallbackMessage {
+
+    /** 统一回调主题 */
+    public static final String TOPIC = "SYSTEM_IWORK_BIZ_CALLBACK";
+
+    /** requestId 唯一标识 */
+    private String requestId;
+    /** 业务回调标识 */
+    private String bizCallbackKey;
+    /** 回调负载对象（可为 Map） */
+    private Object payload;
+    /** 当前尝试次数，从 0 开始 */
+    private int attempt;
+    /** 最大尝试次数 */
+    private int maxAttempts;
+}

zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/mq/iwork/IWorkBizCallbackResultMessage.java

@@ -0,0 +1,31 @@
+package com.zt.plat.module.system.mq.iwork;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class IWorkBizCallbackResultMessage {
+
+    /** 统一回调结果主题 */
+    public static final String TOPIC = "SYSTEM_IWORK_BIZ_CALLBACK_RESULT";
+
+    /** requestId 唯一标识 */
+    private String requestId;
+    /** 业务回调标识，对应发送方设置的 tag */
+    private String bizCallbackKey;
+    /** 是否成功 */
+    private boolean success;
+    /** 错误消息 */
+    private String errorMessage;
+    /** 当前尝试次数（业务侧可回传） */
+    private int attempt;
+    /** 最大尝试次数 */
+    private int maxAttempts;
+    /** 回调负载（用于 system 端重试再投递） */
+    private Object payload;
+}