fix

controllers/ai/ai_summary.go

@@ -1022,11 +1022,14 @@ func (this *AiController) GenerateAiSummary() {
 		br.IsSendEmail = false
 		return
 	}
-	if req.OriginContent == "" && len(req.OpenaiFileId) == 0 {
+	if req.OriginContent == "" && len(req.OpenaiFileId) == 0 && req.SaDocId <= 0 {
 		br.Msg = "参数错误"
 		br.IsSendEmail = false
 		return
 	}
+	if req.SaDocId > 0 {
+
+	}
 
 	if utils.Re == nil {
 		key := "CACHE_CHAT_" + strconv.Itoa(this.SysUser.AdminId)
@@ -1503,3 +1506,47 @@ func (this *AiController) GenerateAiSummary() {
 //	br.Data = resp
 //	return
 //}
+
+
+// AiSummaryClassifyList
+// @Title 获取所有纪要分类接口-不包含沙盘
+// @Description 获取所有纪要分类接口-不包含沙盘
+// @Param   IsShowMe   query   bool  true       "是否只看我的，true、false"
+// @Success 200 {object} data_manage.ChartClassifyListResp
+// @router /summary/classifyList [get]
+func (this *AiController) AiSummaryClassifyList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	resp := new(ai_summary.AiSummaryClassifyListResp)
+
+	rootList, err := ai_summary.GetAiSummaryClassifyByParentId(0)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		return
+	}
+
+	classifyAll, err := ai_summary.GetAiSummaryClassifyAll()
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		return
+	}
+
+	nodeAll := make([]*ai_summary.AiSummaryClassifyItems, 0)
+	for k := range rootList {
+		rootNode := rootList[k]
+		aiSummaryService.AiSummaryClassifyItemsMakeTree(this.SysUser, classifyAll, rootNode)
+		nodeAll = append(nodeAll, rootNode)
+	}
+
+	resp.AllNodes = nodeAll
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

models/ai_summary/ai_summary.go

@@ -126,13 +126,13 @@ func AddAiSummary(item *AiSummary) (lastId int64, err error) {
 }
 
 type AddAiSummaryReq struct {
-	SaDocId         int       // 文档ID
-	OriginContent   string    // 原始内容
-	SummaryContent  string    // 纪要内容
-	ClassifyId      int       // 分类id
-	Title           string    // 文档标题
-	OpenaiFileName  string    // 文件名称
-	OpenaiFilePath  string    // 文件路径
+	SaDocId        int    // 文档ID
+	OriginContent  string // 原始内容
+	SummaryContent string // 纪要内容
+	ClassifyId     int    // 分类id
+	Title          string // 文档标题
+	OpenaiFileName string // 文件名称
+	OpenaiFilePath string // 文件路径
 }
 
 type GenerateAiSummaryReq struct {
@@ -141,6 +141,7 @@ type GenerateAiSummaryReq struct {
 	OpenaiFileId  []string `description:"openai返回的文件id"`
 	Model         string   `description:"模型名称"`
 	Prompt        string   `description:"提示词"`
+	SaDocId       int      // 文档ID
 }
 
 // GetAiSummaryMaxSort 获取ai纪要下最大的排序数

models/ai_summary/ai_summary_classify.go

@@ -310,3 +310,13 @@ type AiSummaryListResp struct {
 	Paging *paging.PagingItem
 	List   []*AiSummaryItems
 }
+
+// GetAiSummaryClassifyAll
+func GetAiSummaryClassifyAll() (items []*AiSummaryClassifyItems, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT * FROM sandbox_classify WHERE parent_id<>0 order by sort asc,sandbox_classify_id asc`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
+

routers/commentsRouter.go

@@ -151,6 +151,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/ai:AiController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/ai:AiController"],
+        beego.ControllerComments{
+            Method: "AiSummaryClassifyList",
+            Router: `/summary/classifyList`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/ai:AiController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/ai:AiController"],
         beego.ControllerComments{
             Method: "AiSummaryDetail",