From 0d45477f93540017bc0741f514db92497bb5d59b Mon Sep 17 00:00:00 2001
From: bx1834938347-prog <bx1834938347@gmail.com>
Date: Fri, 5 Dec 2025 15:46:21 +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 |  6 ++++--
 pkg/service/import/imageContentProcessor.go | 11 +++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkg/service/import/imageContentGetResult.go b/pkg/service/import/imageContentGetResult.go
index 8727c2f..5b4ffed 100644
--- a/pkg/service/import/imageContentGetResult.go
+++ b/pkg/service/import/imageContentGetResult.go
@@ -96,7 +96,7 @@ func returnExcel(failedTasks []*ImageTask, c *gin.Context) error {
 	var dataList []interface{}
 	for _, task := range failedTasks {
 		data := []interface{}{
-			task.Data.LineNum,
+			task.Data.LineNum + 1,
 			task.Data.ArtistName,
 			task.Data.SubNum,
 			getErrorMessage(task.Error),
@@ -105,7 +105,9 @@ func returnExcel(failedTasks []*ImageTask, c *gin.Context) error {
 		}
 		dataList = append(dataList, &data)
 	}
-	sort.Slice(failedTasks, func(i, j int) bool { return failedTasks[i].Data.LineNum < failedTasks[j].Data.LineNum })
+	sort.Slice(failedTasks, func(i, j int) bool {
+		return failedTasks[i].Data.LineNum < failedTasks[j].Data.LineNum
+	})
 
 	content, err := utils.ToExcelByType(titleList, dataList, "slice", "")
 	if err != nil {
diff --git a/pkg/service/import/imageContentProcessor.go b/pkg/service/import/imageContentProcessor.go
index ce6d128..9b03c81 100644
--- a/pkg/service/import/imageContentProcessor.go
+++ b/pkg/service/import/imageContentProcessor.go
@@ -35,7 +35,7 @@ const (
 
 var (
 	batchProcessor *BatchProcessor
-	RwWMutex       sync.RWMutex
+	Mutex          sync.Mutex
 )
 
 const (
@@ -67,14 +67,12 @@ type ImageTask struct {
 }
 
 func GetBatchProcessorRead() *BatchProcessor {
-	RwWMutex.RLock() //
-	defer RwWMutex.RUnlock()
 	return batchProcessor
 }
 
 func GetBatchProcessor() *BatchProcessor {
-	RwWMutex.Lock()
-	defer RwWMutex.Unlock()
+	Mutex.Lock()
+	defer Mutex.Unlock()
 
 	if batchProcessor == nil || batchProcessor.status == StatusCompleted {
 		batchProcessor = &BatchProcessor{
@@ -186,7 +184,8 @@ func (p *BatchProcessor) submitSingleTask(req *excelData, num int) error {
 	} else {
 		id, err := p.generateImage(req)
 		if err != nil {
-			return fmt.Errorf("生成图片失败: %v", err)
+			zap.L().Error("生成图片失败", zap.Error(err))
+			return fmt.Errorf("生成图片失败")
 		}
 		taskId = id
 	}