fix

controllers/llm/abstract.go

@@ -62,6 +62,8 @@ func (c *AbstractController) List() {
 	if keyWord == `` {
 		var condition string
 		var pars []interface{}
+		condition += fmt.Sprintf(` AND c.%s = ?`, rag.WechatPlatformColumns.Enabled)
+		pars = append(pars, 1)
 
 		if keyWord != "" {
 			condition += fmt.Sprintf(` AND a.%s like ?`, rag.WechatArticleAbstractColumns.Content)
@@ -87,6 +89,7 @@ func (c *AbstractController) List() {
 			"ModifyTime":              "desc",
 			"WechatArticleAbstractId": "desc",
 		}
+
 		tmpTotal, list, err := elastic.WechatArticleAbstractEsSearch(keyWord, tagId, startSize, pageSize, sortMap)
 		if err != nil {
 			br.Msg = "获取失败"
@@ -111,10 +114,6 @@ func (c *AbstractController) List() {
 	br.Data = resp
 }
 
-// 向量库删除
-// 摘要库删除
-// 批量加入到向量库
-
 // Del
 // @Title 删除摘要
 // @Description 删除摘要

models/rag/wechat_article_abstract.go

@@ -108,6 +108,7 @@ func (m *WechatArticleAbstract) GetByWechatArticleId(id int) (item *WechatArticl
 type WechatArticleAbstractView 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(11);comment:归属公众号id;default:0;" description:"归属公众号id"`
 	Abstract                string `gorm:"column:abstract;type:longtext;comment:摘要内容;" description:"摘要内容"` //
 	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标识"`

services/elastic/wechat_article_abstract.go

@@ -16,6 +16,7 @@ var EsWechatArticleAbstractName = utils.EsWechatArticleAbstractName
 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:"摘要内容"` //
 	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标识"`
@@ -43,6 +44,7 @@ func (m *WechatArticleAbstractItem) ToView() rag.WechatArticleAbstractView {
 	return rag.WechatArticleAbstractView{
 		WechatArticleAbstractId: m.WechatArticleAbstractId,
 		WechatArticleId:         m.WechatArticleId,
+		WechatPlatformId:        m.WechatPlatformId,
 		Abstract:                m.Abstract,
 		Version:                 m.Version,
 		VectorKey:               m.VectorKey,

services/wechat_platform.go

@@ -252,9 +252,11 @@ func GenerateArticleAbstract(item *rag.WechatArticle) {
 	}
 
 	abstractObj := rag.WechatArticleAbstract{}
-	_, err = abstractObj.GetByWechatArticleId(item.WechatArticleId)
+	tmpAbstractItem, err := abstractObj.GetByWechatArticleId(item.WechatArticleId)
 	if err == nil {
 		// 摘要已经生成，不需要重复生成
+		AbstractToKnowledge(item, tmpAbstractItem, false)
+
 		return
 	}
 	if !utils.IsErrNoRow(err) {
@@ -470,6 +472,11 @@ func DelDoc(wechatArticleAbstractList []*rag.WechatArticleAbstract) (err error)
 		wechatArticleAbstractIdList = append(wechatArticleAbstractIdList, v.WechatArticleAbstractId)
 	}
 
+	// 没有就不删除
+	if len(vectorKeyList) <= 0 {
+		return
+	}
+
 	_, err = llm.DelDocsToKnowledge(models.BusinessConfMap[models.KnowledgeBaseName], vectorKeyList)
 	if err != nil {
 		err = fmt.Errorf("删除LLM摘要向量库文件失败，Err:" + err.Error())
@@ -493,6 +500,11 @@ func getAnswerByContent(wechatArticleId int, docId string) (answer string, addAr
 		return
 	}
 
+	// 没问题就不生成了
+	if len(questionList) <= 0 {
+		return
+	}
+
 	//你现在是一名资深的期货行业分析师，请基于以下的问题进行汇总总结，如果不能正常总结出来，那么就只需要回复我：sorry
 	questionStrList := []string{`你现在是一名资深的期货行业分析师，请基于以下的问题进行汇总总结，如果不能正常总结出来，那么就只需要回复我：sorry。以下是问题：`}
 	for _, v := range questionList {
@@ -945,6 +957,7 @@ func AddOrEditEsWechatArticleAbstract(articleAbstractId int) {
 	esItem := elastic.WechatArticleAbstractItem{
 		WechatArticleAbstractId: abstractInfo.WechatArticleAbstractId,
 		WechatArticleId:         abstractInfo.WechatArticleId,
+		WechatPlatformId:        articleInfo.WechatPlatformId,
 		Abstract:                abstractInfo.Content,
 		Version:                 abstractInfo.Version,
 		VectorKey:               abstractInfo.VectorKey,