Merge branch 'master' into feature/migrate_wechat_msg

controller/community/comment.go

@@ -21,24 +21,8 @@ func Comment(c *gin.Context) {
 	}
 	userInfo := userService.GetInfoByClaims(c)
 
+	// 随机头像
 	var qaAvatarUrl string
-	//if userInfo.QaAvatarUrl == "" {
-	//	avatar, err := yb_community_question_comment.GetUserAvatarRandom()
-	//	if err != nil {
-	//		response.FailMsg("发布失败", err.Error(), c)
-	//		return
-	//	}
-	//	qaAvatarUrl = avatar.AvatarUrl
-	//	err = wx_user.ModifyQaAvatarUrl(qaAvatarUrl, userInfo.UserID)
-	//	if err != nil {
-	//		response.FailMsg("发布失败", err.Error(), c)
-	//		return
-	//	}
-	//} else {
-	//	qaAvatarUrl = userInfo.QaAvatarUrl
-	//}
-
-	// 2022-0914修改为全随机
 	avatar, e := yb_community_question_comment.GetUserAvatarRandom()
 	if e != nil {
 		response.FailMsg("发布失败", e.Error(), c)
@@ -50,7 +34,12 @@ func Comment(c *gin.Context) {
 	if userInfo.NickName != `` { //非空串时为实名
 		req.IsShowName = 1
 	}
-	ybCommunityQuestionComment, err, errMsg := yb_community_question.Comment(userInfo, req.CommunityQuestionID, req.Content, req.SourceAgent, req.IsShowName, qaAvatarUrl)
+	// 不传来源默认为问答社区
+	if req.Source == 0 {
+		req.Source = 1
+	}
+
+	ybCommunityQuestionComment, err, errMsg := yb_community_question.Comment(userInfo, req.CommunityQuestionID, req.Content, req.SourceAgent, req.IsShowName, req.Source, qaAvatarUrl)
 	if err != nil {
 		response.FailMsg(errMsg, err.Error(), c)
 		return
@@ -86,11 +75,18 @@ func HotList(c *gin.Context) {
 		response.Fail("问答id异常", c)
 		return
 	}
+	// 来源: 默认为问答社区
+	reqSource := c.DefaultQuery("source", "1")
+	source, _ := strconv.Atoi(reqSource)
+	if source == 0 {
+		source = 1
+	}
+
 	userinfo := userService.GetInfoByClaims(c)
 	page := services.GetCurrPageByClaims(c)
 	pageSize := services.GetPageSizeByClaims(c)
 
-	list, hotTotal, myTotal, err, errMsg := yb_community_question.List(userinfo.UserID, communityQuestionID, true, page, pageSize)
+	list, hotTotal, myTotal, err, errMsg := yb_community_question.List(userinfo.UserID, communityQuestionID, source, true, page, pageSize)
 	if err != nil {
 		response.FailMsg(errMsg, err.Error(), c)
 		return
@@ -113,11 +109,17 @@ func MyList(c *gin.Context) {
 		response.Fail("问答id异常", c)
 		return
 	}
+	// 来源: 默认为问答社区
+	reqSource := c.DefaultQuery("source", "1")
+	source, _ := strconv.Atoi(reqSource)
+	if source == 0 {
+		source = 1
+	}
 	userinfo := userService.GetInfoByClaims(c)
 	page := services.GetCurrPageByClaims(c)
 	pageSize := services.GetPageSizeByClaims(c)
 
-	list, hotTotal, myTotal, err, errMsg := yb_community_question.MyList(userinfo.UserID, communityQuestionID, page, pageSize)
+	list, hotTotal, myTotal, err, errMsg := yb_community_question.MyList(userinfo.UserID, communityQuestionID, source, page, pageSize)
 	if err != nil {
 		response.FailMsg(errMsg, err.Error(), c)
 		return

controller/community/question.go

@@ -352,8 +352,12 @@ func SetLikeOrTease(c *gin.Context) {
 		return
 	}
 	userinfo := userService.GetInfoByClaims(c)
+	// 不传来源默认为问答社区
+	if req.Source == 0 {
+		req.Source = 1
+	}
 
-	communityQuestionLikeTease, likeNum, teaseNum, err, errMsg := yb_community_question.SetLikeOrTease(userinfo.UserID, req.CommunityQuestionId, req.OpType, req.Enable, req.SourceAgent)
+	communityQuestionLikeTease, likeNum, teaseNum, err, errMsg := yb_community_question.SetLikeOrTease(userinfo.UserID, req.CommunityQuestionId, req.OpType, req.Enable, req.SourceAgent, req.Source)
 	if err != nil {
 		response.FailMsg(errMsg, err.Error(), c)
 		return

controller/community/video.go

@@ -1,6 +1,7 @@
 package community
 
 import (
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"hongze/hongze_yb/controller/response"
 	"hongze/hongze_yb/models/request"
@@ -32,11 +33,29 @@ func VideoList(c *gin.Context) {
 	if req.PageSize == 0 {
 		req.PageSize = utils.PageSize20
 	}
+	userInfo := user.GetInfoByClaims(c)
 	list, err := community.GetVideoList(req.PageIndex, req.PageSize, req.VideoId, req.VarietyTagId, req.Keywords)
 	if err != nil {
 		response.FailMsg("获取失败", "VideoList ErrMsg:"+err.Error(), c)
 		return
 	}
+
+	// 点赞/吐槽数据
+	err = community.HandleLikeOrTeaseByCommunityVideoItemList(userInfo.UserID, list)
+	if err != nil {
+		fmt.Println(err.Error())
+		response.FailMsg("获取失败", "QuestionList ErrMsg:"+err.Error(), c)
+		return
+	}
+
+	// 评论数据
+	err = community.HandleCommentByCommunityVideoItemList(list)
+	if err != nil {
+		fmt.Println(err.Error())
+		response.FailMsg("获取失败", "QuestionList ErrMsg:"+err.Error(), c)
+		return
+	}
+
 	response.OkData("获取成功", list, c)
 }
 
@@ -63,10 +82,12 @@ func VideoPlayLog(c *gin.Context) {
 		return
 	}
 	userinfo := user.GetInfoByClaims(c)
-	errMsg, err := community.SaveVideoPlayLog(userinfo, req.VideoId, req.SourceAgent)
+	errMsg, err := community.SaveVideoPlayLog(userinfo, req.VideoId, req.SourceAgent, 1)
 	if err != nil {
 		response.FailMsg(errMsg, "VideoPlayLog ErrMsg:"+err.Error(), c)
 		return
 	}
 	response.Ok("操作成功", c)
 }
+
+

controller/company/company_permission.go

@@ -37,5 +37,18 @@ func GetPermissionTree(c *gin.Context)  {
 		response.FailMsg("获取失败", "GetPermissionList ErrMsg:" + err.Error(), c)
 		return
 	}
+	response.OkData("获取成功", list, c)
+}
+
+// GetBindFiccPermissions 展示有权限的品种列表，无权限的隐藏
+func GetBindFiccPermissions(c *gin.Context) {
+	userinfo := userService.GetInfoByClaims(c)
+
+	list, err := company.GetBindFiccPermissions(userinfo)
+	if err !=nil {
+		response.Fail(err.Error(), c)
+		return
+	}
+
 	response.OkData("获取成功", list, c)
 }

controller/road/video.go

@@ -0,0 +1,78 @@
+package road
+
+import (
+	"github.com/gin-gonic/gin"
+	"hongze/hongze_yb/controller/response"
+	"hongze/hongze_yb/models/request"
+	"hongze/hongze_yb/services/community"
+	"hongze/hongze_yb/services/user"
+	"hongze/hongze_yb/utils"
+)
+
+// VideoList 路演视频列表
+// @Tags 路演视频列表
+// @Description 路演视频列表
+// @Param page_index			query int false "页码"
+// @Param page_size				query int false "每页数量"
+// @Param keywords				query string false "查询关键词"
+// @Param video_id				query int false "视频ID"
+// @Param chart_permission_id		query int false "品种ID"
+// @Success 200 {object}
+// @failure 400 {string} string "获取失败"
+// @Router /road/videos [get]
+func VideoList(c *gin.Context) {
+	var req request.RoadVideoListReq
+	if err := c.Bind(&req); err != nil {
+		response.Fail("参数有误", c)
+		return
+	}
+	if req.PageIndex == 0 {
+		req.PageIndex = 1
+	}
+	if req.PageSize == 0 {
+		req.PageSize = utils.PageSize20
+	}
+	userinfo := user.GetInfoByClaims(c)
+	list, err, code := community.GetRoadVideoList(userinfo, req.PageIndex, req.PageSize, req.VideoId, req.ChartPermissionId, req.Keywords)
+	if err != nil {
+		if code == response.SPECIFIC_FAIL_CODE {
+			response.SpecificFail(list, err.Error(), c)
+			return
+		}
+		response.FailMsg("获取失败", "VideoList ErrMsg:"+err.Error(), c)
+		return
+	}
+	response.OkData("获取成功", list, c)
+}
+
+
+// VideoPlayLog 记录视频播放日志
+// @Tags 视频社区模块
+// @Description 记录视频播放日志
+// @Param video_id		query  int  true  "音频ID"
+// @Param source_agent	query  int  true  "操作来源，1：小程序，2：小程序 pc 3:弘则研究公众号，4:web pc"
+// @Success 200 {string} string "操作成功"
+// @failure 400 {string} string "操作失败"
+// @Router /video/play_log [post]
+func VideoPlayLog(c *gin.Context) {
+	var req request.RoadVideoPlayLogReq
+	if err := c.ShouldBind(&req); err != nil {
+		response.Fail("参数有误", c)
+		return
+	}
+	if req.VideoId == 0 {
+		response.Fail("参数有误", c)
+		return
+	}
+	if req.SourceAgent == 0 {
+		response.Fail("参数有误", c)
+		return
+	}
+	userinfo := user.GetInfoByClaims(c)
+	errMsg, err := community.SaveVideoPlayLog(userinfo, req.VideoId, req.SourceAgent, 2)
+	if err != nil {
+		response.FailMsg(errMsg, "VideoPlayLog ErrMsg:"+err.Error(), c)
+		return
+	}
+	response.Ok("操作成功", c)
+}

controller/voice_broadcast/voice_broadcast.go

@@ -44,7 +44,6 @@ func BroadcastList(c *gin.Context) {
 		response.FailMsg("获取语音播报列表失败，"+err.Error(), "QuestionList ErrMsg:"+err.Error(), c)
 		return
 	}
-
 	isVoiceAdmin, _, err := services.GetVoiceAdminByUserInfo(userinfo)
 	if err != nil && err != utils.ErrNoRow {
 		response.FailMsg("获取语音管理员信息失败", "QuestionList ErrMsg:"+err.Error(), c)
@@ -104,8 +103,8 @@ func AddBroadcast(c *gin.Context) {
 	}
 	userInfo := user.GetInfoByClaims(c)
 	// 新增
-	resp, e := services.CreateVoiceBroadcast(req.SectionId, req.VarietyId, req.AuthorId, int(userInfo.UserID), req.BroadcastName, req.SectionName, req.VarietyName,
-		req.Author, req.VoiceSeconds, req.VoiceSize, req.VoiceUrl, req.Imgs)
+	resp, e := services.CreateVoiceBroadcast(req.SectionId, req.VarietyId, req.AuthorId, req.BroadcastName, req.SectionName, req.VarietyName,
+		req.Author, req.VoiceSeconds, req.VoiceSize, req.VoiceUrl, req.Imgs, userInfo)
 	if e != nil {
 		response.FailMsg("新增失败", e.Error(), c)
 		return
@@ -166,8 +165,8 @@ func EditBroadcast(c *gin.Context) {
 	}
 	userInfo := user.GetInfoByClaims(c)
 	// 编辑
-	resp, e := services.EditVoiceBroadcast(req.BroadcastId, req.SectionId, req.VarietyId, req.AuthorId, int(userInfo.UserID), req.BroadcastName, req.SectionName, req.VarietyName,
-		req.Author, req.VoiceSeconds, req.VoiceSize, req.VoiceUrl, req.Imgs)
+	resp, e := services.EditVoiceBroadcast(req.BroadcastId, req.SectionId, req.VarietyId, req.AuthorId, req.BroadcastName, req.SectionName, req.VarietyName,
+		req.Author, req.VoiceSeconds, req.VoiceSize, req.VoiceUrl, req.Imgs, userInfo)
 	if e != nil {
 		response.FailMsg("新增失败", e.Error(), c)
 		return
@@ -316,17 +315,32 @@ func DelBroadcast(c *gin.Context) {
 	broadcastId, err := strconv.Atoi(sbroadcastId)
 	if err != nil {
 		response.FailMsg("转换id失败，请输入正确的id", "strconv.Atoi, Err:"+err.Error(), c)
+		return
 	}
 	if broadcastId <= 0 {
 		response.FailMsg("参数错误", "参数有误", c)
 		return
 	}
+
+	userInfo := user.GetInfoByClaims(c)
+	// 是否为内部员工
+	ok, _, err := user.GetAdminByUserInfo(userInfo)
+	if err != nil {
+		response.FailMsg("您无权操作", "获取系统用户信息失败"+err.Error(), c)
+		return
+	}
+	if !ok {
+		response.FailMsg("您无权操作", "非公司内部员工", c)
+		return
+	}
 	var item voice_broadcast.VoiceBroadcast
 	item.BroadcastId = broadcastId
 	err = item.DelVoiceBroadcast()
 	if err != nil {
 		response.FailMsg("删除语音播报失败", "DelVoiceBroadcast, Err:"+err.Error(), c)
+		return
 	}
+
 	response.Ok("删除成功", c)
 }
 
@@ -371,7 +385,7 @@ func BroadcastDetail(c *gin.Context) {
 		return
 	}
 	userInfo := user.GetInfoByClaims(c)
-	resp, e := services.GetVoiceBroadcastDetail(req.BroadcastId, int(userInfo.UserID))
+	resp, e := services.GetVoiceBroadcastDetail(req.BroadcastId, userInfo)
 	if e != nil {
 		response.FailMsg("获取失败", "BroadcastDetail ErrMsg:"+e.Error(), c)
 		return
@@ -428,4 +442,4 @@ func MyVoiceBroadcastListCount(c *gin.Context) {
 		return
 	}
 	response.OkData("获取成功", resp, c)
-}
+}

go.mod

@@ -21,6 +21,7 @@ require (
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/rdlucklib/rdluck_tools v1.0.3
 	github.com/satori/go.uuid v1.2.0 // indirect
+	github.com/shopspring/decimal v1.3.1
 	github.com/silenceper/wechat/v2 v2.1.2
 	github.com/spf13/viper v1.9.0
 	github.com/swaggo/gin-swagger v1.3.3

init_serve/router.go

@@ -71,5 +71,7 @@ func InitRouter() (r *gin.Engine) {
 	routers.InitSandbox(r)
 	//语音播报
 	routers.InitVoiceBroadcast(r)
+	//线上路演
+	routers.InitRoad(r)
 	return
 }

logic/yb_community_question/yb_community_question_comment.go

@@ -12,6 +12,7 @@ import (
 	"hongze/hongze_yb/models/tables/yb_comment_anonymous_user"
 	"hongze/hongze_yb/models/tables/yb_community_question"
 	"hongze/hongze_yb/models/tables/yb_community_question_comment"
+	"hongze/hongze_yb/models/tables/yb_community_video"
 	"hongze/hongze_yb/services/alarm_msg"
 	"hongze/hongze_yb/services/company_approval_message"
 	"hongze/hongze_yb/services/user"
@@ -23,7 +24,7 @@ import (
 )
 
 // Comment 发布留言
-func Comment(user user.UserInfo, communityQuestionID uint32, content string, sourceAgent, isShowName int8, qaAvatarUrl string) (ybCommunityQuestionComment *yb_community_question_comment.YbCommunityQuestionComment, err error, errMsg string) {
+func Comment(user user.UserInfo, communityQuestionID uint32, content string, sourceAgent, isShowName, source int8, qaAvatarUrl string) (ybCommunityQuestionComment *yb_community_question_comment.YbCommunityQuestionComment, err error, errMsg string) {
 	errMsg = "发布留言失败"
 	defer func() {
 		if err != nil {
@@ -51,6 +52,12 @@ func Comment(user user.UserInfo, communityQuestionID uint32, content string, sou
 		err = errors.New(errMsg)
 		return
 	}
+	if source <= 0 {
+		errMsg = "来源有误"
+		err = errors.New(errMsg)
+		return
+	}
+
 	// 敏感词过滤
 	if user.RecordInfo.OpenID != "" && user.RecordInfo.CreatePlatform == 6 { //只有小程序的用户才能走敏感词过滤接口
 		checkResult, tErr := wx_app.MsgSecCheck(user.RecordInfo.OpenID, content)
@@ -95,6 +102,7 @@ func Comment(user user.UserInfo, communityQuestionID uint32, content string, sou
 		ModifyTime:  now,
 		CreateTime:  now,
 		QaAvatarUrl: qaAvatarUrl,
+		Source:      source,
 	}
 	err = ybCommunityQuestionComment.Create()
 	if err != nil {
@@ -155,8 +163,8 @@ func Delete(user user.UserInfo, communityQuestionCommentID uint64) (err error, e
 }
 
 // MyList 我的留言列表
-func MyList(userId uint64, communityQuestionID int, page, pageSize int) (list []*response.RespCommunityQuestionCommentItem, hotTotal, myTotal int64, err error, errMsg string) {
-	list, hotTotal, myTotal, err, errMsg = List(userId, communityQuestionID, false, page, pageSize)
+func MyList(userId uint64, communityQuestionID, source int, page, pageSize int) (list []*response.RespCommunityQuestionCommentItem, hotTotal, myTotal int64, err error, errMsg string) {
+	list, hotTotal, myTotal, err, errMsg = List(userId, communityQuestionID, source, false, page, pageSize)
 	if err != nil {
 		return
 	}
@@ -164,7 +172,7 @@ func MyList(userId uint64, communityQuestionID int, page, pageSize int) (list []
 }
 
 // List 查询精选留言列表或我的留言列表
-func List(userId uint64, communityQuestionID int, hotFlag bool, page, pageSize int) (list []*response.RespCommunityQuestionCommentItem, hotTotal, myTotal int64, err error, errMsg string) {
+func List(userId uint64, communityQuestionID, source int, hotFlag bool, page, pageSize int) (list []*response.RespCommunityQuestionCommentItem, hotTotal, myTotal int64, err error, errMsg string) {
 	defer func() {
 		if err != nil {
 			global.LOG.Critical(fmt.Sprintf("comment List: userId=%d, err:%s， errMsg:%s", userId, err.Error(), errMsg))
@@ -178,14 +186,14 @@ func List(userId uint64, communityQuestionID int, hotFlag bool, page, pageSize i
 	}
 
 	//精选留言数
-	hotTotal, err = yb_community_question_comment.GetHotListTotalByCommunityQuestionID(communityQuestionID)
+	hotTotal, err = yb_community_question_comment.GetHotListTotalByCommunityQuestionID(communityQuestionID, source)
 	if err != nil {
 		errMsg = `查询精选留言总数出错`
 		return
 	}
 
 	// 我的留言数
-	myTotal, err = yb_community_question_comment.GetListTotalByUserIdCommunityQuestionID(userId, communityQuestionID)
+	myTotal, err = yb_community_question_comment.GetListTotalByUserIdCommunityQuestionID(userId, communityQuestionID, source)
 	if err != nil {
 		errMsg = `查询我的留言总数出错`
 		return
@@ -194,7 +202,7 @@ func List(userId uint64, communityQuestionID int, hotFlag bool, page, pageSize i
 	var commentList []*yb_community_question_comment.YbCommunityQuestionComment
 	//查询精选留言
 	if hotFlag {
-		commentList, err = yb_community_question_comment.GetHotListByCommunityQuestionID(communityQuestionID, (page-1)*pageSize, pageSize)
+		commentList, err = yb_community_question_comment.GetHotListByCommunityQuestionID(communityQuestionID, (page-1)*pageSize, pageSize, source)
 		if err != nil {
 			errMsg = `查询精选留言列表出错`
 			return
@@ -202,7 +210,7 @@ func List(userId uint64, communityQuestionID int, hotFlag bool, page, pageSize i
 
 	} else {
 		//查询个人留言
-		commentList, err = yb_community_question_comment.GetListByUserIdCommunityQuestionID(userId, communityQuestionID)
+		commentList, err = yb_community_question_comment.GetListByUserIdCommunityQuestionID(userId, communityQuestionID, source)
 		if err != nil {
 			errMsg = `查询我的留言列表出错`
 			return
@@ -329,14 +337,14 @@ func HandleCommentByCommunityQuestionItemList(userId uint64, questionList []*res
 	}
 
 	// 精选评论数据
-	hotList, err := yb_community_question_comment.GetHotListByCommunityQuestionIds(idArr)
+	hotList, err := yb_community_question_comment.GetHotListByCommunityQuestionIds(idArr, yb_community_question_comment.SourceQuestion)
 	if err != nil {
 		return
 	}
 	for _, v := range hotList {
 		questionIdCommentsMap[v.CommunityQuestionID] = append(questionIdCommentsMap[v.CommunityQuestionID], &response.CommunityQuestionCommentListItem{
 			QaAvatarUrl: v.QaAvatarUrl,
-			Comment: v.Content,
+			Comment:     v.Content,
 		})
 	}
 
@@ -384,7 +392,12 @@ func systemMessageToAdmin(adminInfo admin.Admin, wxUser user.UserInfo, community
 
 	var msgType, sourceType, approvalStatus int8
 	msgType = company_approval_message.CompanyApprovalMessageMessageTypeByApply
-	sourceType = company_approval_message.CompanyApprovalMessageSourceTypeByQuestionComment
+	// 消息来源: 6-问答社区; 7-视频社区
+	if communityQuestionComment.Source == 1 {
+		sourceType = company_approval_message.CompanyApprovalMessageSourceTypeByQuestionComment
+	} else {
+		sourceType = company_approval_message.CompanyApprovalMessageSourceTypeByVideoComment
+	}
 	approvalStatus = company_approval_message.CompanyApprovalMessageApprovalStatusByPending
 
 	companyInfo, err := company.GetByCompanyId(wxUser.CompanyID)
@@ -401,21 +414,40 @@ func systemMessageToAdmin(adminInfo admin.Admin, wxUser user.UserInfo, community
 	companyName := companyInfo.CompanyName
 	remark := `您有新的问答评论待查阅`
 	content := `您有新的问答评论待查阅`
-
-	// 获取评论对应的问答信息
-	communityQuestion, err := yb_community_question.GetItemById(int(communityQuestionComment.CommunityQuestionID))
-	if err != nil {
-		err = errors.New("获取评论对应的问答失败,err：" + err.Error())
+	if communityQuestionComment.Source == 2 {
+		remark = `您有新的视频评论待查阅`
+		content = `您有新的视频评论待查阅`
+	}
+
+	// 获取评论对应的问答/视频信息
+	msgContent := ``
+	extra := ``
+	if communityQuestionComment.Source == 1 {
+		communityQuestion, e := yb_community_question.GetItemById(int(communityQuestionComment.CommunityQuestionID))
+		if e != nil {
+			err = errors.New("获取评论对应的问答失败,err：" + e.Error())
+			return
+		}
+		msgContent = communityQuestion.QuestionContent
+	} else {
+		communityVideo, e := yb_community_video.GetItemById(int(communityQuestionComment.CommunityQuestionID))
+		if e != nil {
+			err = errors.New("获取评论对应的视频失败,err：" + e.Error())
+			return
+		}
+		msgContent = communityVideo.Title
+		extra = communityVideo.VarietyTagName
 	}
 	messageInfo := company_approval_message.MessageInfo{
 		CompanyName:          companyInfo.CompanyName,
 		ProductId:            productId,
 		CompanyProductStatus: companyProductInfo.Status,
 		Title:                communityQuestionComment.Content,
-		Content:              communityQuestion.QuestionContent,
+		Content:              msgContent,
 		UserId:               wxUser.UserID,
 		UserName:             communityQuestionComment.RealName,
 		CreateTime:           communityQuestionComment.CreateTime,
+		Extra:                extra,	// 附加字段
 	}
 	//客户添加消息
 	err = company_approval_message.AddCompanyApprovalMessage(utils.AdminId, receiveUserId, int(wxUser.CompanyID), int(communityQuestionComment.CommunityQuestionCommentID), msgType, sourceType, approvalStatus, companyName, remark, content, messageInfo)
@@ -447,6 +479,10 @@ func afterDelete(communityQuestionComment *yb_community_question_comment.YbCommu
 			go alarm_msg.SendAlarmMsg("问答评论信息删除后，标记站内消息失败"+time.Now().Format("2006-01-02 15:04:05")+";Err:"+err.Error(), 3)
 		}
 	}()
-	err = company_approval_message.CancelCompanyApprovalMessage(int(communityQuestionComment.CommunityQuestionCommentID), company_approval_message.CompanyApprovalMessageSourceTypeByQuestionComment)
+	sourceType := company_approval_message.CompanyApprovalMessageSourceTypeByQuestionComment
+	if communityQuestionComment.Source == 2 {
+		sourceType = company_approval_message.CompanyApprovalMessageSourceTypeByVideoComment
+	}
+	err = company_approval_message.CancelCompanyApprovalMessage(int(communityQuestionComment.CommunityQuestionCommentID), int8(sourceType))
 	return
 }

logic/yb_community_question/yb_community_question_like_tease.go

@@ -10,7 +10,7 @@ import (
 )
 
 // SetLikeOrTease 用户对问答进行(取消)点赞或(取消)吐槽
-func SetLikeOrTease(userId uint64, communityQuestionId uint32, opType, enable, sourceAgent int8) (ybCommunityQuestionLikeTease *yb_community_question_like_tease.YbCommunityQuestionLikeTease, likeNum, teaseNum int64, err error, errMsg string) {
+func SetLikeOrTease(userId uint64, communityQuestionId uint32, opType, enable, sourceAgent, source int8) (ybCommunityQuestionLikeTease *yb_community_question_like_tease.YbCommunityQuestionLikeTease, likeNum, teaseNum int64, err error, errMsg string) {
 	//user.UserID
 	defer func() {
 		if err != nil {
@@ -33,7 +33,7 @@ func SetLikeOrTease(userId uint64, communityQuestionId uint32, opType, enable, s
 	//}
 
 	//查询用户对问答的点赞/吐槽状态
-	ybCommunityQuestionLikeTease, err = yb_community_question_like_tease.GetByUserIdAndCommunityQuestionId(userId, communityQuestionId)
+	ybCommunityQuestionLikeTease, err = yb_community_question_like_tease.GetByUserIdAndCommunityQuestionId(userId, communityQuestionId, source)
 	if err != nil {
 		errMsg = "查询点赞/吐槽记录出错"
 		return
@@ -50,6 +50,7 @@ func SetLikeOrTease(userId uint64, communityQuestionId uint32, opType, enable, s
 			ModifyTime:          now,
 			CommunityQuestionID: communityQuestionId,
 			SourceAgent:         sourceAgent,
+			Source:              source,
 		}
 		err = ybCommunityQuestionLikeTease.Create()
 		if err != nil {
@@ -70,12 +71,12 @@ func SetLikeOrTease(userId uint64, communityQuestionId uint32, opType, enable, s
 		}
 	}
 	//查询总的点赞数
-	likeNum, err = yb_community_question_like_tease.GetLikeNumByCommunityQuestionId(communityQuestionId)
+	likeNum, err = yb_community_question_like_tease.GetLikeNumByCommunityQuestionId(communityQuestionId, int(source))
 	if err != nil {
 		errMsg = err.Error()
 		err = errors.New("查询点赞数出错")
 	}
-	teaseNum, err = yb_community_question_like_tease.GetTeaseNumByCommunityQuestionId(communityQuestionId)
+	teaseNum, err = yb_community_question_like_tease.GetTeaseNumByCommunityQuestionId(communityQuestionId, int(source))
 	if err != nil {
 		errMsg = err.Error()
 		err = errors.New("查询吐槽数出错")
@@ -96,7 +97,7 @@ func HandleLikeOrTeaseByCommunityQuestionItemList(userId uint64, questionList []
 
 	// 获取点赞和吐槽数据
 	ybCommunityQuestionLikeTeaseMap := make(map[uint32]*yb_community_question_like_tease.YbCommunityQuestionLikeTease)
-	ybCommunityQuestionLikeTeaseList, err := yb_community_question_like_tease.GetByUserIdAndCommunityQuestionIds(userId, idArr)
+	ybCommunityQuestionLikeTeaseList, err := yb_community_question_like_tease.GetByUserIdAndCommunityQuestionIds(userId, idArr, yb_community_question_like_tease.SourceQuestion)
 	if err != nil {
 		return
 	}
@@ -108,7 +109,7 @@ func HandleLikeOrTeaseByCommunityQuestionItemList(userId uint64, questionList []
 	likeMap := make(map[uint32]int)
 	teaseMap := make(map[uint32]int)
 
-	likeList, err := yb_community_question_like_tease.GetLikeNumCommentByCommunityQuestionIds(idArr)
+	likeList, err := yb_community_question_like_tease.GetLikeNumCommentByCommunityQuestionIds(idArr, yb_community_question_like_tease.SourceQuestion)
 	if err != nil {
 		return
 	}
@@ -116,7 +117,7 @@ func HandleLikeOrTeaseByCommunityQuestionItemList(userId uint64, questionList []
 		likeMap[v.CommunityQuestionID] = v.Total
 	}
 
-	teaseList, err := yb_community_question_like_tease.GetTeaseNumCommentByCommunityQuestionIds(idArr)
+	teaseList, err := yb_community_question_like_tease.GetTeaseNumCommentByCommunityQuestionIds(idArr, yb_community_question_like_tease.SourceQuestion)
 	if err != nil {
 		return
 	}

models/request/community.go

@@ -55,12 +55,26 @@ type VideoPlayLogReq struct {
 	SourceAgent int `json:"source_agent" description:"来源：1-小程序 2-小程序PC 3-公众号 4-Web官网"`
 }
 
+type RoadVideoPlayLogReq struct {
+	VideoId     int `json:"video_id" description:"视频ID"`
+	SourceAgent int `json:"source_agent" description:"来源：1-小程序 2-小程序PC 3-公众号 4-Web官网"`
+}
+
+type RoadVideoListReq struct {
+	PageIndex         int    `json:"page_index" form:"page_index"`
+	PageSize          int    `json:"page_size" form:"page_size"`
+	Keywords          string `json:"keywords" form:"keywords"`
+	VideoId           int    `json:"video_id" form:"video_id"`
+	ChartPermissionId int    `json:"chart_permission_id" form:"chart_permission_id"`
+}
+
 // ReqCommunityQuestionLikeTease 问答点赞/吐槽请求
 type ReqCommunityQuestionLikeTease struct {
 	CommunityQuestionId uint32 `description:"问答id" json:"community_question_id" `
 	OpType              int8   `description:"类型. 1-点赞 2-吐槽" json:"op_type"`
 	Enable              int8   `description:"状态. 0-无效数据（已取消点赞/吐槽） 1-有效数据（点赞/吐槽）" json:"enable"`
 	SourceAgent         int8   `description:"点赞入口来源，1：小程序，2：小程序pc" json:"source_agent"`
+	Source              int8   `description:"来源：1-问答社区; 2-视频社区"`
 }
 
 // ReqComment 问答新增评论请求
@@ -69,6 +83,7 @@ type ReqComment struct {
 	Content             string `description:"留言内容" json:"content"`
 	IsShowName          int8   `description:"是否匿名 0-匿名，1-不匿名" json:"is_show_name"`
 	SourceAgent         int8   `description:"留言入口来源，1：小程序，2：pc" json:"source_agent"`
+	Source              int8   `description:"来源：1-问答社区; 2-视频社区"`
 }
 
 // ReqDel 删除评论

models/response/community.go

@@ -74,20 +74,46 @@ type ResearchGroupMember struct {
 
 // CommunityVideoItem 视频社区
 type CommunityVideoItem struct {
-	CommunityVideoID    int    `json:"community_video_id"`
+	CommunityVideoID    int                                 `json:"community_video_id"`
+	Title               string                              `json:"title"`
+	VarietyTagId        int                                 `json:"variety_tag_id"`
+	VarietyTagName      string                              `json:"variety_tag_name"`
+	CoverImgUrl         string                              `json:"cover_img_url"`
+	VideoUrl            string                              `json:"video_url"`
+	VideoSeconds        string                              `json:"video_seconds"`
+	PublishState        int                                 `json:"publish_state"`
+	PublishTime         string                              `json:"publish_time"`
+	CreateTime          string                              `json:"create_time"`
+	ModifyTime          string                              `json:"modify_time"`
+	ChartPermissionName string                              `json:"chart_permission_name"`
+	OpType              int8                                `description:"类型. 1-点赞 2-吐槽" json:"op_type"`
+	LikeTotal           int                                 `json:"like_total" description:"点赞数"`
+	TeaseTotal          int                                 `json:"tease_total" description:"吐槽数"`
+	CommentTotal        int                                 `json:"comment_total" description:"总共评论数"`
+	CommentList         []*CommunityQuestionCommentListItem `json:"comment_list"`
+}
+
+// RoadVideoItem 线上路演
+type RoadVideoItem struct {
+	RoadVideoID         int    `json:"road_video_id"`
 	Title               string `json:"title"`
-	VarietyTagId        int    `json:"variety_tag_id"`
-	VarietyTagName      string `json:"variety_tag_name"`
+	ChartPermissionIds  string `json:"chart_permission_ids"`
+	ChartPermissionName string `json:"chart_permission_name"`
 	CoverImgUrl         string `json:"cover_img_url"`
 	VideoUrl            string `json:"video_url"`
 	VideoSeconds        string `json:"video_seconds"`
 	PublishState        int    `json:"publish_state"`
+	AdminId             int    `json:"admin_id"`
+	AdminRealName       string `json:"admin_real_name"`
 	PublishTime         string `json:"publish_time"`
 	CreateTime          string `json:"create_time"`
 	ModifyTime          string `json:"modify_time"`
-	ChartPermissionName string `json:"chart_permission_name"`
 }
 
+type RoadVideoItemResp struct {
+	List []*RoadVideoItem `json:"list"`
+	Paging *PagingItem  	`json:"paging"`
+}
 // RespCommunityQuestionLikeTease
 type RespCommunityQuestionLikeTease struct {
 	LikeTotal  int64 `description:"点赞总数" json:"like_total"`
@@ -127,7 +153,7 @@ type RespCommunityQuestionCommentList struct {
 
 // CommunityQuestionCommentListItem 问答列表评论列表
 type CommunityQuestionCommentListItem struct {
-	QaAvatarUrl     string `description:"用户头像" json:"qa_avatar_url"`
-	Comment         string `description:"评论" json:"comment"`
+	QaAvatarUrl string `description:"用户头像" json:"qa_avatar_url"`
+	Comment     string `description:"评论" json:"comment"`
 	//CommentUserName string `description:"评论人" json:"comment_user_name"`
 }

models/response/permission.go

@@ -32,6 +32,9 @@ type PermissionFiccResp struct {
 	ContactInfo    PermissionCheckContactInfo `json:"contact_info"`
 	CheckFlag      bool                       `json:"check_flag"`
 }
+
+
+
 type PermissionFiccList []*PermissionFiccItem
 
 func (p PermissionFiccList) Len() int {
@@ -60,6 +63,7 @@ func (ps PermissionFiccSecondList) Swap(i, j int) {
 	ps[i], ps[j] = ps[j], ps[i]
 }
 
+
 // PermissionCheckInfo 权限校验完成后的结果
 type PermissionCheckInfo struct {
 	Name         string       `json:"name" description:"销售名称"`
@@ -84,3 +88,20 @@ type CustomerInfo struct {
 	IsSuspend   int8   `json:"is_suspend" description:"启用与否字段：1:暂停,0:启用"`
 	HasApply    bool   `json:"has_apply" description:"是否有申请过"`
 }
+
+
+type BindPermissionFiccResp struct {
+	PermissionList []*BindPermissionFiccItem `json:"permission_list"`
+}
+
+type BindPermissionFiccItem struct {
+	Id           int                             `json:"id"`
+	ClassifyName string                          `json:"classify_name"`
+	List         []*BindPermissionFiccSecondItem `json:"list"`
+}
+
+
+type BindPermissionFiccSecondItem struct {
+	ChartPermissionName string `json:"chart_permission_name"`
+	ChartPermissionID   int    `json:"chart_permission_id"`
+}

models/tables/chart_permission/query.go

@@ -17,6 +17,13 @@ func GetFiccListExceptTacticByProductId() (list []*ChartPermission, err error)
 	err = global.DEFAULT_MYSQL.Where(" enabled = 1 AND permission_type = 0 AND product_id = 1 and classify_name != '市场策略'").Find(&list).Error
 	return
 }
+
+// GetFiccListExceptTacticByProductIdOrderSort 获取ficc 除了市场策略的所有权限
+func GetFiccListExceptTacticByProductIdOrderSort() (list []*ChartPermission, err error)  {
+	err = global.DEFAULT_MYSQL.Where(" enabled = 1 AND permission_type = 0 AND product_id = 1 and classify_name != '市场策略'").
+	Order("sort asc").Find(&list).Error
+	return
+}
 // GetClassNameListByProductId 根据权限id获取权限分类
 func GetClassNameListByProductId(productId int64) (list []*ChartPermission, err error) {
 	err = global.DEFAULT_MYSQL.Where(" product_id = ?", productId).Group("classify_name").Find(&list).Error

models/tables/chart_permission_first/query.go

@@ -10,3 +10,8 @@ func GetIndexShowList() (list []*ChartPermissionFirst, err error) {
 	return
 }
 
+// GetIndexShowListOrderSort 查询首页展示的权限一级分类
+func GetIndexShowListOrderSort() (list []*ChartPermissionFirst, err error) {
+	err = global.DEFAULT_MYSQL.Model(ChartPermissionFirst{}).Where("yb_index_show = 1").Order("yb_index_sort asc").Scan(&list).Error
+	return
+}

models/tables/edb_data/query.go

@@ -75,6 +75,8 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_predict_calculate_tcz"
 	case utils.DATA_SOURCE_MYSTEEL_CHEMICAL:
 		tableName = "edb_data_mysteel_chemical"
+	case utils.DATA_SOURCE_CALCULATE_CJJX:
+		tableName = "edb_data_calculate_cjjx"
 	default:
 		tableName = ""
 	}

models/tables/predict_edb_conf/predict_edb_info.go

@@ -6,12 +6,15 @@ import (
 
 // PredictEdbConf 预测指标规则配置表
 type PredictEdbConf struct {
-	PredictEdbInfoID uint64    `gorm:"primaryKey;column:predict_edb_info_id;type:bigint(9) unsigned;not null;default:0" json:"-"` // 预测指标id
-	SourceEdbInfoID  uint64    `gorm:"column:source_edb_info_id;type:bigint(9) unsigned;default:0" json:"sourceEdbInfoId"`        // 来源指标id
-	RuleType         uint8     `gorm:"column:rule_type;type:tinyint(9) unsigned;default:1" json:"ruleType"`                       // 预测规则，1：最新，2：固定值
-	FixedValue       float64   `gorm:"column:fixed_value;type:decimal(38,4)" json:"fixedValue"`                                   // 固定值
-	ModifyTime       time.Time `gorm:"column:modify_time;type:datetime;default:CURRENT_TIMESTAMP" json:"modifyTime"`              // 修改时间
-	CreateTime       time.Time `gorm:"column:create_time;type:datetime" json:"createTime"`                                        // 添加时间
+	ConfigID         uint64    `gorm:"primaryKey;column:config_id;type:bigint(9) unsigned;not null" json:"-"`                         // 规则id
+	PredictEdbInfoID uint64    `gorm:"column:predict_edb_info_id;type:bigint(9) unsigned;not null;default:0" json:"predictEdbInfoId"` // 预测指标id
+	SourceEdbInfoID  uint64    `gorm:"column:source_edb_info_id;type:bigint(9) unsigned;default:0" json:"sourceEdbInfoId"`            // 来源指标id
+	RuleType         uint8     `gorm:"column:rule_type;type:tinyint(9) unsigned;default:1" json:"ruleType"`                           // 预测规则，1：最新，2：固定值
+	FixedValue       float64   `gorm:"column:fixed_value;type:decimal(38,4)" json:"fixedValue"`                                       // 固定值
+	Value            string    `gorm:"column:value;type:varchar(255);default:''" json:"value"`                                        // 配置的值
+	EndDate          time.Time `gorm:"column:end_date;type:date" json:"endDate"`                                                      // 截止日期
+	ModifyTime       time.Time `gorm:"column:modify_time;type:datetime;default:CURRENT_TIMESTAMP" json:"modifyTime"`                  // 修改时间
+	CreateTime       time.Time `gorm:"column:create_time;type:datetime" json:"createTime"`                                            // 添加时间
 }
 
 // TableName get sql table name.获取数据库表名
@@ -21,17 +24,23 @@ func (m *PredictEdbConf) TableName() string {
 
 // PredictEdbConfColumns get sql column name.获取数据库列名
 var PredictEdbConfColumns = struct {
+	ConfigID         string
 	PredictEdbInfoID string
 	SourceEdbInfoID  string
 	RuleType         string
 	FixedValue       string
+	Value            string
+	EndDate          string
 	ModifyTime       string
 	CreateTime       string
 }{
+	ConfigID:         "config_id",
 	PredictEdbInfoID: "predict_edb_info_id",
 	SourceEdbInfoID:  "source_edb_info_id",
 	RuleType:         "rule_type",
 	FixedValue:       "fixed_value",
+	Value:            "value",
+	EndDate:          "end_date",
 	ModifyTime:       "modify_time",
 	CreateTime:       "create_time",
 }

models/tables/predict_edb_conf/query.go

@@ -7,3 +7,9 @@ func GetPredictEdbConfById(edbInfoId int) (item *PredictEdbConf, err error) {
 	err = global.MYSQL["data"].Where("predict_edb_info_id = ? ", edbInfoId).First(&item).Error
 	return
 }
+
+// GetPredictEdbConfListById 根据预测指标id获取预测指标配置信息列表
+func GetPredictEdbConfListById(edbInfoId int) (items []*PredictEdbConf, err error) {
+	err = global.MYSQL["data"].Where("predict_edb_info_id = ? ", edbInfoId).Order("config_id asc").Find(&items).Error
+	return
+}

models/tables/yb_community_question_comment/query.go

@@ -15,9 +15,9 @@ func GetByCommunityQuestionCommentId(communityQuestionCommentId uint64) (item *Y
 }
 
 // GetListByUserIdCommunityQuestionID 获取用户的留言列表
-func GetListByUserIdCommunityQuestionID(userId uint64, communityQuestionID int) (list []*YbCommunityQuestionComment, err error) {
+func GetListByUserIdCommunityQuestionID(userId uint64, communityQuestionID, source int) (list []*YbCommunityQuestionComment, err error) {
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionComment{}).
-		Where("user_id = ? AND community_question_id = ? AND enabled = 1 ", userId, communityQuestionID).
+		Where("user_id = ? AND community_question_id = ? AND enabled = 1 AND source = ?", userId, communityQuestionID, source).
 		Order("create_time desc, community_question_comment_id desc").
 		Scan(&list).Error
 	if err == utils.ErrNoRow {
@@ -27,17 +27,17 @@ func GetListByUserIdCommunityQuestionID(userId uint64, communityQuestionID int)
 }
 
 // GetListTotalByUserIdCommunityQuestionID 获取用户的留言总条数
-func GetListTotalByUserIdCommunityQuestionID(userId uint64, communityQuestionID int) (total int64, err error) {
+func GetListTotalByUserIdCommunityQuestionID(userId uint64, communityQuestionID, source int) (total int64, err error) {
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionComment{}).
-		Where("user_id = ? AND community_question_id = ? AND enabled = 1 ", userId, communityQuestionID).
+		Where("user_id = ? AND community_question_id = ? AND enabled = 1 AND source = ?", userId, communityQuestionID, source).
 		Count(&total).Error
 	return
 }
 
 // GetHotListByCommunityQuestionID 获取报告的精选留言列表(2022-08-23修改为获取所有留言, 不再精选)
-func GetHotListByCommunityQuestionID(communityQuestionID int, offset, limit int) (list []*YbCommunityQuestionComment, err error) {
+func GetHotListByCommunityQuestionID(communityQuestionID int, offset, limit, source int) (list []*YbCommunityQuestionComment, err error) {
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionComment{}).
-		Where("community_question_id = ? AND enabled = 1 AND type = 1", communityQuestionID).
+		Where("community_question_id = ? AND enabled = 1 AND type = 1 AND source = ?", communityQuestionID, source).
 		//Order("is_top desc, hot_top_time desc, community_question_comment_id desc").
 		Order("create_time DESC").
 		Offset(offset).
@@ -47,9 +47,9 @@ func GetHotListByCommunityQuestionID(communityQuestionID int, offset, limit int)
 }
 
 // GetHotListTotalByCommunityQuestionID 获取精选留言总条数(2022-08-23修改为获取所有留言, 不再精选)
-func GetHotListTotalByCommunityQuestionID(communityQuestionID int) (total int64, err error) {
+func GetHotListTotalByCommunityQuestionID(communityQuestionID, source int) (total int64, err error) {
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionComment{}).
-		Where("community_question_id = ? AND enabled = 1 AND type = 1", communityQuestionID).
+		Where("community_question_id = ? AND enabled = 1 AND type = 1 AND source = ?", communityQuestionID, source).
 		Count(&total).Error
 	return
 }
@@ -130,9 +130,9 @@ func GetUserAvatarRandom() (item *UserAvatarRandom, err error) {
 }
 
 // GetHotListByCommunityQuestionIds 根据问答id列表获取精选留言-精选时间倒序(2022-0823不再精选，获取所有评论)
-func GetHotListByCommunityQuestionIds(communityQuestionIds []uint32) (items []*YbCommunityQuestionComment, err error) {
+func GetHotListByCommunityQuestionIds(communityQuestionIds []uint32, source int) (items []*YbCommunityQuestionComment, err error) {
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionComment{}).
-		Where("community_question_id IN (?) AND enabled = 1 AND type = 1", communityQuestionIds).
+		Where("community_question_id IN (?) AND enabled = 1 AND type = 1 AND source = ?", communityQuestionIds, source).
 		Order("hot_time DESC").
 		Find(&items).Error
 	return

models/tables/yb_community_question_comment/yb_community_question_comment.go

@@ -7,23 +7,24 @@ import (
 // YbCommunityQuestionComment 研报问答社区 用户留言表
 type YbCommunityQuestionComment struct {
 	CommunityQuestionCommentID uint64    `gorm:"primaryKey;column:community_question_comment_id;type:bigint(20) unsigned;not null" json:"-"`
-	CommunityQuestionID        uint32    `gorm:"column:community_question_id;type:int(10) unsigned;not null;default:0" json:"communityQuestionId"` // 问答ID
-	UserID                     uint64    `gorm:"column:user_id;type:bigint(20) unsigned;not null;default:0" json:"userId"`                         // 用户id
-	RealName                   string    `gorm:"column:real_name;type:varchar(255);not null;default:''" json:"realName"`                           // 用户当时昵称
-	Content                    string    `gorm:"column:content;type:text" json:"content"`                                                          // 留言内容
-	ReplyCommentID             uint64    `gorm:"column:reply_comment_id;type:bigint(20) unsigned;not null;default:0" json:"replyCommentId"`        // 回复的留言ID
-	IsTop                      int8      `gorm:"column:is_top;type:tinyint(2);not null;default:0" json:"isTop"`                                    // 是否置顶（0-未置顶，1-置顶）
-	IsHot                      int8      `gorm:"column:is_hot;type:tinyint(2);not null;default:0" json:"isHot"`                                    // 是否设置精选（0-未设置，1-已设置）
-	HotTopTime                 time.Time `gorm:"column:hot_top_time;type:datetime" json:"hotTopTime"`                                              // 设置精选或者设置置顶的时间
-	Type                       int8      `gorm:"column:type;type:tinyint(1);not null;default:1" json:"type"`                                       // 留言类型 1-评论 2-回复
-	Enabled                    int8      `gorm:"column:enabled;type:tinyint(1);not null;default:1" json:"enabled"`                                 // 是否有效, 0-无效留言 1-有效留言
-	IsShowName                 int8      `gorm:"column:is_show_name;type:tinyint(1);not null;default:0" json:"isShowName"`                         // 是否匿名 0-匿名，1-不匿名
-	SourceAgent                int8      `gorm:"column:source_agent;type:tinyint(1);not null;default:1" json:"sourceAgent"`                        // 留言入口来源，1：小程序，2：小程序pc, 4：web pc
-	TopTime                    time.Time `gorm:"column:top_time;type:datetime" json:"topTime"`                                                     // 设置置顶的时间
-	HotTime                    time.Time `gorm:"column:hot_time;type:datetime" json:"hotTime"`                                                     // 设置精选的时间
-	ModifyTime                 time.Time `gorm:"column:modify_time;type:datetime;not null;default:CURRENT_TIMESTAMP" json:"modifyTime"`            // 修改时间
-	CreateTime                 time.Time `gorm:"column:create_time;type:datetime;not null;default:CURRENT_TIMESTAMP" json:"createTime"`            // 创建时间
-	QaAvatarUrl                string    `gorm:"column:qa_avatar_url;type:varchar(255)" json:"qaAvatarUrl"`                                        // 头像
+	CommunityQuestionID        uint32    `gorm:"index:idx_community_question_id;column:community_question_id;type:int(10) unsigned;not null;default:0" json:"communityQuestionId"` // 问答ID
+	UserID                     uint64    `gorm:"index:idx_user_id;column:user_id;type:bigint(20) unsigned;not null;default:0" json:"userId"`                                       // 用户id
+	RealName                   string    `gorm:"column:real_name;type:varchar(255);not null;default:''" json:"realName"`                                                           // 用户当时昵称
+	Content                    string    `gorm:"column:content;type:text" json:"content"`                                                                                          // 留言内容
+	ReplyCommentID             uint64    `gorm:"column:reply_comment_id;type:bigint(20) unsigned;not null;default:0" json:"replyCommentId"`                                        // 回复的留言ID
+	IsTop                      int8      `gorm:"column:is_top;type:tinyint(2);not null;default:0" json:"isTop"`                                                                    // 是否置顶（0-未置顶，1-置顶）
+	IsHot                      int8      `gorm:"column:is_hot;type:tinyint(2);not null;default:0" json:"isHot"`                                                                    // 是否设置精选（0-未设置，1-已设置）
+	HotTopTime                 time.Time `gorm:"column:hot_top_time;type:datetime" json:"hotTopTime"`                                                                              // 设置精选或者设置置顶的时间
+	Type                       int8      `gorm:"column:type;type:tinyint(1);not null;default:1" json:"type"`                                                                       // 留言类型 1-评论 2-回复
+	Enabled                    int8      `gorm:"column:enabled;type:tinyint(1);not null;default:1" json:"enabled"`                                                                 // 是否有效, 0-无效留言 1-有效留言
+	IsShowName                 int8      `gorm:"column:is_show_name;type:tinyint(1);not null;default:0" json:"isShowName"`                                                         // 是否匿名 0-匿名，1-不匿名
+	SourceAgent                int8      `gorm:"column:source_agent;type:tinyint(1);not null;default:1" json:"sourceAgent"`                                                        // 留言入口来源，1：小程序，2：小程序pc, 4：web pc
+	TopTime                    time.Time `gorm:"column:top_time;type:datetime" json:"topTime"`                                                                                     // 设置置顶的时间
+	HotTime                    time.Time `gorm:"column:hot_time;type:datetime" json:"hotTime"`                                                                                     // 设置精选的时间
+	ModifyTime                 time.Time `gorm:"column:modify_time;type:datetime;not null;default:CURRENT_TIMESTAMP" json:"modifyTime"`                                            // 修改时间
+	CreateTime                 time.Time `gorm:"column:create_time;type:datetime;not null;default:CURRENT_TIMESTAMP" json:"createTime"`                                            // 创建时间
+	QaAvatarUrl                string    `gorm:"column:qa_avatar_url;type:varchar(255);default:''" json:"QaAvatarUrl"`                                                             // 头像
+	Source                     int8      `gorm:"column:source;type:tinyint(4);not null;default:1" json:"source"`                                                                   // 来源：1-问答社区(默认); 2-视频社区
 }
 
 // TableName get sql table name.获取数据库表名
@@ -50,6 +51,8 @@ var YbCommunityQuestionCommentColumns = struct {
 	HotTime                    string
 	ModifyTime                 string
 	CreateTime                 string
+	QaAvatarUrl                string
+	Source                     string
 }{
 	CommunityQuestionCommentID: "community_question_comment_id",
 	CommunityQuestionID:        "community_question_id",
@@ -68,4 +71,11 @@ var YbCommunityQuestionCommentColumns = struct {
 	HotTime:                    "hot_time",
 	ModifyTime:                 "modify_time",
 	CreateTime:                 "create_time",
+	QaAvatarUrl:                "qa_avatar_url",
+	Source:                     "source",
 }
+
+const (
+	SourceQuestion = iota + 1 // 问答社区->1
+	SourceVideo               // 视频社区->2
+)

models/tables/yb_community_question_like_tease/query.go

@@ -6,9 +6,9 @@ import (
 )
 
 // GetByUserIdAndCommunityQuestionId 根据用户和问答id获取点赞/吐槽记录
-func GetByUserIdAndCommunityQuestionId(userId uint64, communityQuestionId uint32) (item *YbCommunityQuestionLikeTease, err error) {
+func GetByUserIdAndCommunityQuestionId(userId uint64, communityQuestionId uint32, source int8) (item *YbCommunityQuestionLikeTease, err error) {
 	err = global.DEFAULT_MYSQL.
-		Where("user_id = ? AND community_question_id = ?", userId, communityQuestionId).
+		Where("user_id = ? AND community_question_id = ? AND source = ?", userId, communityQuestionId, source).
 		First(&item).Error
 	if err == utils.ErrNoRow {
 		err = nil
@@ -17,17 +17,17 @@ func GetByUserIdAndCommunityQuestionId(userId uint64, communityQuestionId uint32
 }
 
 // GetLikeNumByCommunityQuestionId 获取某个问答的点赞数
-func GetLikeNumByCommunityQuestionId(communityQuestionId uint32) (num int64, err error) {
+func GetLikeNumByCommunityQuestionId(communityQuestionId uint32, source int) (num int64, err error) {
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionLikeTease{}).
-		Where(" community_question_id = ? AND enabled=1 AND op_type = 1 ", communityQuestionId).
+		Where(" community_question_id = ? AND enabled=1 AND op_type = 1 AND source = ?", communityQuestionId, source).
 		Count(&num).Error
 	return
 }
 
 // GetTeaseNumByCommunityQuestionId 获取某个问答的吐槽数
-func GetTeaseNumByCommunityQuestionId(communityQuestionId uint32) (num int64, err error) {
+func GetTeaseNumByCommunityQuestionId(communityQuestionId uint32, source int) (num int64, err error) {
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionLikeTease{}).
-		Where(" community_question_id = ? AND enabled=1 AND op_type = 2 ", communityQuestionId).
+		Where(" community_question_id = ? AND enabled=1 AND op_type = 2 AND source = ?", communityQuestionId, source).
 		Count(&num).Error
 	return
 }
@@ -39,34 +39,36 @@ type NumCommentByCommunityQuestionIds struct {
 }
 
 // GetLikeNumCommentByCommunityQuestionIds 根据问答id列表获取所有问答的点赞数
-func GetLikeNumCommentByCommunityQuestionIds(communityQuestionIds []uint32) (items []*NumCommentByCommunityQuestionIds, err error) {
+func GetLikeNumCommentByCommunityQuestionIds(communityQuestionIds []uint32, source int) (items []*NumCommentByCommunityQuestionIds, err error) {
 	if len(communityQuestionIds) <= 0 {
 		return
 	}
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionLikeTease{}).
 		Select("community_question_id, count(1) total").
-		Where("community_question_id in (?) AND enabled=1  AND op_type=1", communityQuestionIds).Group("community_question_id").Scan(&items).Error
+		Where("community_question_id in (?) AND enabled=1  AND op_type=1 AND source = ?", communityQuestionIds, source).
+		Group("community_question_id").Scan(&items).Error
 	return
 }
 
 // GetTeaseNumCommentByCommunityQuestionIds 根据问答id列表获取所有问答的吐槽数
-func GetTeaseNumCommentByCommunityQuestionIds(communityQuestionIds []uint32) (items []*NumCommentByCommunityQuestionIds, err error) {
+func GetTeaseNumCommentByCommunityQuestionIds(communityQuestionIds []uint32, source int) (items []*NumCommentByCommunityQuestionIds, err error) {
 	if len(communityQuestionIds) <= 0 {
 		return
 	}
 	err = global.DEFAULT_MYSQL.Model(YbCommunityQuestionLikeTease{}).
 		Select("community_question_id, count(1) total").
-		Where("community_question_id in (?) AND enabled=1  AND op_type=2", communityQuestionIds).Group("community_question_id").Scan(&items).Error
+		Where("community_question_id in (?) AND enabled=1  AND op_type=2 AND source = ?", communityQuestionIds, source).
+		Group("community_question_id").Scan(&items).Error
 	return
 }
 
 // GetByUserIdAndCommunityQuestionIds 根据用户id和问答id列表获取成功点赞/吐槽记录
-func GetByUserIdAndCommunityQuestionIds(userId uint64, communityQuestionIds []uint32) (items []*YbCommunityQuestionLikeTease, err error) {
+func GetByUserIdAndCommunityQuestionIds(userId uint64, communityQuestionIds []uint32, source int) (items []*YbCommunityQuestionLikeTease, err error) {
 	if len(communityQuestionIds) <= 0 {
 		return
 	}
 	err = global.DEFAULT_MYSQL.
-		Where("user_id = ? AND enabled=1  AND community_question_id in (?)", userId, communityQuestionIds).Group("community_question_id").
+		Where("user_id = ? AND enabled=1 AND source = ? AND community_question_id in (?)", userId, source, communityQuestionIds).Group("community_question_id").
 		Find(&items).Error
 	return
 }

models/tables/yb_community_question_like_tease/yb_community_question_like_tease.go

@@ -6,14 +6,15 @@ import (
 
 // YbCommunityQuestionLikeTease 问答点赞/吐槽表
 type YbCommunityQuestionLikeTease struct {
-	CommunityQuestionLikeTeaseID uint64    `gorm:"primaryKey;column:community_question_like_tease_id;type:bigint(20) unsigned;not null" json:"-"`    // 点赞/吐槽自增id
-	UserID                       uint64    `gorm:"column:user_id;type:bigint(20) unsigned;not null;default:0" json:"userId"`                         // 用户id
-	OpType                       int8      `gorm:"column:op_type;type:tinyint(1);not null;default:1" json:"opType"`                                  // 类型. 1-点赞 2-吐槽
-	Enabled                      int8      `gorm:"column:enabled;type:tinyint(1);not null;default:1" json:"enabled"`                                 // 状态. 0-无效数据（已取消点赞/吐槽） 1-有效数据（点赞/吐槽）
-	CreateTime                   time.Time `gorm:"column:create_time;type:datetime;not null;default:CURRENT_TIMESTAMP" json:"createTime"`            // 创建时间
-	ModifyTime                   time.Time `gorm:"column:modify_time;type:datetime;not null;default:CURRENT_TIMESTAMP" json:"modifyTime"`            // 修改时间
-	CommunityQuestionID          uint32    `gorm:"column:community_question_id;type:int(10) unsigned;not null;default:0" json:"communityQuestionId"` // 问答ID
-	SourceAgent                  int8      `gorm:"column:source_agent;type:tinyint(1);not null;default:0" json:"sourceAgent"`                        // 点赞/吐槽入口来源，1：小程序，2：小程序pc, 4：web pc
+	CommunityQuestionLikeTeaseID uint64    `gorm:"primaryKey;column:community_question_like_tease_id;type:bigint(20) unsigned;not null" json:"-"`                                    // 点赞/吐槽自增id
+	UserID                       uint64    `gorm:"index:idx_user_id;column:user_id;type:bigint(20) unsigned;not null;default:0" json:"userId"`                                       // 用户id
+	OpType                       int8      `gorm:"column:op_type;type:tinyint(1);not null;default:1" json:"opType"`                                                                  // 类型. 1-点赞 2-吐槽
+	Enabled                      int8      `gorm:"column:enabled;type:tinyint(1);not null;default:1" json:"enabled"`                                                                 // 状态. 0-无效数据（已取消点赞/吐槽） 1-有效数据（点赞/吐槽）
+	CreateTime                   time.Time `gorm:"column:create_time;type:datetime;not null;default:CURRENT_TIMESTAMP" json:"createTime"`                                            // 创建时间
+	ModifyTime                   time.Time `gorm:"column:modify_time;type:datetime;not null;default:CURRENT_TIMESTAMP" json:"modifyTime"`                                            // 修改时间
+	CommunityQuestionID          uint32    `gorm:"index:idx_community_question_id;column:community_question_id;type:int(10) unsigned;not null;default:0" json:"communityQuestionId"` // 问答ID
+	SourceAgent                  int8      `gorm:"column:source_agent;type:tinyint(1);not null;default:0" json:"sourceAgent"`                                                        // 点赞/吐槽入口来源，1：小程序，2：小程序pc, 4：web pc
+	Source                       int8      `gorm:"column:source;type:tinyint(4);not null;default:1" json:"source"`                                                                   // 来源：1-问答社区(默认); 2-视频社区
 }
 
 // TableName get sql table name.获取数据库表名
@@ -31,6 +32,7 @@ var YbCommunityQuestionLikeTeaseColumns = struct {
 	ModifyTime                   string
 	CommunityQuestionID          string
 	SourceAgent                  string
+	Source                       string
 }{
 	CommunityQuestionLikeTeaseID: "community_question_like_tease_id",
 	UserID:                       "user_id",
@@ -40,4 +42,10 @@ var YbCommunityQuestionLikeTeaseColumns = struct {
 	ModifyTime:                   "modify_time",
 	CommunityQuestionID:          "community_question_id",
 	SourceAgent:                  "source_agent",
+	Source:                       "source",
 }
+
+const (
+	SourceQuestion = iota + 1 // 问答社区->1
+	SourceVideo               // 视频社区->2
+)

models/tables/yb_community_video_play_log/entity.go

@@ -15,6 +15,7 @@ type YbCommunityVideoPlayLog struct {
 	CompanyStatus    string    `gorm:"column:company_status;type:varchar(30);not null;default:''" json:"companyStatus"`                               // 客户状态
 	SourceAgent      int       `gorm:"column:source_agent;type:tinyint(4) unsigned;not null;default:1" json:"sourceAgent"`                            // 操作来源，1：小程序，2：小程序 pc 3:弘则研究公众号，4:web pc
 	SellerID         int       `gorm:"column:seller_id;type:int(11)" json:"sellerId"`
+	Type             int8      `gorm:"column:type;type:tinyint(4); unsigned;not null;default:1" json:"type"`         //统计类型（1 视频社区，2 路演视频）
 	CreateTime       time.Time `gorm:"column:create_time;type:datetime;default:CURRENT_TIMESTAMP" json:"createTime"` // 创建时间
 }
 

models/tables/yb_road_video/entity.go

@@ -0,0 +1,61 @@
+package yb_road_video
+
+import "time"
+
+// YbRoadVideo 研报-路演视频（线上路演）表
+type YbRoadVideo struct {
+	RoadVideoID        int       `gorm:"primaryKey;column:road_video_id;type:int(10) unsigned;not null" json:"-"`
+	Title              string    `gorm:"column:title;type:varchar(255);not null;default:''" json:"title"`                             // 视频标题
+	ChartPermissionIds string    `gorm:"column:chart_permission_ids;type:varchar(255);not null;default:''" json:"chartPermissionIds"` // 品种权限ID, 用英文逗号拼接
+	CoverImgURL        string    `gorm:"column:cover_img_url;type:varchar(255);not null;default:''" json:"coverImgUrl"`               // 封面图地址
+	VideoURL           string    `gorm:"column:video_url;type:varchar(255);not null;default:''" json:"videoUrl"`                      // 视频地址
+	VideoSeconds       string    `gorm:"column:video_seconds;type:varchar(30);not null;default:''" json:"videoSeconds"`               // 视频时长
+	PublishState       int       `gorm:"column:publish_state;type:tinyint(4) unsigned;not null;default:0" json:"publishState"`        // 发布状态：0-未发布 1-已发布
+	SendThsState       int       `gorm:"column:send_ths_state;type:tinyint(4) unsigned;not null;default:0" json:"sendThsState"`       // 推送客群状态：0-未推送 1-已推送
+	IsDeleted          int       `gorm:"column:is_deleted;type:tinyint(4) unsigned;not null;default:0" json:"isDeleted"`              // 是否已删除：0-未删除 1-已删除
+	AdminId            int       `gorm:"column:admin_id;type:int(11) unsigned;not null;default:0" json:"adminId"`                     // 创建人账号
+	AdminRealName      string    `gorm:"column:admin_real_name;type:varchar(50)" json:"adminRealName"`                                // 创建人姓名
+	PublishTime        time.Time `gorm:"column:publish_time;type:datetime" json:"publishTime"`                                        // 发布时间
+	SendThsTime        time.Time `gorm:"column:send_ths_time;type:datetime" json:"sendThsTime"`                                       // 推送客群时间
+	CreateTime         time.Time `gorm:"column:create_time;type:datetime;default:CURRENT_TIMESTAMP" json:"createTime"`                // 创建时间
+	ModifyTime         time.Time `gorm:"column:modify_time;type:datetime;default:CURRENT_TIMESTAMP" json:"modifyTime"`                // 更新时间
+	DeleteTime         time.Time `gorm:"column:delete_time;type:datetime" json:"deleteTime"`
+}
+
+// TableName get sql table name.获取数据库表名
+func (r *YbRoadVideo) TableName() string {
+	return "yb_road_video"
+}
+
+// YbCommunityVideoColumns get sql column name.获取数据库列名
+var YbRoadVideoColumns = struct {
+	RoadVideoID string
+	Title            string
+	ChartPermissionIds     string
+	CoverImgURL      string
+	VideoURL         string
+	VideoSeconds     string
+	PublishState     string
+	SendThsState     string
+	IsDeleted        string
+	PublishTime      string
+	SendThsTime      string
+	CreateTime       string
+	ModifyTime       string
+	DeleteTime       string
+}{
+	RoadVideoID:        "road_video_id",
+	Title:              "title",
+	ChartPermissionIds: "chart_permission_ids",
+	CoverImgURL:        "cover_img_url",
+	VideoURL:           "video_url",
+	VideoSeconds:       "video_seconds",
+	PublishState:       "publish_state",
+	SendThsState:       "send_ths_state",
+	IsDeleted:          "is_deleted",
+	PublishTime:        "publish_time",
+	SendThsTime:        "send_ths_time",
+	CreateTime:         "create_time",
+	ModifyTime:         "modify_time",
+	DeleteTime:         "delete_time",
+}

models/tables/yb_road_video/model.go

@@ -0,0 +1,39 @@
+package yb_road_video
+
+import (
+	"hongze/hongze_yb/global"
+)
+
+func (r *YbRoadVideo) Create() (err error) {
+	err = global.DEFAULT_MYSQL.Create(r).Error
+	return
+}
+
+func (r *YbRoadVideo) Update(updateCols []string) (err error) {
+	err = global.DEFAULT_MYSQL.Model(r).Select(updateCols).Updates(*r).Error
+	return
+}
+
+// GetPageListByCondition 分页获取视频列表
+func GetPageListByCondition(where string, par []interface{}, pageIndex, pageSize int) (list []*YbRoadVideo, total int64, err error) {
+	offset := (pageIndex - 1) * pageSize
+	err = global.DEFAULT_MYSQL.Model(YbRoadVideo{}).
+		Where(where, par...).Count(&total).Error
+	if err != nil {
+		return
+	}
+	err = global.DEFAULT_MYSQL.Model(YbRoadVideo{}).
+		Where(where, par...).
+		Offset(offset).Limit(pageSize).
+		Order("publish_time DESC").Scan(&list).Error
+
+	return
+}
+
+// GetItemById 主键获取已发布的视频
+func GetItemById(videoId int) (item *YbRoadVideo, err error) {
+	err = global.DEFAULT_MYSQL.Model(YbRoadVideo{}).
+		Where("road_video_id = ? AND is_deleted = 0 AND publish_state = 1", videoId).
+		First(&item).Error
+	return
+}

routers/company.go

@@ -11,5 +11,6 @@ func InitCompany(r *gin.Engine) {
 	{
 		rGroup.GET("/getPermissionList", company.GetHomeFiccPermissions)
 		rGroup.GET("/permission/tree", company.GetPermissionTree)
+		rGroup.GET("/permission/bind", company.GetBindFiccPermissions)
 	}
 }

routers/road.go

@@ -0,0 +1,13 @@
+package routers
+
+import (
+	"github.com/gin-gonic/gin"
+	"hongze/hongze_yb/controller/road"
+	"hongze/hongze_yb/middleware"
+)
+
+func InitRoad(r *gin.Engine) {
+	rGroup := r.Group("api/road").Use(middleware.Token(), middleware.CheckBaseAuth())
+	rGroup.GET("/video/list", road.VideoList)
+	rGroup.POST("/video/play_log", road.VideoPlayLog)
+}

services/chart/predict_edb_info.go

@@ -2,10 +2,12 @@ package chart
 
 import (
 	"errors"
+	"github.com/shopspring/decimal"
 	edbDataModel "hongze/hongze_yb/models/tables/edb_data"
 	edbInfoModel "hongze/hongze_yb/models/tables/edb_info"
 	predictEdbConfModel "hongze/hongze_yb/models/tables/predict_edb_conf"
 	"hongze/hongze_yb/utils"
+	"strconv"
 	"time"
 )
 
@@ -56,6 +58,138 @@ func GetChartPredictEdbInfoDataList(predictEdbConf predictEdbConfModel.PredictEd
 	return
 }
 
+// GetChartPredictEdbInfoDataListByConfList 获取图表的预测指标的未来数据
+func GetChartPredictEdbInfoDataListByConfList(predictEdbConfList []*predictEdbConfModel.PredictEdbConf, filtrateStartDateStr, latestDateStr, endDateStr, frequency string, realPredictEdbInfoData []*edbDataModel.EdbDataList) (predictEdbInfoData []*edbDataModel.EdbDataList, minValue, maxValue float64, err error) {
+	endDate, err := time.ParseInLocation(utils.FormatDate, endDateStr, time.Local)
+	if err != nil {
+		return
+	}
+
+	latestDate, err := time.ParseInLocation(utils.FormatDate, latestDateStr, time.Local)
+	if err != nil {
+		return
+	}
+
+	// 开始预测数据的时间
+	startDate := latestDate
+
+	// 如果有筛选时间的话
+	if filtrateStartDateStr != `` {
+		filtrateStartDate, tmpErr := time.ParseInLocation(utils.FormatDate, filtrateStartDateStr, time.Local)
+		if tmpErr != nil {
+			err = tmpErr
+			return
+		}
+		//如果筛选时间晚于实际数据时间，那么就以筛选时间作为获取预测数据的时间
+		if filtrateStartDate.After(latestDate) {
+			startDate = filtrateStartDate.AddDate(0, 0, -1)
+		}
+	}
+
+	//var dateArr []string
+	// 对应日期的值
+	existMap := make(map[string]float64)
+	for _, v := range realPredictEdbInfoData {
+		//dateArr = append(dateArr, v.DataTime)
+		existMap[v.DataTime] = v.Value
+	}
+
+	predictEdbInfoData = make([]*edbDataModel.EdbDataList, 0)
+	//dataValue := lastDataValue
+	//预测规则，1：最新，2：固定值，3：同比，4：同差，5：环比，6：环差，7：N期移动均值，8：N期段线性外推值
+
+	for _, predictEdbConf := range predictEdbConfList {
+		dataEndTime := endDate
+		if predictEdbConf.EndDate.Before(dataEndTime) {
+			dataEndTime = predictEdbConf.EndDate
+		}
+
+		var tmpMinValue, tmpMaxValue float64 // 当前预测结果中的最大/最小值
+
+		switch predictEdbConf.RuleType {
+		case 1: //1：最新
+			var lastDataValue float64 //最新值
+			tmpAllData := make([]*edbDataModel.EdbDataList, 0)
+			tmpAllData = append(tmpAllData, realPredictEdbInfoData...)
+			tmpAllData = append(tmpAllData, predictEdbInfoData...)
+			lenTmpAllData := len(tmpAllData)
+			if lenTmpAllData > 0 {
+				lastDataValue = tmpAllData[lenTmpAllData-1].Value
+			}
+			predictEdbInfoData = GetChartPredictEdbInfoDataListByRule1(int(predictEdbConf.PredictEdbInfoID), lastDataValue, startDate, dataEndTime, frequency, predictEdbInfoData, existMap)
+			tmpMaxValue = lastDataValue
+			tmpMinValue = lastDataValue
+		case 2: //2：固定值
+			tmpValDecimal, tmpErr := decimal.NewFromString(predictEdbConf.Value)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			dataValue, _ := tmpValDecimal.Float64()
+			predictEdbInfoData = GetChartPredictEdbInfoDataListByRule1(int(predictEdbConf.PredictEdbInfoID), dataValue, startDate, dataEndTime, frequency, predictEdbInfoData, existMap)
+
+			tmpMaxValue = dataValue
+			tmpMinValue = dataValue
+		case 3: //3：同比
+			tmpValDecimal, tmpErr := decimal.NewFromString(predictEdbConf.Value)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			tbValue, _ := tmpValDecimal.Float64()
+			predictEdbInfoData, tmpMinValue, tmpMaxValue = GetChartPredictEdbInfoDataListByRuleTb(int(predictEdbConf.PredictEdbInfoID), tbValue, startDate, dataEndTime, frequency, realPredictEdbInfoData, predictEdbInfoData, existMap)
+		case 4: //4：同差
+			tmpValDecimal, tmpErr := decimal.NewFromString(predictEdbConf.Value)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			tcValue, _ := tmpValDecimal.Float64()
+			predictEdbInfoData, tmpMinValue, tmpMaxValue = GetChartPredictEdbInfoDataListByRuleTc(int(predictEdbConf.PredictEdbInfoID), tcValue, startDate, dataEndTime, frequency, realPredictEdbInfoData, predictEdbInfoData, existMap)
+		case 5: //5：环比
+			tmpValDecimal, tmpErr := decimal.NewFromString(predictEdbConf.Value)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			hbValue, _ := tmpValDecimal.Float64()
+			predictEdbInfoData, tmpMinValue, tmpMaxValue = GetChartPredictEdbInfoDataListByRuleHb(int(predictEdbConf.PredictEdbInfoID), hbValue, startDate, dataEndTime, frequency, realPredictEdbInfoData, predictEdbInfoData, existMap)
+		case 6: //6：环差
+			tmpValDecimal, tmpErr := decimal.NewFromString(predictEdbConf.Value)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			hcValue, _ := tmpValDecimal.Float64()
+			predictEdbInfoData, tmpMinValue, tmpMaxValue = GetChartPredictEdbInfoDataListByRuleHc(int(predictEdbConf.PredictEdbInfoID), hcValue, startDate, dataEndTime, frequency, realPredictEdbInfoData, predictEdbInfoData, existMap)
+		case 7: //7：N期移动均值
+			nValue, tmpErr := strconv.Atoi(predictEdbConf.Value)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			predictEdbInfoData, tmpMinValue, tmpMaxValue = GetChartPredictEdbInfoDataListByRuleNMoveMeanValue(int(predictEdbConf.PredictEdbInfoID), nValue, startDate, dataEndTime, frequency, realPredictEdbInfoData, predictEdbInfoData, existMap)
+		case 8: //8：N期段线性外推值
+			nValue, tmpErr := strconv.Atoi(predictEdbConf.Value)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			predictEdbInfoData, tmpMinValue, tmpMaxValue = GetChartPredictEdbInfoDataListByRuleNLinearRegression(int(predictEdbConf.PredictEdbInfoID), nValue, startDate, dataEndTime, frequency, realPredictEdbInfoData, predictEdbInfoData, existMap)
+		}
+		//startDate = dataEndTime.AddDate(0, 0, 1)
+		startDate = dataEndTime
+		if tmpMinValue < minValue {
+			minValue = tmpMinValue
+		}
+		if tmpMaxValue < maxValue {
+			maxValue = tmpMaxValue
+		}
+	}
+
+	return
+}
+
 // GetPredictEdbDayList 获取预测指标日期列表
 func getPredictEdbDayList(startDate, endDate time.Time, frequency string) (dayList []time.Time) {
 	//if !utils.InArrayByStr([]string{"日度", "周度", "月度"}, frequency)
@@ -104,16 +238,17 @@ func GetPredictDataListByPredictEdbInfo(edbInfo *edbInfoModel.EdbInfo, startDate
 		return GetPredictCalculateDataListByPredictEdbInfo(edbInfo, startDate, endDate)
 	}
 	// 查找该预测指标配置
-	predictEdbConf, err = predictEdbConfModel.GetPredictEdbConfById(edbInfo.EdbInfoId)
-	if err != nil && err != utils.ErrNoRow {
+	predictEdbConfList, err := predictEdbConfModel.GetPredictEdbConfListById(edbInfo.EdbInfoId)
+	if err != nil {
 		errMsg = "获取预测指标配置信息失败"
 		return
 	}
-	if predictEdbConf == nil {
+	if len(predictEdbConfList) == 0 {
 		errMsg = "获取预测指标配置信息失败"
 		err = errors.New(errMsg)
 		return
 	}
+	predictEdbConf = predictEdbConfList[0]
 
 	// 来源指标
 	sourceEdbInfoItem, err = edbInfoModel.GetEdbInfoById(int(predictEdbConf.SourceEdbInfoID))
@@ -125,11 +260,21 @@ func GetPredictDataListByPredictEdbInfo(edbInfo *edbInfoModel.EdbInfo, startDate
 		return
 	}
 
+	allDataList := make([]*edbDataModel.EdbDataList, 0)
 	//获取指标数据（实际已生成）
 	dataList, err = edbDataModel.GetEdbDataList(sourceEdbInfoItem.Source, sourceEdbInfoItem.EdbInfoId, startDate, endDate)
 	if err != nil {
 		return
 	}
+	// 如果选择了日期，那么需要筛选所有的数据，用于未来指标的生成
+	if startDate != `` {
+		allDataList, err = edbDataModel.GetEdbDataList(sourceEdbInfoItem.Source, sourceEdbInfoItem.EdbInfoId, "", "")
+		if err != nil {
+			return
+		}
+	} else {
+		allDataList = dataList
+	}
 
 	// 获取预测指标未来的数据
 	predictDataList := make([]*edbDataModel.EdbDataList, 0)
@@ -143,22 +288,22 @@ func GetPredictDataListByPredictEdbInfo(edbInfo *edbInfoModel.EdbInfo, startDate
 			endDateStr = endDate
 		}
 	}
-	predictDataList, err = GetChartPredictEdbInfoDataList(*predictEdbConf, startDate, sourceEdbInfoItem.LatestDate.Format(utils.FormatDate), sourceEdbInfoItem.LatestValue, endDateStr, edbInfo.Frequency)
+	//predictDataList, err = GetChartPredictEdbInfoDataList(*predictEdbConf, startDate, sourceEdbInfoItem.LatestDate.Format(utils.FormatDate), sourceEdbInfoItem.LatestValue, endDateStr, edbInfo.Frequency)
+	var predictMinValue, predictMaxValue float64
+	predictDataList, predictMinValue, predictMaxValue, err = GetChartPredictEdbInfoDataListByConfList(predictEdbConfList, startDate, sourceEdbInfoItem.LatestDate.Format(utils.FormatDate), endDateStr, edbInfo.Frequency, allDataList)
 	if err != nil {
 		return
 	}
 	dataList = append(dataList, predictDataList...)
 	if len(predictDataList) > 0 {
-		tmpValue := predictDataList[0]
-
-		// 如果最大值 小于 预测值，那么将预测值作为最大值数据返回
-		if edbInfo.MaxValue < tmpValue.Value {
-			edbInfo.MaxValue = tmpValue.Value
+		// 如果最小值 大于 预测值，那么将预测值作为最小值数据返回
+		if edbInfo.MinValue > predictMinValue {
+			edbInfo.MinValue = predictMinValue
 		}
 
-		// 如果最小值 大于 预测值，那么将预测值作为最小值数据返回
-		if edbInfo.MinValue > tmpValue.Value {
-			edbInfo.MinValue = tmpValue.Value
+		// 如果最大值 小于 预测值，那么将预测值作为最大值数据返回
+		if edbInfo.MaxValue < predictMaxValue {
+			edbInfo.MaxValue = predictMaxValue
 		}
 	}
 	return

services/chart/predict_edb_info_rule.go

@@ -0,0 +1,583 @@
+package chart
+
+import (
+	"github.com/shopspring/decimal"
+	edbDataModel "hongze/hongze_yb/models/tables/edb_data"
+	"hongze/hongze_yb/utils"
+	"time"
+)
+
+// GetChartPredictEdbInfoDataListByRule1 根据规则1获取预测数据
+func GetChartPredictEdbInfoDataListByRule1(edbInfoId int, dataValue float64, startDate, endDate time.Time, frequency string, predictEdbInfoData []*edbDataModel.EdbDataList, existMap map[string]float64) (newPredictEdbInfoData []*edbDataModel.EdbDataList) {
+	newPredictEdbInfoData = predictEdbInfoData
+	//获取后面的预测数据
+	dayList := getPredictEdbDayList(startDate, endDate, frequency)
+	predictEdbInfoData = make([]*edbDataModel.EdbDataList, 0)
+	for k, v := range dayList {
+		newPredictEdbInfoData = append(newPredictEdbInfoData, &edbDataModel.EdbDataList{
+			EdbDataId:     edbInfoId + 10000000000 + k,
+			EdbInfoId:     edbInfoId,
+			DataTime:      v.Format(utils.FormatDate),
+			Value:         dataValue,
+			DataTimestamp: (v.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+		})
+		existMap[v.Format(utils.FormatDate)] = dataValue
+	}
+	return
+}
+
+//	GetChartPredictEdbInfoDataListByRuleTb 根据同比值规则获取预测数据
+//	2.1 同比: 在未来某一个时间段内，给定一个固定的同比增速a，用去年同期值X乘以同比增速(1+a)，得到预测值Y=X(1+a)
+//	例: 今年1-3月值，100，100，120。给定同比增速a=0.1，则明年1-3月预测值为: 100*1.1=110，100*1.1=110，120*1.1=132。
+func GetChartPredictEdbInfoDataListByRuleTb(edbInfoId int, tbValue float64, startDate, endDate time.Time, frequency string, realPredictEdbInfoData, predictEdbInfoData []*edbDataModel.EdbDataList, existMap map[string]float64) (newPredictEdbInfoData []*edbDataModel.EdbDataList, minValue, maxValue float64) {
+	allDataList := make([]*edbDataModel.EdbDataList, 0)
+	allDataList = append(allDataList, realPredictEdbInfoData...)
+	allDataList = append(allDataList, predictEdbInfoData...)
+	newPredictEdbInfoData = predictEdbInfoData
+
+	index := len(allDataList)
+	//获取后面的预测数据
+	dayList := getPredictEdbDayList(startDate, endDate, frequency)
+	predictEdbInfoData = make([]*edbDataModel.EdbDataList, 0)
+	for k, currentDate := range dayList {
+
+		tmpData := &edbDataModel.EdbDataList{
+			EdbDataId: edbInfoId + 10000000000 + index + k,
+			EdbInfoId: edbInfoId,
+			DataTime:  currentDate.Format(utils.FormatDate),
+			//Value:         dataValue,
+			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+		}
+
+		var val float64
+		var calculateStatus bool //计算结果
+		//currentItem := existMap[av]
+		//上一年的日期
+		preDate := currentDate.AddDate(-1, 0, 0)
+		preDateStr := preDate.Format(utils.FormatDate)
+		if preValue, ok := existMap[preDateStr]; ok { //上一年同期找到
+			val = TbzDiv(preValue, tbValue)
+			calculateStatus = true
+		} else {
+			switch frequency {
+			case "月度":
+				//向上和向下，各找一个月
+				nextDateDay := preDate
+				preDateDay := preDate
+				for i := 0; i <= 35; i++ {
+					nextDateDayStr := nextDateDay.Format(utils.FormatDate)
+					if preValue, ok := existMap[nextDateDayStr]; ok { //上一年同期->下一个月找到
+						val = TbzDiv(preValue, tbValue)
+						calculateStatus = true
+						break
+					} else {
+						preDateDayStr := preDateDay.Format(utils.FormatDate)
+						if preValue, ok := existMap[preDateDayStr]; ok { //上一年同期->上一个月找到
+							val = TbzDiv(preValue, tbValue)
+							calculateStatus = true
+							break
+						}
+					}
+					nextDateDay = nextDateDay.AddDate(0, 0, 1)
+					preDateDay = preDateDay.AddDate(0, 0, -1)
+				}
+
+			case "季度", "年度":
+				if preValue, ok := existMap[preDateStr]; ok { //上一年同期->下一个月找到
+					val = TbzDiv(preValue, tbValue)
+					calculateStatus = true
+					break
+				}
+			default:
+				nextDateDay := preDate
+				preDateDay := preDate
+
+				for i := 0; i < 35; i++ {
+					nextDateDayStr := nextDateDay.Format(utils.FormatDate)
+					if preValue, ok := existMap[nextDateDayStr]; ok { //上一年同期->下一个月找到
+						val = TbzDiv(preValue, tbValue)
+						calculateStatus = true
+						break
+					} else {
+						preDateDayStr := preDateDay.Format(utils.FormatDate)
+						if preValue, ok := existMap[preDateDayStr]; ok { //上一年同期->上一个月找到
+							val = TbzDiv(preValue, tbValue)
+							calculateStatus = true
+							break
+						} else {
+							//fmt.Println("pre not find:", preDateStr, "i:", i)
+						}
+					}
+					nextDateDay = nextDateDay.AddDate(0, 0, 1)
+					preDateDay = preDateDay.AddDate(0, 0, -1)
+				}
+			}
+		}
+
+		if calculateStatus {
+			tmpData.Value = val
+			newPredictEdbInfoData = append(newPredictEdbInfoData, tmpData)
+			allDataList = append(allDataList, tmpData)
+			existMap[tmpData.DataTime] = val
+
+			// 最大最小值
+			if val < minValue {
+				minValue = val
+			}
+			if val > maxValue {
+				maxValue = val
+			}
+		}
+	}
+	return
+}
+
+// TbzDiv 同比值计算
+// @params a float64 去年同期值
+// @params b float64 固定同比增速
+func TbzDiv(a, b float64) (result float64) {
+	if b != 0 {
+		// 去年同期值
+		af := decimal.NewFromFloat(a)
+
+		// 同比增速
+		bf := decimal.NewFromFloat(b)
+
+		// 默认1
+		cf := decimal.NewFromFloat(1)
+
+		// 总增速
+		val := bf.Add(cf)
+
+		// 计算
+		result, _ = val.Mul(af).RoundCeil(4).Float64()
+	} else {
+		result = 0
+	}
+	return
+}
+
+//	GetChartPredictEdbInfoDataListByRuleTc 根据同差值规则获取预测数据
+//	2.2 同差: 在未来某一个时间段内，给定一个固定的同比增加值a，用去年同期值X加上同比增加值A，得到预测值Y=X+a
+//	例: 今年1-3月值，100，100，120。给定同比增加值a=10，则明年1-3月预测值为: 100+10=110，100+10=110，120+10=130
+func GetChartPredictEdbInfoDataListByRuleTc(edbInfoId int, tcValue float64, startDate, endDate time.Time, frequency string, realPredictEdbInfoData, predictEdbInfoData []*edbDataModel.EdbDataList, existMap map[string]float64) (newPredictEdbInfoData []*edbDataModel.EdbDataList, minValue, maxValue float64) {
+	allDataList := make([]*edbDataModel.EdbDataList, 0)
+	allDataList = append(allDataList, realPredictEdbInfoData...)
+	allDataList = append(allDataList, predictEdbInfoData...)
+	newPredictEdbInfoData = predictEdbInfoData
+
+	index := len(allDataList)
+	//获取后面的预测数据
+	dayList := getPredictEdbDayList(startDate, endDate, frequency)
+	predictEdbInfoData = make([]*edbDataModel.EdbDataList, 0)
+	for k, currentDate := range dayList {
+
+		tmpData := &edbDataModel.EdbDataList{
+			EdbDataId: edbInfoId + 10000000000 + index + k,
+			EdbInfoId: edbInfoId,
+			DataTime:  currentDate.Format(utils.FormatDate),
+			//Value:         dataValue,
+			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+		}
+
+		var val float64
+		var calculateStatus bool //计算结果
+		//currentItem := existMap[av]
+		//上一年的日期
+		preDate := currentDate.AddDate(-1, 0, 0)
+		preDateStr := preDate.Format(utils.FormatDate)
+		if preValue, ok := existMap[preDateStr]; ok { //上一年同期找到
+			val = TczDiv(preValue, tcValue)
+			calculateStatus = true
+		} else {
+			switch frequency {
+			case "月度":
+				//向上和向下，各找一个月
+				nextDateDay := preDate
+				preDateDay := preDate
+				for i := 0; i <= 35; i++ {
+					nextDateDayStr := nextDateDay.Format(utils.FormatDate)
+					if preValue, ok := existMap[nextDateDayStr]; ok { //上一年同期->下一个月找到
+						val = TczDiv(preValue, tcValue)
+						calculateStatus = true
+						break
+					} else {
+						preDateDayStr := preDateDay.Format(utils.FormatDate)
+						if preValue, ok := existMap[preDateDayStr]; ok { //上一年同期->上一个月找到
+							val = TczDiv(preValue, tcValue)
+							calculateStatus = true
+							break
+						}
+					}
+					nextDateDay = nextDateDay.AddDate(0, 0, 1)
+					preDateDay = preDateDay.AddDate(0, 0, -1)
+				}
+
+			case "季度", "年度":
+				if preValue, ok := existMap[preDateStr]; ok { //上一年同期->下一个月找到
+					val = TczDiv(preValue, tcValue)
+					calculateStatus = true
+					break
+				}
+			default:
+				nextDateDay := preDate
+				preDateDay := preDate
+
+				for i := 0; i < 35; i++ {
+					nextDateDayStr := nextDateDay.Format(utils.FormatDate)
+					if preValue, ok := existMap[nextDateDayStr]; ok { //上一年同期->下一个月找到
+						val = TczDiv(preValue, tcValue)
+						calculateStatus = true
+						break
+					} else {
+						preDateDayStr := preDateDay.Format(utils.FormatDate)
+						if preValue, ok := existMap[preDateDayStr]; ok { //上一年同期->上一个月找到
+							val = TczDiv(preValue, tcValue)
+							calculateStatus = true
+							break
+						} else {
+							//fmt.Println("pre not find:", preDateStr, "i:", i)
+						}
+					}
+					nextDateDay = nextDateDay.AddDate(0, 0, 1)
+					preDateDay = preDateDay.AddDate(0, 0, -1)
+				}
+			}
+		}
+
+		if calculateStatus {
+			tmpData.Value = val
+			newPredictEdbInfoData = append(newPredictEdbInfoData, tmpData)
+			allDataList = append(allDataList, tmpData)
+			existMap[tmpData.DataTime] = val
+
+			// 最大最小值
+			if val < minValue {
+				minValue = val
+			}
+			if val > maxValue {
+				maxValue = val
+			}
+		}
+	}
+	return
+}
+
+// TczDiv 环差值计算
+// @params a float64 上一期值
+// @params b float64 固定的环比增加值
+func TczDiv(a, b float64) (result float64) {
+	if b != 0 {
+		// 上一期值
+		af := decimal.NewFromFloat(a)
+
+		// 固定的环比增加值
+		bf := decimal.NewFromFloat(b)
+
+		// 计算
+		result, _ = af.Add(bf).RoundCeil(4).Float64()
+	} else {
+		result = 0
+	}
+	return
+}
+
+//	GetChartPredictEdbInfoDataListByRuleHb 根据环比值规则获取预测数据
+//	环比：在未来某一个时间段内，给定一个固定的环比增速a，用上一期值X乘以环比增速(1+a)，得到预测值Y=X(1+a)
+//	例: 最近1期值为100，给定环比增速a=0.2，则未来3期预测值为: 100*1.2=120，120*1.2=144，144*1.2=172.8
+func GetChartPredictEdbInfoDataListByRuleHb(edbInfoId int, hbValue float64, startDate, endDate time.Time, frequency string, realPredictEdbInfoData, predictEdbInfoData []*edbDataModel.EdbDataList, existMap map[string]float64) (newPredictEdbInfoData []*edbDataModel.EdbDataList, minValue, maxValue float64) {
+	allDataList := make([]*edbDataModel.EdbDataList, 0)
+	allDataList = append(allDataList, realPredictEdbInfoData...)
+	allDataList = append(allDataList, predictEdbInfoData...)
+	newPredictEdbInfoData = predictEdbInfoData
+
+	index := len(allDataList)
+	//获取后面的预测数据
+	dayList := getPredictEdbDayList(startDate, endDate, frequency)
+	for k, currentDate := range dayList {
+		tmpK := index + k - 1 //上1期的值
+
+		// 环比值计算
+		val := HbzDiv(allDataList[tmpK].Value, hbValue)
+
+		currentDateStr := currentDate.Format(utils.FormatDate)
+		tmpData := &edbDataModel.EdbDataList{
+			EdbDataId:     edbInfoId + 10000000000 + index + k,
+			EdbInfoId:     edbInfoId,
+			DataTime:      currentDateStr,
+			Value:         val,
+			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+		}
+		newPredictEdbInfoData = append(newPredictEdbInfoData, tmpData)
+		allDataList = append(allDataList, tmpData)
+		existMap[currentDateStr] = val
+
+		// 最大最小值
+		if val < minValue {
+			minValue = val
+		}
+		if val > maxValue {
+			maxValue = val
+		}
+	}
+	return
+}
+
+// HbzDiv 环比值计算
+// @params a float64 上一期值
+// @params b float64 固定的环比增速
+func HbzDiv(a, b float64) (result float64) {
+	if b != 0 {
+		// 上一期值
+		af := decimal.NewFromFloat(a)
+
+		// 固定的环比增速
+		bf := decimal.NewFromFloat(b)
+
+		// 默认1
+		cf := decimal.NewFromFloat(1)
+
+		// 总增速
+		val := bf.Add(cf)
+
+		// 计算
+		result, _ = val.Mul(af).RoundCeil(4).Float64()
+	} else {
+		result = 0
+	}
+	return
+}
+
+//	GetChartPredictEdbInfoDataListByRuleHc 根据环差值规则获取预测数据
+//	2.4 环差：在未来某一个时间段内，给定一个固定的环比增加值a，用上一期值X加上环比增加值a，得到预测值Y=X+a
+//	例: 最近1期值为100，给定环比增加值a=10，则未来3期预测值为: 100+10=110，110+10=120，120+10=130
+func GetChartPredictEdbInfoDataListByRuleHc(edbInfoId int, hcValue float64, startDate, endDate time.Time, frequency string, realPredictEdbInfoData, predictEdbInfoData []*edbDataModel.EdbDataList, existMap map[string]float64) (newPredictEdbInfoData []*edbDataModel.EdbDataList, minValue, maxValue float64) {
+	allDataList := make([]*edbDataModel.EdbDataList, 0)
+	allDataList = append(allDataList, realPredictEdbInfoData...)
+	allDataList = append(allDataList, predictEdbInfoData...)
+	newPredictEdbInfoData = predictEdbInfoData
+
+	index := len(allDataList)
+	//获取后面的预测数据
+	dayList := getPredictEdbDayList(startDate, endDate, frequency)
+	for k, currentDate := range dayList {
+		tmpK := index + k - 1 //上1期的值
+
+		// 环差别值计算
+		val := HczDiv(allDataList[tmpK].Value, hcValue)
+
+		currentDateStr := currentDate.Format(utils.FormatDate)
+		tmpData := &edbDataModel.EdbDataList{
+			EdbDataId:     edbInfoId + 10000000000 + index + k,
+			EdbInfoId:     edbInfoId,
+			DataTime:      currentDateStr,
+			Value:         val,
+			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+		}
+		newPredictEdbInfoData = append(newPredictEdbInfoData, tmpData)
+		allDataList = append(allDataList, tmpData)
+		existMap[currentDateStr] = val
+
+		// 最大最小值
+		if val < minValue {
+			minValue = val
+		}
+		if val > maxValue {
+			maxValue = val
+		}
+	}
+	return
+}
+
+// HczDiv 环差值计算
+// @params a float64 上一期值
+// @params b float64 固定的环比增加值
+func HczDiv(a, b float64) (result float64) {
+	if b != 0 {
+		// 上一期值
+		af := decimal.NewFromFloat(a)
+
+		// 固定的环比增加值
+		bf := decimal.NewFromFloat(b)
+
+		// 计算
+		result, _ = af.Add(bf).RoundCeil(4).Float64()
+	} else {
+		result = 0
+	}
+	return
+}
+
+//	GetChartPredictEdbInfoDataListByRuleNMoveMeanValue 根据N期移动均值规则获取预测数据
+//	2.5 N期移动均值：在未来某一个时间段内，下一期值等于过去N期值得平均值。
+//	例：最近3期值(N=3),为95，98，105则未来第1期值为 1/3*(95+98+105)=99.33, 未来第2期值为 1/3*(98+105+99.33)=100.78依次类推。
+func GetChartPredictEdbInfoDataListByRuleNMoveMeanValue(edbInfoId int, nValue int, startDate, endDate time.Time, frequency string, realPredictEdbInfoData, predictEdbInfoData []*edbDataModel.EdbDataList, existMap map[string]float64) (newPredictEdbInfoData []*edbDataModel.EdbDataList, minValue, maxValue float64) {
+	allDataList := make([]*edbDataModel.EdbDataList, 0)
+	allDataList = append(allDataList, realPredictEdbInfoData...)
+	allDataList = append(allDataList, predictEdbInfoData...)
+	newPredictEdbInfoData = predictEdbInfoData
+
+	lenAllData := len(allDataList)
+	if lenAllData < nValue || lenAllData <= 0 {
+		return
+	}
+	if nValue <= 0 {
+		return
+	}
+	// 分母
+	decimalN := decimal.NewFromInt(int64(nValue))
+
+	//获取后面的预测数据
+	dayList := getPredictEdbDayList(startDate, endDate, frequency)
+	for k, currentDate := range dayList {
+		tmpIndex := lenAllData + k - 1 //上1期的值
+
+		// 数据集合中的最后一个数据
+		tmpDecimalVal := decimal.NewFromFloat(allDataList[tmpIndex].Value)
+		for tmpK := 2; tmpK <= nValue; tmpK++ {
+			tmpIndex2 := tmpIndex - tmpK //上N期的值
+			tmpDecimalVal2 := decimal.NewFromFloat(allDataList[tmpIndex2].Value)
+			tmpDecimalVal = tmpDecimalVal.Add(tmpDecimalVal2)
+		}
+
+		// N期移动均值计算
+		val, _ := tmpDecimalVal.Div(decimalN).RoundCeil(4).Float64()
+
+		currentDateStr := currentDate.Format(utils.FormatDate)
+		tmpData := &edbDataModel.EdbDataList{
+			EdbDataId:     edbInfoId + 10000000000 + lenAllData + k,
+			EdbInfoId:     edbInfoId,
+			DataTime:      currentDateStr,
+			Value:         val,
+			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+		}
+		newPredictEdbInfoData = append(newPredictEdbInfoData, tmpData)
+		allDataList = append(allDataList, tmpData)
+		existMap[currentDateStr] = val
+
+		// 最大最小值
+		if val < minValue {
+			minValue = val
+		}
+		if val > maxValue {
+			maxValue = val
+		}
+	}
+	return
+}
+
+//	GetChartPredictEdbInfoDataListByRuleNLinearRegression 根据N期移动均值规则获取预测数据
+//	2.6N期段线性外推值：给出过去N期值所确定的线性回归方程(Y=aX+b)在未来一段时间内的推算值。回归方程虽然比较复杂，但各种编程语言应该都有现成的模块或函数，应该无需自己编写。
+//	例1：过去5期值(N=5)分别为：3，5，7，9，11（每两期值之间的时间间隔相等）。那么按照线性回归方程推算，未来三期的预测值是：13，15，17。
+//
+//	例2：过去6期值(N=6)分别为：3，3，5，7，9，11（每两期值之间的时间间隔相等）。那么按照线性回归方程推算，未来三期的预测值是：12.33，14.05，15.76。例1和例2的区别在于，多加了一期数据，导致回归方程发生改变，从而预测值不同。
+func GetChartPredictEdbInfoDataListByRuleNLinearRegression(edbInfoId int, nValue int, startDate, endDate time.Time, frequency string, realPredictEdbInfoData, predictEdbInfoData []*edbDataModel.EdbDataList, existMap map[string]float64) (newPredictEdbInfoData []*edbDataModel.EdbDataList, minValue, maxValue float64) {
+	//var errMsg string
+	//defer func() {
+	//	if errMsg != `` {
+	//		go alarm_msg.SendAlarmMsg("更新上海的token失败；ERR："+err.Error(), 3)
+	//	}
+	//}()
+	allDataList := make([]*edbDataModel.EdbDataList, 0)
+	allDataList = append(allDataList, realPredictEdbInfoData...)
+	allDataList = append(allDataList, predictEdbInfoData...)
+	newPredictEdbInfoData = predictEdbInfoData
+
+	lenAllData := len(allDataList)
+	if lenAllData < nValue || lenAllData <= 0 {
+		return
+	}
+
+	if nValue <= 1 {
+		return
+	}
+
+	//获取后面的预测数据
+	// 获取线性方程公式的a、b的值
+	coordinateData := make([]Coordinate, 0)
+	for tmpK := nValue; tmpK > 0; tmpK-- {
+		tmpIndex2 := lenAllData - tmpK //上N期的值
+		tmpCoordinate := Coordinate{
+			X: float64(nValue - tmpK + 1),
+			Y: allDataList[tmpIndex2].Value,
+		}
+		coordinateData = append(coordinateData, tmpCoordinate)
+	}
+	a, b := getLinearResult(coordinateData)
+	//fmt.Println("a:", a, ";======b:", b)
+
+	dayList := getPredictEdbDayList(startDate, endDate, frequency)
+	for k, currentDate := range dayList {
+		tmpK := nValue + k + 1
+
+		aDecimal := decimal.NewFromFloat(a)
+		xDecimal := decimal.NewFromInt(int64(tmpK))
+		bDecimal := decimal.NewFromFloat(b)
+
+		val, _ := aDecimal.Mul(xDecimal).Add(bDecimal).RoundCeil(4).Float64()
+
+		currentDateStr := currentDate.Format(utils.FormatDate)
+		tmpData := &edbDataModel.EdbDataList{
+			EdbDataId:     edbInfoId + 10000000000 + lenAllData + k,
+			EdbInfoId:     edbInfoId,
+			DataTime:      currentDateStr,
+			Value:         val,
+			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+		}
+		newPredictEdbInfoData = append(newPredictEdbInfoData, tmpData)
+		allDataList = append(allDataList, tmpData)
+		existMap[currentDateStr] = val
+
+		// 最大最小值
+		if val < minValue {
+			minValue = val
+		}
+		if val > maxValue {
+			maxValue = val
+		}
+	}
+	return
+}
+
+// Series is a container for a series of data
+type Series []Coordinate
+
+// Coordinate holds the data in a series
+type Coordinate struct {
+	X, Y float64
+}
+
+func getLinearResult(s []Coordinate) (gradient, intercept float64) {
+	if len(s) <= 1 {
+		return
+	}
+
+	// Placeholder for the math to be done
+	var sum [5]float64
+
+	// Loop over data keeping index in place
+	i := 0
+	for ; i < len(s); i++ {
+		sum[0] += s[i].X
+		sum[1] += s[i].Y
+		sum[2] += s[i].X * s[i].X
+		sum[3] += s[i].X * s[i].Y
+		sum[4] += s[i].Y * s[i].Y
+	}
+
+	// Find gradient and intercept
+	f := float64(i)
+	gradient = (f*sum[3] - sum[0]*sum[1]) / (f*sum[2] - sum[0]*sum[0])
+	intercept = (sum[1] / f) - (gradient * sum[0] / f)
+
+	//fmt.Println("gradient:", gradient, ";intercept:", intercept)
+	// Create the new regression series
+	//for j := 0; j < len(s); j++ {
+	//	regressions = append(regressions, Coordinate{
+	//		X: s[j].X,
+	//		Y: s[j].X*gradient + intercept,
+	//	})
+	//}
+
+	return
+}

services/community/video.go

@@ -2,12 +2,20 @@ package community
 
 import (
 	"errors"
+	response2 "hongze/hongze_yb/controller/response"
 	"hongze/hongze_yb/models/response"
+	"hongze/hongze_yb/models/tables/chart_permission"
 	"hongze/hongze_yb/models/tables/company_product"
+	"hongze/hongze_yb/models/tables/yb_community_question_comment"
+	"hongze/hongze_yb/models/tables/yb_community_question_like_tease"
 	"hongze/hongze_yb/models/tables/yb_community_video"
 	"hongze/hongze_yb/models/tables/yb_community_video_play_log"
+	"hongze/hongze_yb/models/tables/yb_road_video"
+	"hongze/hongze_yb/services/company"
 	"hongze/hongze_yb/services/user"
 	"hongze/hongze_yb/utils"
+	"strconv"
+	"strings"
 	"time"
 )
 
@@ -55,13 +63,23 @@ func GetVideoList(pageIndex, pageSize, videoId, varietyTagId int, keywords strin
 }
 
 // SaveVideoPlayLog 记录用户播放视频日志
-func SaveVideoPlayLog(userInfo user.UserInfo, videoId, sourceAgent int) (errMsg string, err error) {
-	video, e := yb_community_video.GetItemById(videoId)
-	if e != nil {
-		errMsg = "视频不存在或未发布"
-		err = errors.New("获取视频信息失败, Err: " + e.Error())
-		return
+func SaveVideoPlayLog(userInfo user.UserInfo, videoId, sourceAgent int, videoType int8) (errMsg string, err error) {
+	if videoType == 1 {
+		_, e := yb_community_video.GetItemById(videoId)
+		if e != nil {
+			errMsg = "视频不存在或未发布"
+			err = errors.New("获取视频信息失败, Err: " + e.Error())
+			return
+		}
+	} else {
+		_, e := yb_road_video.GetItemById(videoId)
+		if e != nil {
+			errMsg = "视频不存在或未发布"
+			err = errors.New("获取视频信息失败, Err: " + e.Error())
+			return
+		}
 	}
+
 	companyInfo, e := company_product.GetByCompany2ProductId(userInfo.CompanyID, 1)
 	if e != nil && e != utils.ErrNoRow {
 		errMsg = "保存失败"
@@ -70,12 +88,16 @@ func SaveVideoPlayLog(userInfo user.UserInfo, videoId, sourceAgent int) (errMsg
 	}
 	companyName := "潜在客户"
 	companyStatus := "潜在"
+	sellerId := 0
+
 	if companyInfo != nil && companyInfo.CompanyID > 0 {
 		companyName = companyInfo.CompanyName
 		companyStatus = companyInfo.Status
+		sellerId = companyInfo.SellerID
 	}
+
 	item := &yb_community_video_play_log.YbCommunityVideoPlayLog{
-		CommunityVideoID: video.CommunityVideoID,
+		CommunityVideoID: videoId,
 		UserID:           int(userInfo.UserID),
 		Mobile:           userInfo.Mobile,
 		RealName:         userInfo.RealName,
@@ -84,7 +106,8 @@ func SaveVideoPlayLog(userInfo user.UserInfo, videoId, sourceAgent int) (errMsg
 		CompanyName:      companyName,
 		CompanyStatus:    companyStatus,
 		SourceAgent:      sourceAgent,
-		SellerID:         companyInfo.SellerID,
+		SellerID:         sellerId,
+		Type:             videoType,
 		CreateTime:       time.Now().Local(),
 	}
 	if e = item.Create(); e != nil {
@@ -94,3 +117,279 @@ func SaveVideoPlayLog(userInfo user.UserInfo, videoId, sourceAgent int) (errMsg
 	}
 	return
 }
+
+// HandleLikeOrTeaseByCommunityVideoItemList 视频社区 点赞/吐槽 数据
+func HandleLikeOrTeaseByCommunityVideoItemList(userId uint64, videoList []*response.CommunityVideoItem) (err error) {
+	listLen := len(videoList)
+	if listLen == 0 {
+		return
+	}
+	idArr := make([]uint32, 0)
+	for i := 0; i < listLen; i++ {
+		idArr = append(idArr, uint32(videoList[i].CommunityVideoID))
+	}
+
+	// 注：此处视频社区CommunityVideoID在点赞吐槽表中为CommunityQuestionID, 以source区分主键
+
+	// 获取点赞和吐槽数据
+	ybCommunityQuestionLikeTeaseMap := make(map[uint32]*yb_community_question_like_tease.YbCommunityQuestionLikeTease)
+	ybCommunityQuestionLikeTeaseList, err := yb_community_question_like_tease.GetByUserIdAndCommunityQuestionIds(userId, idArr, yb_community_question_like_tease.SourceVideo)
+	if err != nil {
+		return
+	}
+	for _, v := range ybCommunityQuestionLikeTeaseList {
+		ybCommunityQuestionLikeTeaseMap[v.CommunityQuestionID] = v
+	}
+
+	// 获取点赞和吐槽汇总数
+	likeMap := make(map[uint32]int)
+	teaseMap := make(map[uint32]int)
+
+	likeList, err := yb_community_question_like_tease.GetLikeNumCommentByCommunityQuestionIds(idArr, yb_community_question_like_tease.SourceVideo)
+	if err != nil {
+		return
+	}
+	for _, v := range likeList {
+		likeMap[v.CommunityQuestionID] = v.Total
+	}
+
+	teaseList, err := yb_community_question_like_tease.GetTeaseNumCommentByCommunityQuestionIds(idArr, yb_community_question_like_tease.SourceVideo)
+	if err != nil {
+		return
+	}
+	for _, v := range teaseList {
+		teaseMap[v.CommunityQuestionID] = v.Total
+	}
+
+	for _, v := range videoList {
+		if tmpTotal, ok := likeMap[uint32(v.CommunityVideoID)]; ok {
+			v.LikeTotal = tmpTotal
+		}
+		if tmpTotal, ok := teaseMap[uint32(v.CommunityVideoID)]; ok {
+			v.TeaseTotal = tmpTotal
+		}
+
+		if ybCommunityQuestionLikeTease, ok := ybCommunityQuestionLikeTeaseMap[uint32(v.CommunityVideoID)]; ok {
+			//类型. 1-点赞 2-吐槽
+			v.OpType = ybCommunityQuestionLikeTease.OpType
+		}
+	}
+	return
+}
+
+// HandleCommentByCommunityVideoItemList 视频 评论 数据
+func HandleCommentByCommunityVideoItemList(questionList []*response.CommunityVideoItem) (err error) {
+	listLen := len(questionList)
+	if listLen == 0 {
+		return
+	}
+	idArr := make([]uint32, 0)
+
+	// 注：此处视频社区CommunityVideoID在评论表中为CommunityQuestionID, 以source区分主键
+
+	// 问题ID-精选评论列表
+	questionIdCommentsMap := make(map[uint32][]*response.CommunityQuestionCommentListItem, 0)
+
+	for i := 0; i < listLen; i++ {
+		idArr = append(idArr, uint32(questionList[i].CommunityVideoID))
+		questionIdCommentsMap[uint32(questionList[i].CommunityVideoID)] = make([]*response.CommunityQuestionCommentListItem, 0)
+	}
+
+	// 精选评论数据
+	hotList, err := yb_community_question_comment.GetHotListByCommunityQuestionIds(idArr, yb_community_question_comment.SourceVideo)
+	if err != nil {
+		return
+	}
+	for _, v := range hotList {
+		questionIdCommentsMap[v.CommunityQuestionID] = append(questionIdCommentsMap[v.CommunityQuestionID], &response.CommunityQuestionCommentListItem{
+			QaAvatarUrl: v.QaAvatarUrl,
+			Comment:     v.Content,
+		})
+	}
+
+	for _, v := range questionList {
+		comments := questionIdCommentsMap[uint32(v.CommunityVideoID)]
+		v.CommentTotal = len(comments)
+		v.CommentList = comments
+	}
+	return
+}
+
+// GetRoadVideoList 获取线上路演视频列表
+func GetRoadVideoList(userInfo user.UserInfo, pageIndex, pageSize, videoId, chartPermissionId int, keywords string) (resp response.RoadVideoItemResp, err error, code int) {
+	list := make([]*response.RoadVideoItem, 0)
+	//获取有权限的permissionID
+	validPermissionList, err := company.GetValidPermissionByCompany2ProductId(userInfo.CompanyID, 1)
+	if err != nil {
+		return
+	}
+
+	ficcPermissionList, err := chart_permission.GetFiccListExceptTacticByProductId()
+	if err != nil {
+		return
+	}
+	permissionIds := ""
+	validPermissionMap := make(map[string]struct{})
+	ParentPermissionNameMap := make(map[string]string)
+	ParentPermissionChildMap := make(map[string]int)
+	for _, v := range validPermissionList {
+		permissionIds += "'" + strconv.Itoa(v.ChartPermissionID) + "'|"
+		validPermissionMap["'"+strconv.Itoa(v.ChartPermissionID)+"'"] = struct{}{}
+	}
+	for _, v := range ficcPermissionList {
+		ParentPermissionNameMap["'"+strconv.Itoa(int(v.ChartPermissionID))+"'"] = v.ClassifyName
+		ParentPermissionChildMap[v.ClassifyName] += 1
+	}
+
+	if permissionIds == "" {
+		resp.List = list
+		resp.Paging = response.GetPaging(pageIndex, pageSize, 0)
+		return
+	}
+	permissionIds = strings.Trim(permissionIds, "|")
+	condition := `is_deleted = 0 AND publish_state = 1 and chart_permission_ids REGEXP "(` + permissionIds + `)"`
+	var par []interface{}
+	// 分享点进来的直接定位到具体视频
+	var videoList []*yb_road_video.YbRoadVideo
+	var total int64
+	if videoId > 0 {
+		videoInfo, e := yb_road_video.GetItemById(videoId)
+		if e != nil {
+			if e != utils.ErrNoRow {
+				err = errors.New("获取视频信息失败, Err:" + e.Error())
+				return
+			}
+		}
+		if videoInfo != nil && videoInfo.RoadVideoID > 0 {
+			if videoInfo.IsDeleted != 0 || videoInfo.PublishState != 1 {
+				resp.List = list
+				resp.Paging = response.GetPaging(pageIndex, pageSize, 0)
+				return
+			}
+			permissionIdsSlice := strings.Split(permissionIds, "|")
+			videoPermissionIdsSlice := strings.Split(videoInfo.ChartPermissionIds, ",")
+			hasPermission := false
+			for _, v1 := range permissionIdsSlice {
+				for _, v2 := range videoPermissionIdsSlice {
+					if v1 == v2 {
+						hasPermission = true
+						break
+					}
+				}
+			}
+
+			if !hasPermission { //无权限
+				code = response2.SPECIFIC_FAIL_CODE
+				err = errors.New("无查看该视频的权限")
+				return
+			}
+			videoList = append(videoList, videoInfo)
+			total = 1
+		}
+	} else {
+		if chartPermissionId > 0 {
+			condition += ` and FIND_IN_SET("'` + strconv.Itoa(chartPermissionId) + `'", chart_permission_ids)`
+		}
+		if keywords != "" {
+			condition += " and title like ? "
+			par = append(par, "%"+keywords+"%")
+		}
+		videoList, total, err = yb_road_video.GetPageListByCondition(condition, par, pageIndex, pageSize)
+		if err != nil {
+			err = errors.New("获取视频列表失败, Err:" + err.Error())
+			return
+		}
+	}
+
+	if len(videoList) <= 0 {
+		resp.List = list
+		resp.Paging = response.GetPaging(pageIndex, pageSize, 0)
+		return
+	}
+
+	chartPermissionIdSlice := make([]int, 0)
+	chartNameMap := make(map[string]string)
+
+	for _, v := range videoList {
+		tmp := strings.Split(v.ChartPermissionIds, ",")
+		for _, t1 := range tmp {
+			i, _ := strconv.Atoi(strings.Trim(t1, "'"))
+			chartPermissionIdSlice = append(chartPermissionIdSlice, i)
+		}
+	}
+	if len(chartPermissionIdSlice) > 0 {
+		chartList, e := chart_permission.GetListByIds(chartPermissionIdSlice)
+		if e != nil {
+			err = errors.New("获取品种信息失败, Err:" + e.Error())
+			return
+		}
+		for _, v := range chartList {
+			chartNameMap["'"+strconv.Itoa(int(v.ChartPermissionID))+"'"] = v.PermissionName
+		}
+	}
+	var chartPermissionNames string
+	for _, v := range videoList {
+		chartPermissionNames = ""
+		itemParentPermissionNum := make(map[string]int)
+		tmpSlice := strings.Split(v.ChartPermissionIds, ",")
+		if len(tmpSlice) > 0 {
+			// 拼接一级标签
+			for _, cid := range tmpSlice {
+				if p, ok := ParentPermissionNameMap[cid]; ok {
+					if _, ok1 := itemParentPermissionNum[p]; !ok1 {
+						itemParentPermissionNum[p] = 0
+						chartPermissionNames += p + ","
+					}
+				}
+			}
+			// 查询可显示的所有品种是否包含所有一级品种的二级品种
+			for _, cid := range tmpSlice {
+				if _, ok := chartNameMap[cid]; ok {
+					if _, ok1 := validPermissionMap[cid]; ok1 {
+						itemParentPermissionNum[ParentPermissionNameMap[cid]] += 1
+					}
+				}
+			}
+			for _, cid := range tmpSlice {
+				if n, ok := ParentPermissionChildMap[ParentPermissionNameMap[cid]]; ok && n != itemParentPermissionNum[ParentPermissionNameMap[cid]] {
+					chartPermissionNames = ""
+					break
+				}
+			}
+
+			if chartPermissionNames == "" {
+				for _, cid := range tmpSlice {
+					if name, ok := chartNameMap[cid]; ok {
+						if _, ok1 := validPermissionMap[cid]; ok1 {
+							chartPermissionNames += name + ","
+						}
+					}
+				}
+			}
+
+			if chartPermissionNames != "" {
+				chartPermissionNames = strings.Trim(chartPermissionNames, ",")
+			}
+		}
+
+		item := &response.RoadVideoItem{
+			RoadVideoID:         v.RoadVideoID,
+			Title:               v.Title,
+			ChartPermissionIds:  v.ChartPermissionIds,
+			ChartPermissionName: chartPermissionNames,
+			CoverImgUrl:         v.CoverImgURL,
+			VideoUrl:            v.VideoURL,
+			VideoSeconds:        v.VideoSeconds,
+			PublishState:        v.PublishState,
+			AdminId:             v.AdminId,
+			AdminRealName:       v.AdminRealName,
+			PublishTime:         v.PublishTime.Format(utils.FormatDateTime),
+			CreateTime:          v.CreateTime.Format(utils.FormatDateTime),
+			ModifyTime:          v.ModifyTime.Format(utils.FormatDateTime),
+		}
+		list = append(list, item)
+	}
+	resp.List = list
+	resp.Paging = response.GetPaging(pageIndex, pageSize, int(total))
+	return
+}

services/company/permission.go

@@ -907,3 +907,97 @@ func CheckUserSandboxPermission(companyId int64, userId, permissionId int) (ok b
 
 	return
 }
+
+func GetBindFiccPermissions(user user.UserInfo) (ret response.BindPermissionFiccResp, err error) {
+	var errMsg string
+	defer func() {
+		if err != nil {
+			global.LOG.Critical(fmt.Sprintf("GetHomeFiccPermissions: userId=%d, err:%s， errMsg:%s", user.UserID, err.Error(), errMsg))
+		}
+	}()
+	ret.PermissionList = make([]*response.BindPermissionFiccItem, 0)
+	// 判断用户状态是否是正常和永续
+	var productAuthOk bool
+	companyProduct, err := company_product.GetByCompany2ProductId(user.CompanyID, 1)
+	if err == utils.ErrNoRow {
+		err = nil
+		return
+	}
+	if err != nil {
+		errMsg = err.Error()
+		err = errors.New("查询用户购买产品出错")
+		return
+	}
+	if companyProduct != nil {
+		// 无FICC权限的客户不可见
+		if companyProduct.CompanyProductID > 0 {
+			// 已购或者试用用户可见
+			if strings.Contains("永续,正式", companyProduct.Status) || (companyProduct.Status == "试用" && companyProduct.IsSuspend != 1) {
+				productAuthOk = true
+			}
+		}
+	}
+	if !productAuthOk {
+		return
+	}
+	validPermissionList, err := GetValidPermissionByCompany2ProductId(user.CompanyID, 1)
+	if err != nil {
+		return
+	}
+	var validPermissionIds []int
+	for _, item := range validPermissionList {
+		validPermissionIds = append(validPermissionIds, item.ChartPermissionID)
+	}
+	permissionList, err := chart_permission.GetFiccListExceptTacticByProductIdOrderSort()
+	if err != nil {
+		return
+	}
+	permissionMap := make(map[uint64]bool)
+	permissionFirstMap := make(map[string]*response.BindPermissionFiccItem)
+
+	//查询首页展示的图标
+	permissionFirstList, err := chart_permission_first.GetIndexShowListOrderSort()
+	if err != nil {
+		return
+	}
+	for _, v := range permissionFirstList {
+		permissionFirstMap[v.ClassifyName] = &response.BindPermissionFiccItem{
+			Id:          int(v.Id),
+			ClassifyName: v.YbIndexName,
+		}
+	}
+
+	for _, v := range permissionList {
+		permissionMap[v.ChartPermissionID] = false
+		for _, myPerId := range validPermissionIds {
+			if int(v.ChartPermissionID) == myPerId {
+				permissionMap[v.ChartPermissionID] = true
+				break
+			}
+		}
+	}
+
+	for _, v := range permissionList {
+		temp := new(response.BindPermissionFiccSecondItem)
+		temp.ChartPermissionID = int(v.ChartPermissionID)
+		temp.ChartPermissionName = v.PermissionName
+		if _, ok := permissionFirstMap[v.ClassifyName]; ok && permissionMap[v.ChartPermissionID] {
+			permissionFirstMap[v.ClassifyName].List = append(permissionFirstMap[v.ClassifyName].List, temp)
+		}
+	}
+
+	var list []*response.BindPermissionFiccItem
+	for _, v := range permissionFirstList {
+		item := permissionFirstMap[v.ClassifyName]
+		if len(item.List) > 0 {
+			temp := new(response.BindPermissionFiccItem)
+			temp.Id = item.Id
+			temp.ClassifyName = item.ClassifyName
+			temp.List = item.List
+			list = append(list, temp)
+		}
+	}
+	ret.PermissionList = list
+	return
+}
+

services/company_approval_message/company_approval_message.go

@@ -6,7 +6,7 @@ import (
 	"time"
 )
 
-//消息来源类型，1:客户，2：合同，3：用印，4：指标替换，5：问答社区，6：问答评论
+//消息来源类型，1:客户，2：合同，3：用印，4：指标替换，5：问答社区，6：问答评论，7：视频评论
 const (
 	CompanyApprovalMessageSourceTypeByCompany         = 1
 	CompanyApprovalMessageSourceTypeByContract        = 2
@@ -14,6 +14,7 @@ const (
 	CompanyApprovalMessageSourceTypeByEdbInfo         = 4
 	CompanyApprovalMessageSourceTypeByQuestion        = 5
 	CompanyApprovalMessageSourceTypeByQuestionComment = 6
+	CompanyApprovalMessageSourceTypeByVideoComment    = 7
 )
 
 // 1:申请消息，2:审批结果，3：消息通知
@@ -40,6 +41,7 @@ type MessageInfo struct {
 	UserId               uint64    `json:"user_id"`
 	UserName             string    `json:"user_name"`
 	CreateTime           time.Time `json:"create_time"`
+	Extra                string    `json:"extra" description:"附加字段"`
 }
 
 // AddCompanyApprovalMessage 添加系统消息

services/voice_broadcast.go

@@ -72,9 +72,12 @@ func GetVoiceBroadcastList(pageIndex, pageSize, sectionId, broadcastId, authorId
 		imgMap[imgList[i].BroadcastId] = append(imgMap[imgList[i].BroadcastId], imgList[i])
 	}
 	// 响应数据
-	userId := int(userInfo.UserID)
 	for i := 0; i < listLen; i++ {
-		r := handleBroadcastItem(userId, voiceList[i], imgMap[voiceList[i].BroadcastId])
+		r, e := handleBroadcastItem(userInfo, voiceList[i], imgMap[voiceList[i].BroadcastId])
+		if e != nil {
+			err = errors.New("语音播报响应数据处理失败, Err: " + e.Error())
+			return
+		}
 		resp = append(resp, r)
 	}
 	return
@@ -165,7 +168,7 @@ func AddBroadcastRecord(userinfo user.UserInfo, source, broadcastId int) {
 		VarietyName:   broadcast.VarietyName,
 		AuthorId:      broadcast.AuthorId,
 		Author:        broadcast.Author,
-		PublishTime:   broadcast.CreateTime,
+		PublishTime:   broadcast.PublishTime,
 		CreateTime:    time.Now().Format(utils.FormatDateTime),
 	}
 	err = voiceBroadcastStatistics.AddBroadcastStatistics()
@@ -219,7 +222,7 @@ func SendBroadcastMsg(broadcastId, userId int) (errMsg string, err error) {
 }
 
 // CreateVoiceBroadcast 新增语音播报
-func CreateVoiceBroadcast(sectionId, varietyId, authorId, userId int, broadcastName, sectionName, varietyName, author, voiceSeconds, voiceSize, voiceUrl, imgs string) (resp response.Broadcast, err error) {
+func CreateVoiceBroadcast(sectionId, varietyId, authorId int, broadcastName, sectionName, varietyName, author, voiceSeconds, voiceSize, voiceUrl, imgs string, userInfo user.UserInfo) (resp response.Broadcast, err error) {
 	nowTime := time.Now().Local()
 	item := &voice_broadcast.VoiceBroadcast{
 		BroadcastName:    broadcastName,
@@ -255,12 +258,17 @@ func CreateVoiceBroadcast(sectionId, varietyId, authorId, userId int, broadcastN
 		err = errors.New("新增语音播报及图片失败, Err: " + e.Error())
 		return
 	}
-	resp = handleBroadcastItem(userId, item, imgList)
+	respItem, e := handleBroadcastItem(userInfo, item, imgList)
+	if e != nil {
+		err = errors.New("语音播报响应数据处理失败, Err: " + e.Error())
+		return
+	}
+	resp = respItem
 	return
 }
 
 // EditVoiceBroadcast 编辑语音播报
-func EditVoiceBroadcast(broadcastId, sectionId, varietyId, authorId, userId int, broadcastName, sectionName, varietyName, author, voiceSeconds, voiceSize, voiceUrl, imgs string) (resp response.Broadcast, err error) {
+func EditVoiceBroadcast(broadcastId, sectionId, varietyId, authorId int, broadcastName, sectionName, varietyName, author, voiceSeconds, voiceSize, voiceUrl, imgs string, userInfo user.UserInfo) (resp response.Broadcast, err error) {
 	if broadcastId <= 0 {
 		return
 	}
@@ -303,7 +311,11 @@ func EditVoiceBroadcast(broadcastId, sectionId, varietyId, authorId, userId int,
 		err = errors.New("更新语音播报及图片失败, Err: " + e.Error())
 		return
 	}
-	resp = handleBroadcastItem(userId, item, imgList)
+	resp, e = handleBroadcastItem(userInfo, item, imgList)
+	if e != nil {
+		err = errors.New("语音播报响应数据处理失败, Err: " + e.Error())
+		return
+	}
 	return
 }
 
@@ -384,7 +396,7 @@ func createVoiceBroadcastShareImg(baseImg, sectionName, createTime string) (shar
 }
 
 // GetVoiceBroadcastDetail 获取语音播报详情
-func GetVoiceBroadcastDetail(broadcastId, userId int) (detail response.Broadcast, err error) {
+func GetVoiceBroadcastDetail(broadcastId int, userInfo user.UserInfo) (detail response.Broadcast, err error) {
 	item, e := voice_broadcast.GetBroadcastById(broadcastId)
 	if e != nil {
 		err = errors.New("获取语音播报详情失败, Err: " + e.Error())
@@ -396,12 +408,16 @@ func GetVoiceBroadcastDetail(broadcastId, userId int) (detail response.Broadcast
 		err = errors.New("获取语音播报图片失败, Err: " + e.Error())
 		return
 	}
-	detail = handleBroadcastItem(userId, item, imgList)
+	detail, e = handleBroadcastItem(userInfo, item, imgList)
+	if e != nil {
+		err = errors.New("语音播报响应数据处理失败, Err: " + e.Error())
+		return
+	}
 	return
 }
 
 // handleBroadcastItem 语音播报响应数据处理
-func handleBroadcastItem(userId int, item *voice_broadcast.VoiceBroadcast, imgs []*voice_broadcast_img.YbVoiceBroadcastImg) (resp response.Broadcast) {
+func handleBroadcastItem(userInfo user.UserInfo, item *voice_broadcast.VoiceBroadcast, imgs []*voice_broadcast_img.YbVoiceBroadcastImg) (resp response.Broadcast, err error) {
 	if item == nil {
 		return
 	}
@@ -423,7 +439,11 @@ func handleBroadcastItem(userId int, item *voice_broadcast.VoiceBroadcast, imgs
 	resp.PublishTime = item.PublishTime
 	resp.PrePublishTime = item.PrePublishTime
 	// 是否为作者、是否可推送消息
-	if userId == item.AuthorId {
+	ok, _, err := user.GetAdminByUserInfo(userInfo)
+	if err != nil {
+		return
+	}
+	if int(userInfo.UserID) == item.AuthorId && ok{
 		resp.IsAuthor = true
 		if item.MsgState == 0 {
 			resp.CouldSendMsg = true

utils/constants.go

@@ -76,6 +76,7 @@ const (
 	DATA_SOURCE_PREDICT_CALCULATE_TBZ            //预测指标同比值->32
 	DATA_SOURCE_PREDICT_CALCULATE_TCZ            //预测指标同差值->33
 	DATA_SOURCE_MYSTEEL_CHEMICAL                 //钢联化工->34
+	DATA_SOURCE_CALCULATE_CJJX                   //超季节性->35
 )
 
 const (
@@ -198,6 +199,7 @@ var SystemSourceList = []int{
 	DATA_SOURCE_PREDICT_CALCULATE_TBZ, //预测指标同比值->32
 	DATA_SOURCE_PREDICT_CALCULATE_TCZ, //预测指标同差值->33
 	DATA_SOURCE_MYSTEEL_CHEMICAL,      //钢联化工->34
+	DATA_SOURCE_CALCULATE_CJJX,        //超季节性->35
 }
 
 const (