Merge remote-tracking branch 'origin/master' into debug

controller/report/report.go

@@ -12,9 +12,9 @@ import (
 )
 
 // Detail 报告详情
-func Detail(c *gin.Context)  {
+func Detail(c *gin.Context) {
 	reqReportId := c.DefaultQuery("report_id", "")
-	if reqReportId == ""{
+	if reqReportId == "" {
 		response.Fail("请输入报告ID", c)
 		return
 	}
@@ -27,17 +27,17 @@ func Detail(c *gin.Context)  {
 
 	reportDetail, err := report.GetReportDetail(userinfo, reportId)
 	if err != nil {
-		response.FailMsg("查看报告详情出错",err.Error(), c)
+		response.FailMsg("查看报告详情出错", err.Error(), c)
 		return
 	}
-	response.OkData("查询成功", reportDetail, c )
+	response.OkData("查询成功", reportDetail, c)
 	return
 }
 
 // ChapterDetail 章节详情
-func ChapterDetail(c *gin.Context)  {
+func ChapterDetail(c *gin.Context) {
 	reqReportChapterId := c.DefaultQuery("report_chapter_id", "")
-	if reqReportChapterId == ""{
+	if reqReportChapterId == "" {
 		response.Fail("请输入章节ID", c)
 		return
 	}
@@ -50,18 +50,18 @@ func ChapterDetail(c *gin.Context)  {
 
 	chapterDetail, err := report.GetChapterDetail(userinfo, reportChapterId)
 	if err != nil {
-		response.FailMsg("查看章节详情出错",err.Error(), c)
+		response.FailMsg("查看章节详情出错", err.Error(), c)
 		return
 	}
-	response.OkData("查询成功", chapterDetail, c )
+	response.OkData("查询成功", chapterDetail, c)
 	return
 }
 
 // List 研报列表
-func List(c *gin.Context)  {
+func List(c *gin.Context) {
 	reqClassifyIdFirst := c.DefaultQuery("classify_id_first", "")
 	reqClassifyIdSec := c.DefaultQuery("classify_id_second", "")
-	keyWord:= c.DefaultQuery("key_word", "")
+	keyWord := c.DefaultQuery("key_word", "")
 	reqPageIndex := c.DefaultQuery("current_index", "1")
 	reqPageSize := c.DefaultQuery("page_size", strconv.Itoa(utils.PageSize20))
 
@@ -77,7 +77,7 @@ func List(c *gin.Context)  {
 		return
 	}
 
-	if reqClassifyIdFirst == ""{
+	if reqClassifyIdFirst == "" {
 		response.Fail("请输入分类ID", c)
 		return
 	}
@@ -87,7 +87,7 @@ func List(c *gin.Context)  {
 		return
 	}
 	var classifyIdSecond int
-	if reqClassifyIdSec != ""{
+	if reqClassifyIdSec != "" {
 		classifyIdSecond, err = strconv.Atoi(reqClassifyIdSec)
 		if err != nil {
 			response.Fail("分类ID格式错误", c)
@@ -99,10 +99,10 @@ func List(c *gin.Context)  {
 
 	list, err := report.GetReportList(userinfo, keyWord, classifyIdFirst, classifyIdSecond, pageIndex, pageSize)
 	if err != nil {
-		response.FailMsg("查看研报列表出错",err.Error(), c)
+		response.FailMsg("查看研报列表出错", err.Error(), c)
 		return
 	}
-	response.OkData("查询成功", list, c )
+	response.OkData("查询成功", list, c)
 	return
 }
 
@@ -124,7 +124,7 @@ func CollectReportList(c *gin.Context) {
 		return
 	}
 
-	if reqChartPermissionId == ""{
+	if reqChartPermissionId == "" {
 		response.Fail("请输入权限ID", c)
 		return
 	}
@@ -137,10 +137,10 @@ func CollectReportList(c *gin.Context) {
 
 	list, err := report.GetCollectReportList(userinfo, chartPermissionId, pageIndex, pageSize)
 	if err != nil {
-		response.FailMsg("汇总报告查询出错",err.Error(), c)
+		response.FailMsg("汇总报告查询出错", err.Error(), c)
 		return
 	}
-	response.OkData("查询成功", list, c )
+	response.OkData("查询成功", list, c)
 	return
 }
 
@@ -162,14 +162,14 @@ func Search(c *gin.Context) {
 		return
 	}
 
-	if keyWord == ""{
+	if keyWord == "" {
 		response.Fail("请输入搜索词", c)
 		return
 	}
 	userinfo := userService.GetInfoByClaims(c)
 	data, err := report.SearchReport(userinfo, keyWord, pageIndex, pageSize)
 	if err != nil {
-		response.FailMsg("搜索报告出错",err.Error(), c)
+		response.FailMsg("搜索报告出错", err.Error(), c)
 		return
 	}
 	response.OkData("查询成功", data, c)
@@ -177,9 +177,9 @@ func Search(c *gin.Context) {
 }
 
 // TickerData 报告详情获取指标数据
-func TickerData(c *gin.Context)  {
+func TickerData(c *gin.Context) {
 	reqReportChapterId := c.DefaultQuery("report_chapter_id", "")
-	if reqReportChapterId == ""{
+	if reqReportChapterId == "" {
 		response.Fail("请输入章节ID", c)
 		return
 	}
@@ -195,12 +195,12 @@ func TickerData(c *gin.Context)  {
 		response.Fail(err.Error(), c)
 		return
 	}
-	response.OkData("查询成功", chapterDetail, c )
+	response.OkData("查询成功", chapterDetail, c)
 	return
 }
 
 // RddpShareImg 获取报告分享图
-func RddpShareImg(c *gin.Context)  {
+func RddpShareImg(c *gin.Context) {
 	var req request.RddpReportShareImgReq
 	if c.ShouldBind(&req) != nil {
 		response.Fail("参数异常", c)
@@ -220,4 +220,33 @@ func RddpShareImg(c *gin.Context)  {
 		imgUrl = defaultImg
 	}
 	response.OkData("获取成功", imgUrl, c)
-}
+}
+
+// ReportPptImgList 报告中的ppt图片列表
+func ReportPptImgList(c *gin.Context) {
+	reqReportId := c.DefaultQuery("report_id", "")
+	if reqReportId == "" {
+		response.Fail("请输入报告ID", c)
+		return
+	}
+	reportId, err := strconv.Atoi(reqReportId)
+	if err != nil {
+		response.Fail("报告ID格式有误", c)
+		return
+	}
+
+	reqReportChapterId := c.DefaultQuery("report_chapter_id", "0")
+	reportChapterId, err := strconv.Atoi(reqReportChapterId)
+	if err != nil {
+		response.Fail("章节ID格式有误", c)
+		return
+	}
+
+	pptImgList, err := report.GetReportPptImgListByReportIdAndReportChapterId(reportId, reportChapterId)
+	if err != nil {
+		response.FailMsg("获取ppt图片成功", err.Error(), c)
+		return
+	}
+	response.OkData("获取成功", pptImgList, c)
+	return
+}

models/response/report.go

@@ -47,7 +47,6 @@ type ReportItem struct {
 	ContentSub         string    `description:"内容前两个章节" json:"content_sub"`
 	BannerUrl          string    `description:"详情页banner" json:"banner_url"`
 	ShareBgImg         string    `description:"分享背景图" json:"share_bg_img"`
-	PptImgList         string    `description:"ppt的图片地址，多图用英文;隔开" json:"ppt_img_list"`
 }
 
 type ReportChapterItem struct {

models/tables/rddp/report/report.go

@@ -27,7 +27,6 @@ type Report struct {
 	ContentSub         string    `description:"内容前两个章节" json:"content_sub"`
 	ThsMsgIsSend       int       `description:"客户群消息是否已发送，0:否，1:是" json:"ths_msg_is_send"`
 	StageStr           string    `description:"期数" json:"stage_str"`
-	PptImgList         string    `description:"ppt的图片地址，多图用英文;隔开" json:"ppt_img_list"`
 }
 
 type UnReadItem struct {

models/tables/rddp/report_ppt_img/query.go

@@ -0,0 +1,9 @@
+package report_ppt_img
+
+import "hongze/hongze_yb/global"
+
+// GetReportPptImgListByReportIdAndReportChapterId 根据报告id和章节ID获取图片
+func GetReportPptImgListByReportIdAndReportChapterId(reportId, reportChapterId int) (list []*ReportPptImg, err error) {
+	err = global.MYSQL["rddp"].Model(ReportPptImg{}).Where("report_id = ? AND report_chapter_id = ? ", reportId, reportChapterId).Order("report_ppt_img_id asc").Scan(&list).Error
+	return
+}

models/tables/rddp/report_ppt_img/report_ppt_img.go

@@ -0,0 +1,37 @@
+package report_ppt_img
+
+import (
+	"time"
+)
+
+// ReportPptImg Ppt与报告的图片表
+type ReportPptImg struct {
+	ReportPptImgID  uint64    `gorm:"primaryKey;column:report_ppt_img_id;type:bigint(9) unsigned;not null" json:"-"`
+	PptID           uint32    `gorm:"index:idx_ppt_id;column:ppt_id;type:int(9) unsigned;default:0" json:"pptId"`                       // ppt的id
+	ReportID        uint32    `gorm:"index:idx_rid_cid;column:report_id;type:int(9) unsigned;default:0" json:"reportId"`                // 报告id
+	ReportChapterID uint32    `gorm:"index:idx_rid_cid;column:report_chapter_id;type:int(9) unsigned;default:0" json:"reportChapterId"` // 章节id
+	ImgURL          string    `gorm:"column:img_url;type:varchar(255);default:''" json:"imgUrl"`                                        // ppt图片地址
+	CreateTime      time.Time `gorm:"column:create_time;type:timestamp;default:CURRENT_TIMESTAMP" json:"createTime"`                    // 创建时间
+}
+
+// TableName get sql table name.获取数据库表名
+func (m *ReportPptImg) TableName() string {
+	return "report_ppt_img"
+}
+
+// ReportPptImgColumns get sql column name.获取数据库列名
+var ReportPptImgColumns = struct {
+	ReportPptImgID  string
+	PptID           string
+	ReportID        string
+	ReportChapterID string
+	ImgURL          string
+	CreateTime      string
+}{
+	ReportPptImgID:  "report_ppt_img_id",
+	PptID:           "ppt_id",
+	ReportID:        "report_id",
+	ReportChapterID: "report_chapter_id",
+	ImgURL:          "img_url",
+	CreateTime:      "create_time",
+}

routers/report.go

@@ -6,7 +6,7 @@ import (
 	"hongze/hongze_yb/middleware"
 )
 
-func InitReport(r *gin.Engine)  {
+func InitReport(r *gin.Engine) {
 	rGroup := r.Group("api/report").Use(middleware.Token())
 	rGroup.GET("/detail", report.Detail)
 	rGroup.GET("/chapter/detail", report.ChapterDetail)
@@ -15,6 +15,7 @@ func InitReport(r *gin.Engine)  {
 	rGroup.GET("/collect", report.CollectReportList)
 	rGroup.GET("/search", report.Search)
 	rGroup.POST("/detail/rddp_share_img", report.RddpShareImg)
+	rGroup.GET("/ppt_img", report.ReportPptImgList)
 
 	rGroup2 := r.Group("api/classify").Use(middleware.Token())
 	rGroup2.GET("/ficc", report.ClassifyFirstList)
@@ -23,5 +24,4 @@ func InitReport(r *gin.Engine)  {
 	rGroup2.GET("/detail", report.ClassifyDetail)
 	rGroup2.GET("/detail/reports", report.ClassifyDetailReports)
 
-
 }

services/report/report.go

@@ -17,6 +17,7 @@ import (
 	"hongze/hongze_yb/models/tables/rddp/report"
 	"hongze/hongze_yb/models/tables/rddp/report_chapter"
 	"hongze/hongze_yb/models/tables/rddp/report_chapter_ticker"
+	"hongze/hongze_yb/models/tables/rddp/report_ppt_img"
 	"hongze/hongze_yb/models/tables/report_chapter_type"
 	"hongze/hongze_yb/models/tables/report_chapter_type_permission"
 	"hongze/hongze_yb/services"
@@ -433,7 +434,6 @@ func GetReportDetail(userinfo user.UserInfo, reportId int) (reportDetail respons
 	reportItem.VideoSize = reportInfo.VideoSize
 	reportItem.VideoPlaySeconds = reportInfo.VideoPlaySeconds
 	reportItem.Author = reportInfo.Author
-	reportItem.PptImgList = reportInfo.PptImgList //ppt转图片的图
 	// 分享背景图取二级分类配图, 二级没有配图时使用一级配图, 一级也没有使用默认图
 	reportItem.ShareBgImg = utils.DEFAULT_REPORT_SHARE_BG_IMG
 	secondClassify, e := classify.GetByClassifyId(reportInfo.ClassifyIdSecond)
@@ -1199,3 +1199,15 @@ func addAliasToKeyword(keyword string) string {
 	keyword = strings.Join(keywordArr, ",")
 	return keyword
 }
+
+// GetReportPptImgListByReportIdAndReportChapterId 首页展示报告汇总列表
+func GetReportPptImgListByReportIdAndReportChapterId(reportId, reportChapterId int) (list []string, err error) {
+	list = make([]string, 0)
+	reportPptImgList, err := report_ppt_img.GetReportPptImgListByReportIdAndReportChapterId(reportId, reportChapterId)
+
+	for _, v := range reportPptImgList {
+		list = append(list, v.ImgURL)
+	}
+
+	return
+}