diff --git a/service/fileService.go b/service/fileService.go index c348aa3..c8bc25e 100644 --- a/service/fileService.go +++ b/service/fileService.go @@ -251,7 +251,7 @@ func CreateUserFile(userID int, fileAuthName string, fileID int, UploadType stri if fileAuth.ID != 0 { log.Println("file auth name already exist, please change another name: ", fileAuthName) //将要保存的文件名改为fileAuthName+uuid - strs := strings.Split(fileAuthName, ".") + strs := strings.Split(fileAuth.UserFileName, ".") fileAuthName = strs[0] + "_1." + strs[1] //return fileAuth } diff --git a/service/spark/spark-ppt.go b/service/spark/spark-ppt.go index 196909d..97baf4e 100644 --- a/service/spark/spark-ppt.go +++ b/service/spark/spark-ppt.go @@ -341,12 +341,10 @@ func SparkDoGetPPTInfoBySID(modelParam *proto.ModelParam, userReq *proto.SparkCr log.Println("Spark create ppt by outline Error:", err) return } - respStr, _ := json.Marshal(resp) + outlineStr, _ := json.Marshal(userReq.Outline) + resp.Desc = string(outlineStr) //大纲信息 service.CreateAIStreamMsg(base.UserID, base.ModelID, int(base.SessionID), resp, modelParam.Model) //保存消息 - //添加到消息队列,用于前端查询 - key := fmt.Sprintf("user-%d-session-%d-create-pptx", base.UserID, base.SessionID) - worker.SetRedisWithExpire(key, string(respStr), time.Second*60*60) //设置60分钟过期 - log.Println("Spark create ppt status set redis key:", key, "value:", string(respStr)) + var respStr []byte if resp.Code != 0 { log.Println("Spark create ppt by outline Error:", resp) return @@ -365,6 +363,9 @@ func SparkDoGetPPTInfoBySID(modelParam *proto.ModelParam, userReq *proto.SparkCr if fileRecord.ID == 0 || fileAuth.ID == 0 { log.Println("save file info failed", fileRecord.ID, fileAuth.ID) } + fileAuthStr, _ := json.Marshal(fileAuth) + resp.Data.AiImageStatus = string(fileAuthStr) //文件信息 + respStr, _ = json.Marshal(resp) //将model发送的消息保存到数据库 err3, userMsgID := service.CreateMessage(proto.ModelToUserMsgType, int(base.SessionID), int(model.ID), base.UserID, string(respStr), proto.UserToModelPPTMsgType, base.FunctionID) if err3 != nil { @@ -373,6 +374,12 @@ func SparkDoGetPPTInfoBySID(modelParam *proto.ModelParam, userReq *proto.SparkCr log.Println("spark create ppt by outline success,msg id:", userMsgID) return } + respStr, _ = json.Marshal(resp) + //添加到消息队列,用于前端查询 + key := fmt.Sprintf("user-%d-session-%d-create-pptx", base.UserID, base.SessionID) + worker.SetRedisWithExpire(key, string(respStr), time.Second*60*60) //设置60分钟过期 + log.Println("Spark create ppt status set redis key:", key, "value:", string(respStr)) + } } }