Merge branch 'ETA_1.8.8' into debug

controllers/ai/ai_pormpt.go

@@ -6,6 +6,7 @@ import (
 	"eta/eta_api/models"
 	"eta/eta_api/models/ai_summary"
 	"eta/eta_api/models/system"
+	aiSummaryService "eta/eta_api/services/ai_summary"
 	"eta/eta_api/utils"
 	"time"
 )
@@ -179,10 +180,9 @@ func (this *AiController) EditPrompt() {
 		Title:         req.Title,
 		CreateTime:    time.Time{},
 		ModifyTime:    time.Now(),
-		IsShare:       req.IsShare,
 	}
 
-	err = promptItem.Update([]string{"ModifyTime", "PromptContent", "Title", "IsShare"})
+	err = promptItem.Update([]string{"ModifyTime", "PromptContent", "Title"})
 	if err != nil {
 		br.Msg = "编辑失败"
 		br.ErrMsg = "编辑失败,Err:" + err.Error()
@@ -374,3 +374,40 @@ func (this *AiController) MoveAiPrompt() {
 	br.Success = true
 	br.Msg = "移动成功"
 }
+
+// SharePrompt
+// @Title 共享/取消共享单个提示词
+// @Description 共享/取消共享单个提示词接口
+// @Param	request	body models.ReqPptShare true "type json string"
+// @Success 200 {object} models.RespPptShare
+// @router /prompt/share [post]
+func (this *AiController) SharePrompt() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req ai_summary.DeleteAipromptReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	if req.AiPromptId <= 0 {
+		br.Msg = "请输入提示词序号"
+		return
+	}
+
+	err = aiSummaryService.SharePrompt(req.AiPromptId, this.SysUser.AdminId)
+	if err != nil {
+		br.Msg = err.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+
+	return
+}

models/ai_summary/ai_pormpt.go

@@ -73,7 +73,6 @@ type AiPromptEditReq struct {
 	PromptContent string // 原始内容
 	Title         string // 文档标题
 	AiPromptId    int    // ai纪要提示词id
-	IsShare       int    // 是否分享，0：不分享，1：分享
 }
 
 // Update
@@ -91,10 +90,10 @@ func DelAiPromptyId(aiPromptId int) (err error) {
 	return
 }
 
-func GetAiPromptById(pptId int) (item *AiPrompt, err error) {
+func GetAiPromptById(promptId int) (item *AiPrompt, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM ai_prompt WHERE 1=1 AND ai_prompt_id=? `
-	err = o.Raw(sql, pptId).QueryRow(&item)
+	err = o.Raw(sql, promptId).QueryRow(&item)
 	return
 }
 

routers/commentsRouter.go

@@ -79,6 +79,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: "SharePrompt",
+            Router: `/prompt/share`,
+            AllowHTTPMethods: []string{"post"},
+            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: "AddSandboxClassify",

services/ai_summary/ai_summary.go

@@ -1,6 +1,7 @@
 package ai_summary
 
 import (
+	"errors"
 	"eta/eta_api/models/ai_summary"
 	"eta/eta_api/models/system"
 	"eta/eta_api/utils"
@@ -131,4 +132,40 @@ func aiSummaryClassifyHaveChildV2(allNode []*ai_summary.AiSummaryClassifyItems,
 		yes = true
 	}
 	return
-}
+}
+
+// SharePrompt
+func SharePrompt(promptId int, adminId int) (err error) {
+	//判断当前登录者是否有共享的权限
+	prompt, err := ai_summary.GetAiPromptById(promptId)
+	if err != nil {
+		if err.Error() == utils.ErrNoRow() {
+			err = errors.New("当前目录下的提示词不存在")
+			return
+		}
+		err = errors.New("目录下的提示词查询出错:" + err.Error())
+		return
+	}
+	if prompt.SysAdminId != adminId {
+		err = errors.New("该提示词不是本人创建")
+		return
+	}
+
+	//判断当前的共享状态
+	if prompt.IsShare > 0 {
+		prompt.IsShare = 0
+		err = prompt.Update([]string{"IsShare"})
+		if err != nil {
+			err = errors.New(err.Error())
+			return
+		}
+	} else {
+		prompt.IsShare = 1
+		err = prompt.Update([]string{"IsShare"})
+		if err != nil {
+			err = errors.New(err.Error())
+			return
+		}
+	}
+	return
+}