Merge branch 'eta/1.8.3' into debug

controllers/report_chapter.go

@@ -5,6 +5,7 @@ import (
 	"eta/eta_api/models"
 	"eta/eta_api/models/report"
 	"eta/eta_api/services"
+	"eta/eta_api/services/data"
 	"eta/eta_api/utils"
 	"fmt"
 	"github.com/kgiannakakis/mp3duration/src/mp3duration"
@@ -505,7 +506,6 @@ func (this *ReportController) DelChapter() {
 // @Success 200 {object} company.CompanyListResp
 // @router /getReportChapterList [get]
 func (this *ReportController) GetReportChapterList() {
-	// TODO 授权用户校验
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -527,6 +527,7 @@ func (this *ReportController) GetReportChapterList() {
 		return
 	}
 
+	// 获取报告信息
 	reportInfo, err := models.GetReportByReportId(reportId)
 	if err != nil {
 		br.Msg = "获取报告信息失败"
@@ -534,6 +535,19 @@ func (this *ReportController) GetReportChapterList() {
 		return
 	}
 
+	// 权限校验
+	isAuth, err := services.CheckReportAuthByReportChapterInfo(sysUser.AdminId, reportInfo.AdminId, reportId)
+	if err != nil {
+		br.Msg = "获取报告权限失败"
+		br.ErrMsg = "获取报告权限失败,Err:" + err.Error()
+		return
+	}
+	if !isAuth {
+		br.Msg = "无操作权限"
+		br.ErrMsg = "无操作权限"
+		return
+	}
+
 	// 获取章节列表
 	chapterList, err := models.GetChapterListByReportId(reportId)
 	if err != nil {
@@ -708,7 +722,6 @@ func (this *ReportController) GetReportChapterList() {
 // @Success 200 Ret=200 保存成功
 // @router /getDayWeekChapter [get]
 func (this *ReportController) GetDayWeekChapter() {
-	// TODO 授权用户校验
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -727,6 +740,7 @@ func (this *ReportController) GetDayWeekChapter() {
 		br.Msg = "参数有误"
 		return
 	}
+
 	chapterInfo, err := models.GetReportChapterInfoById(reportChapterId)
 	if err != nil {
 		br.Msg = "获取章节信息失败"
@@ -739,6 +753,27 @@ func (this *ReportController) GetDayWeekChapter() {
 		chapterInfo.ContentStruct = html.UnescapeString(chapterInfo.ContentStruct)
 	}
 
+	// 获取报告详情
+	reportInfo, err := models.GetReportById(chapterInfo.ReportId)
+	if err != nil {
+		br.Msg = "获取报告信息失败"
+		br.ErrMsg = "获取报告信息失败, Err: " + err.Error()
+		return
+	}
+
+	// 权限校验
+	isAuth, err := services.CheckReportAuthByReportChapterInfo(sysUser.AdminId, reportInfo.AdminId, reportInfo.Id)
+	if err != nil {
+		br.Msg = "获取报告权限失败"
+		br.ErrMsg = "获取报告权限失败,Err:" + err.Error()
+		return
+	}
+	if !isAuth {
+		br.Msg = "无操作权限"
+		br.ErrMsg = "无操作权限"
+		return
+	}
+
 	chapterInfo.Content = html.UnescapeString(chapterInfo.Content)
 	chapterInfo.ContentSub = html.UnescapeString(chapterInfo.ContentSub)
 	chapterInfo.ContentStruct = html.UnescapeString(chapterInfo.ContentStruct)
@@ -1044,19 +1079,17 @@ func (this *ReportController) VoiceUpload() {
 		return
 	}
 
-	// 如果不是自己创建的报告，那么要去校验是否属于授权用户
-	if this.SysUser.AdminId != reportInfo.AdminId {
-		isAuth, err := services.CheckChapterAuthByReportChapterInfo(this.SysUser.AdminId, reportChapterInfo)
-		if err != nil {
-			br.Msg = "获取报告权限失败"
-			br.ErrMsg = "获取报告权限失败,Err:" + err.Error()
-			return
-		}
-		if !isAuth {
-			br.Msg = "无操作权限"
-			br.ErrMsg = "无操作权限"
-			return
-		}
+	// 权限校验
+	isAuth, err := services.CheckChapterAuthByReportChapterInfo(this.SysUser.AdminId, reportInfo.AdminId, reportChapterInfo)
+	if err != nil {
+		br.Msg = "获取报告权限失败"
+		br.ErrMsg = "获取报告权限失败,Err:" + err.Error()
+		return
+	}
+	if !isAuth {
+		br.Msg = "无操作权限"
+		br.ErrMsg = "无操作权限"
+		return
 	}
 
 	ext := path.Ext(h.Filename)
@@ -1164,6 +1197,7 @@ func (this *ReportController) VoiceUpload() {
 			return
 		}
 
+		// 修改报告的最近更新人信息
 		reportInfo.LastModifyAdminId = this.SysUser.AdminId
 		reportInfo.LastModifyAdminName = this.SysUser.RealName
 		reportInfo.ModifyTime = time.Now()
@@ -1175,6 +1209,9 @@ func (this *ReportController) VoiceUpload() {
 		}
 	}
 
+	// 处理报告中的音频文件分贝
+	go services.HandleVideoDecibel(reportChapterInfo)
+
 	resp := new(models.ResourceResp)
 	resp.Id = newId
 	resp.ResourceUrl = resourceUrl
@@ -1184,3 +1221,134 @@ func (this *ReportController) VoiceUpload() {
 	br.Data = resp
 	return
 }
+
+// PublishDayWeekReportChapter
+// @Title 发布章节
+// @Description 发布章节
+// @Param	request	body models.PublishReportChapterReq true "type json string"
+// @Success 200 Ret=200 操作成功
+// @router /publishDayWeekReportChapter [post]
+func (this *ReportController) PublishDayWeekReportChapter() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	var req models.PublishReportChapterReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	if req.ReportChapterId <= 0 {
+		br.Msg = "参数有误"
+		return
+	}
+
+	// 获取报告详情
+	chapterInfo, err := models.GetReportChapterInfoById(req.ReportChapterId)
+	if err != nil {
+		br.Msg = "章节信息有误"
+		br.ErrMsg = "获取章节信息失败, Err: " + err.Error()
+		return
+	}
+
+	reportInfo, err := models.GetReportByReportId(chapterInfo.ReportId)
+	if err != nil {
+		br.Msg = "查询报告有误"
+		br.ErrMsg = "查询报告信息失败, Err: " + err.Error()
+		return
+	}
+	if reportInfo.State == 2 {
+		br.Msg = "该报告已发布，不允许编辑"
+		br.ErrMsg = "该报告已发布，不允许编辑"
+		return
+	}
+
+	// 图表刷新状态
+	refreshResult := data.CheckBatchChartRefreshResult("report", chapterInfo.ReportId, chapterInfo.ReportChapterId)
+	if !refreshResult {
+		br.Msg = "图表刷新未完成，请稍后操作"
+		br.ErrMsg = "图表刷新未完成，请稍后操作"
+		br.IsSendEmail = false
+		return
+	}
+
+	// 获取规则配置
+	reportChapterTypeRule, err := models.GetReportChapterTypeById(chapterInfo.TypeId)
+	if err != nil {
+		br.Msg = "获取配置信息异常"
+		br.ErrMsg = "获取配置信息异常, Err: " + err.Error()
+		return
+	}
+	if reportChapterTypeRule.Enabled == 0 {
+		br.Msg = "该章节已永久停更"
+		br.ErrMsg = "该章节已永久停更 "
+		br.IsSendEmail = false
+		return
+	}
+
+	var publishTime time.Time
+	if reportInfo.MsgIsSend == 1 && reportInfo.PublishTime.IsZero() { //如果报告曾经发布过，并且已经发送过模版消息，则章节的发布时间为报告的发布时间
+		publishTime = reportInfo.PublishTime
+	} else {
+		publishTime = time.Now()
+	}
+
+	// 更新章节信息
+	chapterInfo.IsEdit = 1
+	chapterInfo.PublishState = 2
+	chapterInfo.PublishTime = publishTime
+	chapterInfo.LastModifyAdminId = this.SysUser.AdminId
+	chapterInfo.LastModifyAdminName = this.SysUser.RealName
+	chapterInfo.ModifyTime = time.Now()
+
+	updateCols := make([]string, 0)
+	updateCols = append(updateCols, "IsEdit", "PublishState", "PublishTime", "LastModifyAdminId", "LastModifyAdminName", "ModifyTime")
+	err = chapterInfo.UpdateChapter(updateCols)
+	if err != nil {
+		br.Msg = "发布失败"
+		br.ErrMsg = "报告章节内容保存失败, Err: " + err.Error()
+		return
+	}
+
+	// 修改报告的最近更新人信息
+	go func() {
+		reportInfo.LastModifyAdminId = this.SysUser.AdminId
+		reportInfo.LastModifyAdminName = this.SysUser.RealName
+		reportInfo.ModifyTime = time.Now()
+		err = reportInfo.UpdateReport([]string{"LastModifyAdminId", "LastModifyAdminName", "ModifyTime"})
+		if err != nil {
+			br.Msg = "上传失败"
+			br.ErrMsg = "修改报告最后更新人信息失败，Err:" + err.Error()
+			return
+		}
+	}()
+
+	// 更新章节ES
+	{
+		go services.UpdateReportChapterEs(chapterInfo.ReportChapterId)
+	}
+
+	// 同时发布报告
+	if req.PublishReport == 1 {
+		if _, e := services.PublishDayWeekReport(chapterInfo.ReportId); e != nil {
+			br.Msg = "章节发布成功，报告发布失败，请手动发布报告"
+			br.ErrMsg = "发布晨/周报失败, Err: " + e.Error()
+			return
+		}
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+}

controllers/report_v2.go

@@ -8,9 +8,7 @@ import (
 	"eta/eta_api/models/system"
 	"eta/eta_api/services"
 	"eta/eta_api/services/alarm_msg"
-	"eta/eta_api/services/data"
 	"eta/eta_api/utils"
-	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"html"
 	"strconv"
@@ -775,210 +773,6 @@ func (this *ReportController) SaveReportContent() {
 	br.Data = resp
 }
 
-// PublishDayWeekReportChapter
-// @Title 发布晨周报章节
-// @Description 发布晨周报章节
-// @Param	request	body models.PublishReportChapterReq true "type json string"
-// @Success 200 Ret=200 操作成功
-// @router /publishDayWeekReportChapter [post]
-func (this *ReportController) PublishDayWeekReportChapter() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	var req models.PublishReportChapterReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-	if req.ReportChapterId <= 0 {
-		br.Msg = "参数有误"
-		return
-	}
-	if req.Title == "" {
-		br.Msg = "请输入标题"
-		return
-	}
-	if req.Content == "" {
-		br.Msg = "请输入内容"
-		return
-	}
-	if req.AddType == 0 {
-		br.Msg = "请选择新增方式"
-		return
-	}
-
-	reqTickerList := req.TickerList
-
-	chapterInfo, err := models.GetReportChapterInfoById(req.ReportChapterId)
-	if err != nil {
-		br.Msg = "章节信息有误"
-		br.ErrMsg = "获取章节信息失败, Err: " + err.Error()
-		return
-	}
-
-	reportInfo, err := models.GetReportById(chapterInfo.ReportId)
-	if err != nil {
-		br.Msg = "查询报告有误"
-		br.ErrMsg = "查询报告信息失败, Err: " + err.Error()
-		return
-	}
-	if reportInfo.State == 2 {
-		br.Msg = "该报告已发布，不允许编辑"
-		br.ErrMsg = "该报告已发布，不允许编辑"
-		return
-	}
-
-	// 图表刷新状态
-	refreshResult := data.CheckBatchChartRefreshResult("report", chapterInfo.ReportId, chapterInfo.ReportChapterId)
-	if !refreshResult {
-		br.Msg = "图表刷新未完成，请稍后操作"
-		br.ErrMsg = "图表刷新未完成，请稍后操作"
-		br.IsSendEmail = false
-		return
-	}
-
-	// 获取规则配置
-	reportChapterTypeRule, err := models.GetReportChapterTypeById(chapterInfo.TypeId)
-	if err != nil {
-		br.Msg = "获取配置信息异常"
-		br.ErrMsg = "获取配置信息异常, Err: " + err.Error()
-		return
-	}
-	if reportChapterTypeRule.Enabled == 0 {
-		br.Msg = "该章节已永久停更"
-		br.ErrMsg = "该章节已永久停更 "
-		br.IsSendEmail = false
-		return
-	}
-
-	updateCols := make([]string, 0)
-	updateCols = append(updateCols, "Title", "AddType", "Author", "Content", "ContentSub", "IsEdit", "CreateTime", "PublishState", "PublishTime")
-
-	var needHandleVideo bool // 是否需要处理音频文件
-	nowTime := time.Now()
-	var publishTime time.Time
-	if reportInfo.MsgIsSend == 1 && reportInfo.PublishTime != "" { //如果报告曾经发布过，并且已经发送过模版消息，则章节的发布时间为报告的发布时间
-		publishTime, _ = time.ParseInLocation(utils.FormatDateTime, reportInfo.PublishTime, time.Local)
-	} else {
-		publishTime = time.Now()
-	}
-	if req.VideoUrl != "" {
-		chapterInfo.VideoUrl = req.VideoUrl
-		chapterInfo.VideoName = req.VideoName
-		chapterInfo.VideoSize = req.VideoSize
-		chapterInfo.VideoPlaySeconds = req.VideoPlaySeconds
-		chapterInfo.VideoKind = 1
-
-		updateCols = append(updateCols, "VideoUrl", "VideoName", "VideoSize", "VideoPlaySeconds", "VideoKind")
-
-		// 手动上传的音频需要处理音频文件
-		needHandleVideo = true
-	} else {
-		if chapterInfo.VideoUrl == "" {
-			// 生成video
-			videoUrl, videoName, videoSize, videoPlaySeconds, err := services.CreateReportVideo(req.Title, req.Content, publishTime.Format(utils.FormatDateTime))
-			if err != nil {
-				br.Msg = "生成video失败"
-				br.ErrMsg = "生成video失败, Err: " + err.Error()
-				return
-			}
-			chapterInfo.VideoUrl = videoUrl
-			chapterInfo.VideoName = videoName
-			chapterInfo.VideoSize = videoSize
-			chapterInfo.VideoPlaySeconds = fmt.Sprintf("%.2f", videoPlaySeconds)
-			chapterInfo.VideoKind = 2
-			updateCols = append(updateCols, "VideoUrl", "VideoName", "VideoSize", "VideoPlaySeconds", "VideoKind")
-		}
-	}
-
-	// 更新章节信息
-	contentSub := ""
-	if req.Content != "" {
-		e := utils.ContentXssCheck(req.Content)
-		if e != nil {
-			br.Msg = "存在非法标签"
-			br.ErrMsg = "存在非法标签, Err: " + e.Error()
-			return
-		}
-		contentClean, e := services.FilterReportContentBr(req.Content)
-		if e != nil {
-			br.Msg = "内容去除前后空格失败"
-			br.ErrMsg = "内容去除前后空格失败, Err: " + e.Error()
-			return
-		}
-		req.Content = contentClean
-
-		contentSub, err = services.GetReportContentSub(req.Content)
-		if err != nil {
-			br.Msg = "内容分段解析失败"
-			br.ErrMsg = "编辑报告章节-解析 ContentSub 失败, Err: " + err.Error()
-			return
-		}
-	}
-	chapterInfo.Title = req.Title
-	chapterInfo.AddType = req.AddType
-	chapterInfo.Author = req.Author
-	chapterInfo.Content = html.EscapeString(req.Content)
-	chapterInfo.ContentSub = html.EscapeString(contentSub)
-	chapterInfo.IsEdit = 1
-	chapterInfo.CreateTime = req.CreateTime
-	chapterInfo.PublishState = 2
-	chapterInfo.PublishTime = publishTime
-
-	// 晨报更新指标
-	tickerList := make([]*models.ReportChapterTicker, 0)
-	if chapterInfo.ReportType == "day" && len(reqTickerList) > 0 {
-		for i := 0; i < len(reqTickerList); i++ {
-			tickerList = append(tickerList, &models.ReportChapterTicker{
-				ReportChapterId: chapterInfo.ReportChapterId,
-				Sort:            reqTickerList[i].Sort,
-				Ticker:          reqTickerList[i].Ticker,
-				CreateTime:      nowTime,
-				UpdateTime:      nowTime,
-			})
-		}
-	}
-	if err = models.UpdateChapterAndTicker(chapterInfo, updateCols, tickerList); err != nil {
-		br.Msg = "发布失败"
-		br.ErrMsg = "报告章节内容保存失败, Err: " + err.Error()
-		return
-	}
-	// 更新章节ES
-	{
-		go services.UpdateReportChapterEs(chapterInfo.ReportChapterId)
-	}
-
-	// 同时发布报告
-	if req.PublishReport == 1 {
-		if _, e := services.PublishDayWeekReport(chapterInfo.ReportId); e != nil {
-			br.Msg = "章节发布成功，报告发布失败，请手动发布报告"
-			br.ErrMsg = "发布晨/周报失败, Err: " + e.Error()
-			return
-		}
-	}
-
-	// 处理报告中的音频文件分贝
-	if needHandleVideo {
-		go services.HandleVideoDecibel(chapterInfo)
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "操作成功"
-}
-
 // AuthorizedListReport
 // @Title 获取有权限的报告列表接口
 // @Description 获取有权限的报告列表接口

models/report_chapter.go

@@ -298,18 +298,8 @@ func GetReportChapterVideoListByChapterIds(chapterIds []int) (list []*ReportChap
 
 // PublishReportChapterReq 发布报告章节请求体
 type PublishReportChapterReq struct {
-	ReportChapterId  int            `description:"报告章节ID"`
-	Title            string         `description:"标题"`
-	AddType          int            `description:"新增方式：1:新增报告，2:继承报告"`
-	Author           string         `description:"作者"`
-	Content          string         `description:"内容"`
-	TickerList       []EditTickList `description:"指标信息"`
-	CreateTime       string         `description:"发布时间"`
-	PublishReport    int            `description:"是否同时发布报告"`
-	VideoUrl         string         `description:"音频文件URL"`
-	VideoName        string         `description:"音频文件名称"`
-	VideoPlaySeconds string         `description:"音频播放时长"`
-	VideoSize        string         `description:"音频文件大小，单位M"`
+	ReportChapterId int `description:"报告章节ID"`
+	PublishReport   int `description:"是否同时发布报告"`
 }
 
 // CountPublishedChapterNum 获取报告已发布的章节数

services/report.go

@@ -360,6 +360,7 @@ func addCategoryAliasToArr(categoryArr []string) (aliasArr []string, err error)
 
 // UpdateReportChapterEs 更新报告章节ES
 func UpdateReportChapterEs(reportChapterId int) (err error) {
+	// TODO 报告章节ES的权限控制
 	if reportChapterId <= 0 {
 		return
 	}

services/report_chapter.go

@@ -197,10 +197,17 @@ func CheckChapterAuthByAdminIdList(adminId, createAdminId int, grantAdminIdList
 // @author: Roc
 // @datetime 2024-06-13 11:10:46
 // @param adminId int
+// @param createAdminId int
 // @param reportChapterInfo *models.ReportChapter
 // @return isAuth bool
 // @return err error
-func CheckChapterAuthByReportChapterInfo(adminId int, reportChapterInfo *models.ReportChapter) (isAuth bool, err error) {
+func CheckChapterAuthByReportChapterInfo(adminId, createAdminId int, reportChapterInfo *models.ReportChapter) (isAuth bool, err error) {
+	// 如果是自己创建的报告，那么就有权限
+	if adminId == createAdminId {
+		isAuth = true
+		return
+	}
+
 	chapterGrantObj := report.ReportChapterGrant{}
 	chapterGrantList, err := chapterGrantObj.GetGrantListById(reportChapterInfo.ReportChapterId)
 	if err != nil {

services/report_v2.go

@@ -837,3 +837,57 @@ func DownloadVoice(reportInfo *models.ReportDetail) (savePath, fileName string,
 
 	return
 }
+
+// CheckReportAuthByAdminIdList
+// @Description: 根据管理员id列表，判断当前用户是否有报告权限
+// @author: Roc
+// @datetime 2024-06-13 11:03:10
+// @param adminId int
+// @param createAdminId int
+// @param grantAdminIdList []int
+// @return isAuth bool
+func CheckReportAuthByAdminIdList(adminId, createAdminId int, grantAdminIdList []int) (isAuth bool) {
+	// 如果是自己创建的报告，那么就有权限
+	if adminId == createAdminId {
+		isAuth = true
+		return
+	}
+	// 如果是授权用户，那么就有权限
+	if utils.IsCheckInList(grantAdminIdList, adminId) {
+		isAuth = true
+		return
+	}
+
+	return
+}
+
+// CheckReportAuthByReportChapterInfo
+// @Description: 根据报告ID，判断当前用户是否有报告权限
+// @author: Roc
+// @datetime 2024-06-13 16:21:28
+// @param adminId int
+// @param reportInfoId int
+// @return isAuth bool
+// @return err error
+func CheckReportAuthByReportChapterInfo(adminId, createAdminId int, reportInfoId int) (isAuth bool, err error) {
+	// 如果是自己创建的报告，那么就有权限
+	if adminId == createAdminId {
+		isAuth = true
+		return
+	}
+
+	obj := report.ReportGrant{}
+	chapterGrantList, err := obj.GetGrantListById(reportInfoId)
+	if err != nil {
+		return
+	}
+
+	for _, v := range chapterGrantList {
+		if v.AdminId == adminId {
+			isAuth = true
+			return
+		}
+	}
+
+	return
+}