fix；摘要

services/elastic/wechat_article_abstract.go

@@ -17,7 +17,8 @@ type WechatArticleAbstractItem struct {
 	WechatArticleAbstractId int       `gorm:"column:wechat_article_abstract_id;type:int(9) UNSIGNED;primaryKey;not null;" description:"wechat_article_abstract_id"`
 	WechatArticleId         int       `gorm:"column:wechat_article_id;type:int(9) UNSIGNED;comment:关联的微信报告id;default:0;" description:"关联的微信报告id"`
 	WechatPlatformId        int       `gorm:"column:wechat_platform_id;type:int(9) UNSIGNED;comment:微信公众号id;default:0;" description:"微信公众号id"`
-	Abstract                string    `gorm:"column:abstract;type:longtext;comment:摘要内容;" description:"摘要内容"` //
+	Abstract                string    `gorm:"column:abstract;type:longtext;comment:摘要内容;" description:"摘要内容"`
+	QuestionId              int       `gorm:"column:question_id" description:"提示词Id"`
 	Version                 int       `gorm:"column:version;type:int(10) UNSIGNED;comment:版本号;default:1;" description:"版本号"`
 	VectorKey               string    `gorm:"column:vector_key;type:varchar(255);comment:向量key标识;" description:"向量key标识"`
 	ModifyTime              time.Time `gorm:"column:modify_time;type:datetime;default:NULL;" description:"modify_time"`

services/llm_report.go

@@ -280,7 +280,7 @@ func getArticleContent(content *strings.Builder, htmlContentNode *html.Node) {
 // @author: Roc
 // @datetime 2025-03-10 16:17:53
 // @param item *rag.RagEtaReport
-func GenerateArticleAbstract(item *rag.RagEtaReport, forceGenerate bool) {
+func GenerateRagEtaReportAbstract(item *rag.RagEtaReport, forceGenerate bool) {
 	var err error
 	defer func() {
 		if err != nil {
@@ -307,18 +307,18 @@ func GenerateArticleAbstract(item *rag.RagEtaReport, forceGenerate bool) {
 	}
 
 	for _, question := range questionList {
-		GenerateArticleAbstractByQuestion(item, question, forceGenerate)
+		GenerateRagEtaReportAbstractByQuestion(item, question, forceGenerate)
 	}
 
 	return
 }
 
-// GenerateArticleAbstractByQuestion
+// GenerateRagEtaReportAbstractByQuestion
 // @Description: 文章摘要生成（根据提示词生成）
 // @author: Roc
 // @datetime 2025-03-10 16:17:53
 // @param item *rag.RagEtaReport
-func GenerateArticleAbstractByQuestion(item *rag.RagEtaReport, question *rag.Question, forceGenerate bool) {
+func GenerateRagEtaReportAbstractByQuestion(item *rag.RagEtaReport, question *rag.Question, forceGenerate bool) {
 	var err error
 	defer func() {
 		if err != nil {

services/task.go

@@ -647,7 +647,7 @@ func HandleWechatArticleLLmOp() {
 			// 文章加入到知识库
 			ArticleToKnowledge(item)
 			// 生成摘要
-			//GenerateArticleAbstract(item)
+			GenerateWechatArticleAbstract(item, false)
 		})
 	}
 }

services/wechat_platform.go

@@ -1035,17 +1035,18 @@ func AddOrEditEsWechatArticleAbstract(articleAbstractId int) {
 		return
 	}
 
-	// 公众号平台关联的标签品种
-	tagObj := rag.WechatPlatformTagMapping{}
-	tagMappingList, err := tagObj.GetListByCondition(` AND wechat_platform_id = ? `, []interface{}{articleInfo.WechatPlatformId}, 0, 10000)
-	if err != nil {
-		err = fmt.Errorf("获取公众号平台关联的品种信息失败，Err:" + err.Error())
-		return
-	}
-
+	// 标签ID
 	tagIdList := make([]int, 0)
-	for _, v := range tagMappingList {
-		tagIdList = append(tagIdList, v.TagId)
+	if abstractInfo.Tags != `` {
+		tagIdStrList := strings.Split(abstractInfo.Tags, ",")
+		for _, tagIdStr := range tagIdStrList {
+			tagId, tmpErr := strconv.Atoi(tagIdStr)
+			if tmpErr != nil {
+				err = fmt.Errorf("报告标签ID转int失败，Err:" + tmpErr.Error())
+				return
+			}
+			tagIdList = append(tagIdList, tagId)
+		}
 	}
 
 	esItem := elastic.WechatArticleAbstractItem{
@@ -1053,6 +1054,7 @@ func AddOrEditEsWechatArticleAbstract(articleAbstractId int) {
 		WechatArticleId:         abstractInfo.WechatArticleId,
 		WechatPlatformId:        articleInfo.WechatPlatformId,
 		Abstract:                abstractInfo.Content,
+		QuestionId:              abstractInfo.QuestionId,
 		Version:                 abstractInfo.Version,
 		VectorKey:               abstractInfo.VectorKey,
 		ModifyTime:              articleInfo.ModifyTime,