Merge branch 'fix/1.8.3' into debug

models/report.go

@@ -28,6 +28,7 @@ type Report struct {
 	VideoUrl           string    `description:"音频文件URL"`
 	VideoName          string    `description:"音频文件名称"`
 	VideoPlaySeconds   string    `description:"音频播放时长"`
+	VideoSize          string    `description:"音频文件大小，单位M"`
 	ContentSub         string    `description:"内容前两个章节"`
 	HasChapter         int       `description:"是否有章节 0-否 1-是"`
 	ChapterType        string    `description:"章节类型 day-晨报 week-周报"`
@@ -139,6 +140,23 @@ func ModifyReportVideo(reportId int, videoUrl, videoName, videoSize string, play
 	return
 }
 
+// ModifyReportVideoByNoVideo
+// @Description: 修改无音频的报告音频信息
+// @author: Roc
+// @datetime 2024-07-25 18:03:05
+// @param reportId int
+// @param videoUrl string
+// @param videoName string
+// @param videoSize string
+// @param playSeconds float64
+// @return err error
+func ModifyReportVideoByNoVideo(reportId int, videoUrl, videoName, videoSize string, playSeconds float64) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `UPDATE report SET video_url=?,video_name=?,video_play_seconds=?,video_size=? WHERE id=? AND video_url=""`
+	_, err = o.Raw(sql, videoUrl, videoName, playSeconds, videoSize, reportId).Exec()
+	return
+}
+
 type ReportChapterTypePermission struct {
 	Id                    int       `orm:"column(id);pk" description:"主键ID"`
 	ReportChapterTypeId   int       `description:"报告章节类型ID"`

services/data/base_from_pcsg.go

@@ -2,30 +2,71 @@ package data
 
 import (
 	"context"
-	"eta/eta_task/services/alarm_msg"
+	"encoding/json"
 	"eta/eta_task/utils"
 	"fmt"
+	"io/ioutil"
+	"time"
 )
 
-// RefreshPCSGBloomberg 中石油新加坡-每日指标刷新
+// RefreshPCSGBloomberg 中石油新加坡-定时刷新指标
 func RefreshPCSGBloomberg(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
-			tips := "RefreshPCSGBloombergDaily-中石油新加坡-刷新彭博日度指标失败, ErrMsg:\n" + err.Error()
+			tips := "RefreshPCSGBloombergDaily-中石油新加坡-刷新彭博指标失败, ErrMsg:\n" + err.Error()
 			utils.FileLog.Info(tips)
-			go alarm_msg.SendAlarmMsg(tips, 3)
 		}
 	}()
 
-	param := make(map[string]interface{})
+	runTime := time.Now().Local().Format("15:04")
+	tasks, e := LoadPCSGBloombergTask()
+	if e != nil {
+		err = fmt.Errorf("读取配置失败, %v", e)
+		return
+	}
+	if len(tasks) == 0 {
+		utils.FileLog.Info("任务未配置")
+		return
+	}
+
+	// 根据分钟匹配任务
 	uri := "bloomberg/pcsg/refresh_task"
-	res, e := postRefreshEdbData(param, uri)
+	for _, v := range tasks {
+		if runTime != v.TaskTime {
+			continue
+		}
+		utils.FileLog.Info(fmt.Sprintf("执行%s", v.TaskKey))
+		param := make(map[string]interface{})
+		param["TaskKey"] = v.TaskKey
+		res, e := postRefreshEdbData(param, uri)
+		if e != nil {
+			utils.FileLog.Info(fmt.Sprintf("postRefreshEdbData, %v", e))
+			continue
+		}
+		if res != nil && res.Ret != 200 {
+			utils.FileLog.Info("postRefreshEdbData, fail")
+			continue
+		}
+		utils.FileLog.Info(fmt.Sprintf("执行结束%s", v.TaskKey))
+	}
+	return
+}
+
+type PCSGBloombergTask struct {
+	TaskKey  string `json:"TaskKey"`
+	TaskTime string `json:"TaskTime"`
+}
+
+// LoadPCSGBloombergTask 加载配置
+func LoadPCSGBloombergTask() (tasks []*PCSGBloombergTask, err error) {
+	filePath := "./static/pcsg_task.json"
+	b, e := ioutil.ReadFile(filePath)
 	if e != nil {
-		err = fmt.Errorf("postRefreshEdbData err: %s", e.Error())
+		err = fmt.Errorf("读取配置失败, err: %v", e)
 		return
 	}
-	if res != nil && res.Ret != 200 {
-		err = fmt.Errorf("postRefreshEdbData fail")
+	if e = json.Unmarshal(b, &tasks); e != nil {
+		err = fmt.Errorf("解析配置失败, err: %v", e)
 		return
 	}
 	return

services/report.go

@@ -248,7 +248,7 @@ func handleByPublishReport(item *models.Report) {
 
 	if item.HasChapter == 1 {
 		// 生产报告章节音频
-		_ = UpdateChaptersVideoByReportId(item.Id)
+		_ = UpdateChaptersVideoByReportId(item)
 	} else {
 		// 生成音频
 		if item.VideoUrl == "" {
@@ -468,9 +468,11 @@ func ClearReportSaveLog(cont context.Context) (err error) {
 // @Description: 更新报告章节音频
 // @author: Roc
 // @datetime 2024-06-28 13:52:56
-// @param reportId int
+// @param reportInfo *models.Report
 // @return err error
-func UpdateChaptersVideoByReportId(reportId int) (err error) {
+func UpdateChaptersVideoByReportId(reportInfo *models.Report) (err error) {
+	reportId := reportInfo.Id
+
 	defer func() {
 		if err != nil {
 			utils.FileLog.Error("UpdateChaptersVideo, reportId:%v, Err:%s", reportId, err.Error())
@@ -481,12 +483,18 @@ func UpdateChaptersVideoByReportId(reportId int) (err error) {
 	if err != nil {
 		return
 	}
+
+	reportContent := ""
+
 	// 生成video
 	nowTime := time.Now()
 	updateCols := make([]string, 0)
 	updateCols = append(updateCols, "VideoUrl", "VideoName", "VideoSize", "VideoPlaySeconds")
 	for i := 0; i < len(chapterList); i++ {
 		item := chapterList[i]
+		reportContent += item.Title + `。`
+		reportContent += item.Content + `。`
+
 		// 忽略已有音频的章节
 		if item.VideoUrl != "" && item.VideoName != "" && item.VideoSize != "" && item.VideoPlaySeconds != "" {
 			continue
@@ -505,6 +513,22 @@ func UpdateChaptersVideoByReportId(reportId int) (err error) {
 		}
 	}
 
+	// 生成汇总音频
+	{
+		if reportInfo.VideoUrl != "" && reportInfo.VideoName != "" && reportInfo.VideoSize != "" && reportInfo.VideoPlaySeconds != "" {
+			return
+		}
+		videoUrl, videoName, videoSize, videoPlaySeconds, e := CreateReportVideo(reportInfo.Title, html.UnescapeString(reportContent), time.Now().Format(utils.FormatDateTime))
+		if e != nil {
+			err = e
+			return
+		}
+
+		// 修改报告的音频信息
+		err = models.ModifyReportVideoByNoVideo(reportInfo.Id, videoUrl, videoName, videoSize, videoPlaySeconds)
+
+	}
+
 	return
 }
 

services/task.go

@@ -135,7 +135,7 @@ func releaseTask() {
 
 	// 中石油新加坡
 	if utils.IsPCSG == "1" {
-		refreshPCSGBloomberg := task.NewTask("refreshPCSGBloombergDaily", "0 30 9 * * *", data.RefreshPCSGBloomberg)
+		refreshPCSGBloomberg := task.NewTask("refreshPCSGBloombergDaily", "0 */30 * * * *", data.RefreshPCSGBloomberg)
 		task.AddTask("中石油新加坡-每日Bloomberg指标刷新", refreshPCSGBloomberg)
 	}
 

static/pcsg_task.json

@@ -0,0 +1,30 @@
+[
+  {
+    "TaskKey": "IDpcsgDailyRunHistU2",
+    "TaskTime": "07:00"
+  },
+  {
+    "TaskKey": "IDpcsgDailyRunHist4",
+    "TaskTime": "07:00"
+  },
+  {
+    "TaskKey": "IDpcsgDailyRunHist1",
+    "TaskTime": "08:00"
+  },
+  {
+    "TaskKey": "IDpcsgDailyRunHist2",
+    "TaskTime": "08:00"
+  },
+  {
+    "TaskKey": "IDpcsgDailyRunHistV1",
+    "TaskTime": "08:00"
+  },
+  {
+    "TaskKey": "IDpcsgDailyRun4",
+    "TaskTime": "08:00"
+  },
+  {
+    "TaskKey": "IDpcsgMonthRun2",
+    "TaskTime": "09:30"
+  }
+]