pkg/service/import/imageContentGetResult.go

@@ -18,15 +18,7 @@ func ImageContentGetStatus(c *gin.Context) {
 	return
 }
 func ImageContentGetResult(c *gin.Context) {
-	processor := GetBatchProcessorEx()
-	if processor == nil {
-		service.Success(c, gin.H{
-			"status":             0,
-			"status_description": StatusMap[0],
-			"message":            "暂无执行中的任务",
-		})
-		return
-	}
+	processor := GetBatchProcessorRead()
 	currentStatus := processor.GetStatus()
 	switch currentStatus {
 	case StatusIdle:

pkg/service/import/imageContentProcessor.go

@@ -67,10 +67,6 @@ type ImageTask struct {
 	Content    string //内容
 }
 
-func GetBatchProcessorEx() *BatchProcessor {
-	return batchProcessor
-}
-
 func GetBatchProcessorRead() *BatchProcessor {
 	getBatchProcessorReadMutex.Lock()
 	defer getBatchProcessorReadMutex.Unlock()
@@ -87,8 +83,8 @@ func GetBatchProcessorRead() *BatchProcessor {
 }
 
 func GetBatchProcessor() *BatchProcessor {
-	getBatchProcessorReadMutex.Lock()
-	defer getBatchProcessorReadMutex.Unlock()
+	getBatchProcessorMutex.Lock()
+	defer getBatchProcessorMutex.Unlock()
 
 	if batchProcessor == nil || batchProcessor.status == StatusCompleted {
 		batchProcessor = &BatchProcessor{