Merge branch 'rag/4.0' into debug

controllers/llm/question.go

@@ -561,11 +561,11 @@ func (c *QuestionController) UnSetDefault() {
 		return
 	}
 
-	//if item.IsDefault == 0 {
-	//	br.Msg = "该提示词不是默认提示词，无需取消"
-	//	br.IsSendEmail = false
-	//	return
-	//}
+	if item.IsDefault == 0 {
+		br.Msg = "该提示词不是默认提示词，无需取消"
+		br.IsSendEmail = false
+		return
+	}
 
 	// 如果是取消已经设置成默认的提示词，那么需要判断是否有正在生成摘要的提示词任务，如果存在的话，那么就不允许取消
 	auth, err := services.CheckOpQuestionAuth()

models/rag/ai_task_record.go

@@ -78,7 +78,7 @@ func (m *AiTaskRecord) GetAllListByCondition(field, condition string, pars []int
 	if field == "" {
 		field = "*"
 	}
-	sqlStr := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s order by AiTaskRecord_id desc `, field, m.TableName(), condition)
+	sqlStr := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s order by ai_task_record_id desc `, field, m.TableName(), condition)
 	err = global.DbMap[utils.DbNameAI].Raw(sqlStr, pars...).Find(&items).Error
 
 	return
@@ -88,7 +88,7 @@ func (m *AiTaskRecord) GetListByCondition(field, condition string, pars []interf
 	if field == "" {
 		field = "*"
 	}
-	sqlStr := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s order by AiTaskRecord_id desc LIMIT ?,?`, field, m.TableName(), condition)
+	sqlStr := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s order by ai_task_record_id desc LIMIT ?,?`, field, m.TableName(), condition)
 	pars = append(pars, startSize, pageSize)
 	err = global.DbMap[utils.DbNameAI].Raw(sqlStr, pars...).Find(&items).Error
 

services/llm.go

@@ -119,7 +119,7 @@ func addTaskToCache(aiTaskId int) {
 		}
 	}()
 	obj := rag.AiTaskRecord{}
-	list, err := obj.GetAllListByCondition("*", ` ai_task_id = ? `, []interface{}{aiTaskId})
+	list, err := obj.GetAllListByCondition("*", ` AND ai_task_id = ? `, []interface{}{aiTaskId})
 	if err != nil {
 		return
 	}

services/llm_report.go

@@ -785,7 +785,5 @@ func DelAbstractByQuestionId(questionId int) {
 		utils.FileLog.Error("根据提示词删除ETA报告摘要失败，提示词ID：%d；原因：%s", questionId, err.Error())
 	}
 
-	//time.Sleep(30 * time.Second)
-
 	return
 }

services/task.go

@@ -796,6 +796,8 @@ func HandleAiArticleAbstractLlmOp() {
 	}
 }
 
+var aiTaskIdMap = map[int]bool{}
+
 // handleAiArticleAbstractLlmOp
 // @Description: 处理AI库的报告摘要生成（批量任务）
 // @author: Roc