sync: 同步 v1.0.4 并脱敏配置与镜像

server/internal/model/batch_execution_log.go

@@ -2,10 +2,10 @@ package model
 
 import (
 	"context"
+	"github.com/gogf/gf/v2/encoding/gjson"
 	"git.5iot.com/iotlcm-public/iotlcm-admin-svr/internal/library/allocationunits"
 	"git.5iot.com/iotlcm-public/iotlcm-admin-svr/internal/library/xgorm/hook"
 	"git.5iot.com/iotlcm-public/iotlcm-admin-svr/internal/model/request"
-	"github.com/gogf/gf/v2/encoding/gjson"
 
 	"github.com/gogf/gf/v2/os/gtime"
 )
@@ -37,7 +37,10 @@ type BatchExecutionLogListModel struct {
 	BatchType          int               `json:"batchType" dc:"批次类型"`
 	SourceType         *int              `json:"sourceType" dc:"来源方式 枚举"`
 	BatchAsyncStatus   int               `json:"batchAsyncStatus" dc:"异步处理状态"`
+	RestartPhase       string            `json:"restartPhase" orm:"-" dc:"重启阶段 waiting_resume=等待复机"`
+	RestartResumeAt    string            `json:"restartResumeAt" orm:"-" dc:"计划复机时间"`
 	TotalCount         int               `json:"totalCount" dc:"总数量"`
+	UnknownCount       int               `json:"unknownCount" orm:"-" dc:"待核查数量"`
 	RunResult          int               `json:"runResult" dc:"运行结果"`
 	FailReason         string            `json:"failReason" dc:"失败原因"`
 	StartTime          *gtime.Time       `json:"startTime" dc:"开始时间"`
@@ -56,15 +59,36 @@ func (in *BatchExecutionLogDetailParam) Filter(ctx context.Context) (err error)
 	return
 }
 
+// BatchExecutionLogSyncReviewParam 手动同步待核查批次的上游执行结果。
+// 只按既有受理号(jobId)重查一次，不重发办理。
+type BatchExecutionLogSyncReviewParam struct {
+	BatchNo string `json:"batchNo" v:"required#批次号不能为空" dc:"批次编号"`
+	Reason  string `json:"reason" dc:"同步原因"`
+}
+
+func (in *BatchExecutionLogSyncReviewParam) Filter(ctx context.Context) (err error) {
+	return
+}
+
+type BatchExecutionLogSyncReviewModel struct {
+	BatchNo          string `json:"batchNo" dc:"批次编号"`
+	BatchType        int    `json:"batchType" dc:"批次类型"`
+	BatchAsyncStatus int    `json:"batchAsyncStatus" dc:"异步处理状态"`
+	UnknownCount     int    `json:"unknownCount" dc:"待核查数量"`
+	Queued           bool   `json:"queued" dc:"是否已提交同步"`
+}
+
 type BatchExecutionLogFileModel struct {
 	OssId int64  `json:"ossId" dc:"OSS文件ID"`
 	Url   string `json:"url" dc:"文件URL"`
 }
 
 type BatchExecutionLogResultFileModel struct {
+	ExportTaskId   int64  `json:"exportTaskId,omitempty" dc:"导出任务ID"`
 	DownloadId     int64  `json:"downloadId" dc:"下载任务ID"`
 	OssId          int64  `json:"ossId" dc:"OSS文件ID"`
 	Url            string `json:"url" dc:"文件URL"`
+	OriginalName   string `json:"originalName" dc:"原始下载文件名"`
 	DownloadStatus int    `json:"downloadStatus" dc:"下载状态"`
 }
 
@@ -77,9 +101,12 @@ type BatchExecutionLogDetailModel struct {
 	BatchType        int                               `json:"batchType" dc:"批次类型"`
 	SourceType       *int                              `json:"sourceType" dc:"来源方式 枚举"`
 	BatchAsyncStatus int                               `json:"batchAsyncStatus" dc:"异步处理状态 0=已创建 1=待处理 2=处理中 3=成功 4=失败 5=部分成功"`
+	RestartPhase     string                            `json:"restartPhase" orm:"-" dc:"重启阶段 waiting_resume=等待复机"`
+	RestartResumeAt  string                            `json:"restartResumeAt" orm:"-" dc:"计划复机时间"`
 	RunResult        int                               `json:"runResult" dc:"运行结果"`
 	FailReason       string                            `json:"failReason" dc:"失败原因"`
 	TotalCount       int                               `json:"totalCount" dc:"总数量"`
+	UnknownCount     int                               `json:"unknownCount" dc:"待核查数量"`
 	StartTime        *gtime.Time                       `json:"startTime" dc:"开始时间"`
 	EndTime          *gtime.Time                       `json:"endTime" dc:"结束时间"`
 	SourceFile       *BatchExecutionLogFileModel       `json:"sourceFile" dc:"源文件"`