From a60132086df40b66e5fa6fc6e6e4e26558a179ed Mon Sep 17 00:00:00 2001 From: bx1834938347-prog Date: Fri, 5 Dec 2025 14:24:50 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Aai=E7=94=9F=E6=88=90=E5=9B=BE?= =?UTF-8?q?=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/service/import/imageContentGetResult.go | 10 +++++++++- pkg/service/import/imageContentProcessor.go | 8 ++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkg/service/import/imageContentGetResult.go b/pkg/service/import/imageContentGetResult.go index f4580fd..f929a45 100644 --- a/pkg/service/import/imageContentGetResult.go +++ b/pkg/service/import/imageContentGetResult.go @@ -18,7 +18,15 @@ func ImageContentGetStatus(c *gin.Context) { return } func ImageContentGetResult(c *gin.Context) { - processor := GetBatchProcessorRead() + processor := GetBatchProcessorEx() + if processor == nil { + service.Success(c, gin.H{ + "status": 0, + "status_description": StatusMap[0], + "message": "暂无执行中的任务", + }) + return + } currentStatus := processor.GetStatus() switch currentStatus { case StatusIdle: diff --git a/pkg/service/import/imageContentProcessor.go b/pkg/service/import/imageContentProcessor.go index a3a413c..d44b6c6 100644 --- a/pkg/service/import/imageContentProcessor.go +++ b/pkg/service/import/imageContentProcessor.go @@ -67,6 +67,10 @@ type ImageTask struct { Content string //内容 } +func GetBatchProcessorEx() *BatchProcessor { + return batchProcessor +} + func GetBatchProcessorRead() *BatchProcessor { getBatchProcessorReadMutex.Lock() defer getBatchProcessorReadMutex.Unlock() @@ -83,8 +87,8 @@ func GetBatchProcessorRead() *BatchProcessor { } func GetBatchProcessor() *BatchProcessor { - getBatchProcessorMutex.Lock() - defer getBatchProcessorMutex.Unlock() + getBatchProcessorReadMutex.Lock() + defer getBatchProcessorReadMutex.Unlock() if batchProcessor == nil || batchProcessor.status == StatusCompleted { batchProcessor = &BatchProcessor{