From 7620d9e9b0022dccc726550823198db04beb966d Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Fri, 4 Apr 2025 17:39:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B6=E4=BD=9Cppt?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=B8=8D=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=95=B0=E6=8D=AE=E8=AF=B7=E6=B1=82=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E8=AF=BB=E5=BD=93=E5=89=8D=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/spark/spark-ppt.go | 77 ++++++++++++++++++++++++++++++++------ 1 file changed, 66 insertions(+), 11 deletions(-) diff --git a/service/spark/spark-ppt.go b/service/spark/spark-ppt.go index 5477357..d7b616a 100644 --- a/service/spark/spark-ppt.go +++ b/service/spark/spark-ppt.go @@ -244,11 +244,13 @@ func SparkDoCreateOutline(userReq *proto.SparkCreateOutlineRequest, base *proto. var outline proto.SparkCreateOutlineResponse //获取大纲 - if userReq.FileUrl == "" { - outline, err = SparkCreateOutline(&modelParam, userReq) //根据query生成大纲 - } else { - outline, err = SparkCreateOutlineByDoc(&modelParam, userReq) //根据文档生成大纲 - } + //测试阶段 + outline = testPPTOutline() + //if userReq.FileUrl == "" { + // outline, err = SparkCreateOutline(&modelParam, userReq) //根据query生成大纲 + //} else { + // outline, err = SparkCreateOutlineByDoc(&modelParam, userReq) //根据文档生成大纲 + //} //进行保存 if err != nil { log.Println("Spark create outline Error:", err) @@ -299,18 +301,21 @@ func SparkDoCreatePPTByOutline(userReq *proto.SparkCreatePPTByOutlineUserRequest log.Println("Create message error:", err3, userMsgID) return proto.SparkCreatePPTResponse{}, err3 } + //测试阶段 + resp := testPPTInfo() - resp, err4 := SparkCreatePPTByOutline(&modelParam, userReq) //根据大纲生成ppt - if err4 != nil { - log.Println("Spark create ppt by outline Error:", err4) - return proto.SparkCreatePPTResponse{}, err4 - } + //resp, err4 := SparkCreatePPTByOutline(&modelParam, userReq) //根据大纲生成ppt + // + //if err4 != nil { + // log.Println("Spark create ppt by outline Error:", err4) + // return proto.SparkCreatePPTResponse{}, err4 + //} //进行保存 service.CreateAIStreamMsg(base.UserID, base.ModelID, int(base.SessionID), resp, modelParam.Model) //保存消息 //新协程获取ppt制作进度 userReq.Sid = resp.Data.SID go SparkDoGetPPTInfoBySID(&modelParam, userReq, base) - return resp, err4 + return resp, nil } // 每3秒查询一次ppt制作情况 @@ -402,3 +407,53 @@ func DownloadFile(url, filePath string) error { _, err = io.Copy(out, resp.Body) return err } + +func testPPTInfo() proto.SparkCreatePPTResponse { + path := "/home/saw/saw_ppt_info.json" + var pptInfo proto.SparkCreatePPTResponse + //读取文件 + file, err := os.Open(path) + if err != nil { + log.Println("Error opening file:", err) + return pptInfo + } + defer file.Close() + //读取文件内容 + data, err := io.ReadAll(file) + if err != nil { + log.Println("Error reading file:", err) + return pptInfo + } + + err = json.Unmarshal(data, &pptInfo) + if err != nil { + log.Println("Error unmarshalling JSON:", err) + return pptInfo + } + return pptInfo +} + +func testPPTOutline() proto.SparkCreateOutlineResponse { + path := "/home/saw/saw_ppt_outline.json" + var outline proto.SparkCreateOutlineResponse + //读取文件 + file, err := os.Open(path) + if err != nil { + log.Println("Error opening file:", err) + return outline + } + defer file.Close() + //读取文件内容 + data, err := io.ReadAll(file) + if err != nil { + log.Println("Error reading file:", err) + return outline + } + + err = json.Unmarshal(data, &outline) + if err != nil { + log.Println("Error unmarshalling JSON:", err) + return outline + } + return outline +}