From cf4cbbeec6de57d869a08da065790eb3effb85ea Mon Sep 17 00:00:00 2001
From: junleea <354425203@qq.com>
Date: Thu, 3 Apr 2025 20:13:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ppt=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BB=93=E6=9E=84=E4=BD=93json=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handler/tool.go            |  2 +-
 proto/spark.go             | 36 ++++++++++++++++++++++++++++++++++++
 service/spark/spark-ppt.go |  8 ++++----
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/handler/tool.go b/handler/tool.go
index 514ef2b..8c31e02 100644
--- a/handler/tool.go
+++ b/handler/tool.go
@@ -450,7 +450,7 @@ func GetSparkPPTThemeList(c *gin.Context) {
 		}
 		modelParam.Url = model.Url
 		modelParam.System = funcs[0].Info //系统功能
-		var themeList proto.PPTThemeResponse
+		var themeList proto.SparkPPTThemeListResponse
 		//获取主题列表
 		if worker.IsContainKey("spark_ppt_theme_list") {
 			themeListStr := worker.GetRedis("spark_ppt_theme_list")
diff --git a/proto/spark.go b/proto/spark.go
index 0c32519..e3477df 100644
--- a/proto/spark.go
+++ b/proto/spark.go
@@ -185,3 +185,39 @@ type GetSparkCreatePPTStatusReq struct {
 	Function  string `json:"function" form:"function"`   // 功能
 	SessionID int    `json:"sessionId" form:"sessionId"` // 会话id
 }
+
+type SparkPPTThemeListData struct {
+	Total   int                       `json:"total"`
+	Records []SparkPPTThemeListRecord `json:"records"`
+	PageNum int                       `json:"pageNum"`
+}
+
+type SparkPPTThemeListRecord struct {
+	TemplateIndexId string `json:"templateIndexId"`
+	PageCount       int    `json:"pageCount"`
+	Type            string `json:"type"`
+	Color           string `json:"color"`
+	Industry        string `json:"industry"`
+	Style           string `json:"style"`
+	DetailImageStr  string `json:"detailImage"`
+	PayType         string `json:"payType"`
+	DetailImage     SparkPPTThemeListDetailImage
+}
+
+type SparkPPTThemeListDetailImage struct {
+	TitleCoverImageLarge string `json:"titleCoverImageLarge"`
+	TitleCoverImage      string `json:"titleCoverImage"`
+	CatalogueCoverImage  string `json:"catalogueCoverImage"`
+	ChapterCoverImage    string `json:"chapterCoverImage"`
+	ContentCoverImage    string `json:"contentCoverImage"`
+	EndCoverImage        string `json:"endCoverImage"`
+}
+
+type SparkPPTThemeListResponse struct {
+	Flag  bool                  `json:"flag"`
+	Code  int                   `json:"code"`
+	Desc  string                `json:"desc"`
+	Count any                   `json:"count"`
+	Data  SparkPPTThemeListData `json:"data"`
+	Sid   any                   `json:"sid"`
+}
diff --git a/service/spark/spark-ppt.go b/service/spark/spark-ppt.go
index a5388ea..719b3d5 100644
--- a/service/spark/spark-ppt.go
+++ b/service/spark/spark-ppt.go
@@ -17,12 +17,12 @@ import (
 	"time"
 )
 
-func SparkPPTThemeList(model *proto.ModelParam, req proto.GetSparkPPTThemeReq) (proto.PPTThemeResponse, error) {
+func SparkPPTThemeList(model *proto.ModelParam, req proto.GetSparkPPTThemeReq) (proto.SparkPPTThemeListResponse, error) {
 	url := "https://zwapi.xfyun.cn/api/ppt/v2/template/list"
 	headers, err := getSparkRequestHeaders(model.APPID, model.APISecret)
 	if err != nil {
 		log.Println("Spark PPT Theme Error getting headers:", err)
-		return proto.PPTThemeResponse{}, err
+		return proto.SparkPPTThemeListResponse{}, err
 	}
 	//log.Println("Spark PPT Theme headers:", headers)
 
@@ -37,12 +37,12 @@ func SparkPPTThemeList(model *proto.ModelParam, req proto.GetSparkPPTThemeReq) (
 	reqStr, err := json.Marshal(req_)
 	if err != nil {
 		log.Println("Spark PPT Theme Error encoding request:", err)
-		return proto.PPTThemeResponse{}, err
+		return proto.SparkPPTThemeListResponse{}, err
 	}
 	log.Println("Spark PPT Theme  req:", string(reqStr))
 
 	err, resp := worker.DoPostRequestJSON(url, reqStr, headers)
-	var response proto.PPTThemeResponse
+	var response proto.SparkPPTThemeListResponse
 	if err != nil {
 		log.Println("Spark PPT Theme  Error:", err)
 	} else {