Merge branch 'yb/9.2' into debug

models/db.go

@@ -66,7 +66,7 @@ func init() {
 		new(UserViewStatistics),
 		new(roadshow.RsReportRecord), //路演记录
 		new(CompanyReportRecord),
-		new(ChartPermission),     // 权限表
+		new(ChartPermission), // 权限表
 	)
 
 	// 注册客户信息 数据表
@@ -120,9 +120,9 @@ func initEdbDataTable() {
 		new(data_manage.EdbDataCalculateZjpj),    //直接拼接
 		new(data_manage.EdbDataCalculateLjztbpj), //累计同比值拼接
 		new(data_manage.EdbDataLt),               //路透指标数据表
-		new(VarietyClassify),            // 标签分类表
-		new(VarietyTag),                 // 标签表
-		new(ResearchVarietyTagRelation), // 研究员标签关系表
+		new(VarietyClassify),                     // 标签分类表
+		new(VarietyTag),                          // 标签表
+		new(ResearchVarietyTagRelation),          // 研究员标签关系表
 	)
 }
 
@@ -135,10 +135,11 @@ func initYbTable() {
 		new(yb.ActivityVoice),    //研报活动语音表
 		new(yb.ActivityRegister), //研报活动报名表
 		new(yb.Speaker),          //研报主持人表
-		new(yb.PriceDriven),		// 研报价格驱动表
+		new(yb.PriceDriven),      // 研报价格驱动表
 		new(yb.ComeinEvent),      //进门会议表
 		new(yb.ComeinEventUser),  //进门会议用户表
-		new(yb.CommunityVideo),	  //研报视频社区
+		new(yb.CommunityVideo),   //研报视频社区
+		new(yb.VoiceBroadcast),   // 语音播报
 	)
 }
 

models/wx_template_msg.go

@@ -32,3 +32,19 @@ func GetWxOpenIdList() (items []*OpenIdList, err error) {
 	_, err = orm.NewOrm().Raw(sql, openId).QueryRows(&items)
 	return
 }
+
+// GetOpenIdListV2 2022-08-18从hongze_admin复制过来的最新的代码
+func GetOpenIdListV2() (items []*OpenIdList, err error) {
+	sql := `SELECT DISTINCT
+				ur.open_id,
+				wu.user_id
+			FROM
+				wx_user AS wu
+			INNER JOIN company AS c ON c.company_id = wu.company_id
+			INNER JOIN company_product AS d ON c.company_id = d.company_id
+			INNER JOIN user_record AS ur ON wu.user_id = ur.user_id
+			WHERE
+				ur.open_id != "" AND ur.subscribe = 1 AND ur.create_platform = 1 AND d. STATUS IN ('正式', '试用', '永续') `
+	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
+	return
+}

models/yb/yb_voice_broadcast.go

@@ -1,21 +1,30 @@
 package yb
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
 
 type VoiceBroadcast struct {
-	BroadcastId      int    `gorm:"primaryKey;column:broadcast_id;type:int(11)" description:"语音ID"`
-	BroadcastName    string `description:"语音名称"`
-	SectionId        int    `description:"语音分类ID"`
-	SectionName      string `description:"语音分类名称"`
-	VarietyId        int    `description:"品种id"`
-	VarietyName      string `description:"品种名称"`
-	AuthorId         int    `description:"作者id"`
-	Author           string `description:"作者"`
-	ImgUrl           string `description:"背景图url"`
-	VoiceUrl         string `description:"音频url"`
-	VoicePlaySeconds string `description:"音频时长"`
-	VoiceSize        string `description:"音频大小"`
-	CreateTime       string `description:"创建时间"`
+	BroadcastId      int       `gorm:"primaryKey;column:broadcast_id;type:int(11)" description:"语音ID"`
+	BroadcastName    string    `description:"语音名称"`
+	SectionId        int       `description:"语音分类ID"`
+	SectionName      string    `description:"语音分类名称"`
+	VarietyId        int       `description:"品种id"`
+	VarietyName      string    `description:"品种名称"`
+	AuthorId         int       `description:"作者id"`
+	Author           string    `description:"作者"`
+	ImgUrl           string    `description:"背景图url"`
+	VoiceUrl         string    `description:"音频url"`
+	VoicePlaySeconds string    `description:"音频时长"`
+	VoiceSize        string    `description:"音频大小"`
+	CreateTime       time.Time `description:"创建时间"`
+	ModifyTime       time.Time `description:"更新时间"`
+	PublishState     int       `description:"发布状态：0-未发布 1-已发布"`
+	PublishTime      time.Time `description:"发布时间"`
+	PrePublishTime   time.Time `description:"预发布时间"`
+	MsgState         int       `description:"消息推送状态：0-待推送 1-已推送"`
+	MsgTime          time.Time `description:"消息推送时间"`
 }
 
 // TableName get sql table name.获取数据库表名
@@ -23,6 +32,11 @@ func (m *VoiceBroadcast) TableName() string {
 	return "yb_voice_broadcast"
 }
 
+func (item *VoiceBroadcast) Update(cols []string) (err error) {
+	o := orm.NewOrm()
+	_, err = o.Update(item, cols...)
+	return
+}
 
 func GetBroadcastById(broadcastId int) (item *VoiceBroadcast, err error) {
 	o := orm.NewOrm()
@@ -30,3 +44,23 @@ func GetBroadcastById(broadcastId int) (item *VoiceBroadcast, err error) {
 	err = o.Raw(sql, broadcastId).QueryRow(&item)
 	return
 }
+
+// GetUnpublishedVoiceBroadcastList 获取未发布的语音播报列表
+func GetUnpublishedVoiceBroadcastList() (list []*VoiceBroadcast, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM yb_voice_broadcast WHERE publish_state = 0 `
+	_, err = o.Raw(sql).QueryRows(&list)
+	return
+}
+
+// PublishVoiceBroadcast 发布语音播报
+func PublishVoiceBroadcast(broadcastId int) (err error) {
+	o := orm.NewOrm()
+	sql := `UPDATE yb_voice_broadcast
+			SET publish_state = 1, publish_time = NOW(), msg_state = 1, msg_time = NOW()
+			WHERE
+				broadcast_id = ?
+			LIMIT 1`
+	_, err = o.Raw(sql, broadcastId).Exec()
+	return
+}

services/task.go

@@ -117,6 +117,10 @@ func Task() {
 	deleteLog := task.NewTask("syncSubStatus", "0 0 2 1 * *", DeleteLog)
 	task.AddTask("deleteLog", deleteLog)
 
+	// 定时发布研报语音播报
+	publishVoiceBroadcast := task.NewTask("publishVoiceBroadcast", "0 */1 * * * *", PublishVoiceBroadcast)
+	task.AddTask("定时发布研报语音播报", publishVoiceBroadcast)
+
 	task.StartTask()
 
 	fmt.Println("task end")
@@ -206,8 +210,11 @@ func releaseTask() {
 func TaskTest() {
 	fmt.Println("The task is start")
 	//companyReportPermissionClose := task.NewTask("companyTryOut", "0 5 0 * * *", CompanyReportPermissionClose)
-	companyReportPermissionClose := task.NewTask("companyReportPermissionClose", "0/30 * * * * *", CompanyReportPermissionClose)
-	task.AddTask("用户产品权限试用-->关闭", companyReportPermissionClose)
+	//companyReportPermissionClose := task.NewTask("companyReportPermissionClose", "0/30 * * * * *", CompanyReportPermissionClose)
+	//task.AddTask("用户产品权限试用-->关闭", companyReportPermissionClose)
+	//publishVoiceBroadcast := task.NewTask("publishVoiceBroadcast", "0 */1 * * * *", PublishVoiceBroadcast)
+	//task.AddTask("定时发布研报语音播报", publishVoiceBroadcast)
+
 	task.StartTask()
 	fmt.Println("The task is end")
 }

services/voice_broadcast.go

@@ -0,0 +1,62 @@
+package services
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"hongze/hongze_task/models/yb"
+	"hongze/hongze_task/services/alarm_msg"
+	"time"
+)
+
+// PublishVoiceBroadcast 定时发布语音播报-每分钟
+func PublishVoiceBroadcast(cont context.Context) (err error) {
+	defer func() {
+		if err != nil {
+			go alarm_msg.SendAlarmMsg("PublishVoiceBroadcast-定时发布语音播报失败, ErrMsg:\n"+err.Error(), 3)
+		}
+	}()
+	// 获取所有未发布的语音播报
+	list, e := yb.GetUnpublishedVoiceBroadcastList()
+	if e != nil {
+		return
+	}
+	listLen := len(list)
+	if listLen == 0 {
+		return
+	}
+	// 比对时间(分钟),时间相等则发布并推送
+	format := "200601021504"
+	nowTime := time.Now().Local().Format(format)
+	for i := 0; i < listLen; i++ {
+		item := list[i]
+		t := item.PrePublishTime.Format(format)
+		if t == nowTime && item.MsgState == 0 {
+			if e := VoiceBroadcastUpdateAndPush(item); e != nil {
+				err = e
+				return
+			}
+		}
+	}
+	return
+}
+
+// VoiceBroadcastUpdateAndPush 更新发布语音播报
+func VoiceBroadcastUpdateAndPush(item *yb.VoiceBroadcast) (err error) {
+	if item == nil {
+		return
+	}
+	if e := yb.PublishVoiceBroadcast(item.BroadcastId); e != nil {
+		err = errors.New(fmt.Sprintf("Id: %d, 更新发布状态失败, Err: %s", item.BroadcastId, e.Error()))
+		return
+	}
+	go func() {
+		fmt.Println("开始发送模板消息")
+		_ = SendYbVoiceBroadcastWxMsg(item.BroadcastId, item.SectionName, item.BroadcastName)
+	}()
+	go func() {
+		fmt.Println("开始发送客群消息")
+		_ = SendYbVoiceBroadcastToThs(item.BroadcastId)
+	}()
+	return
+}

services/wx_template_msg.go

@@ -3,11 +3,14 @@ package services
 import (
 	"bytes"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"hongze/hongze_task/models"
+	"hongze/hongze_task/services/alarm_msg"
 	"hongze/hongze_task/utils"
 	"io/ioutil"
 	"net/http"
+	"strings"
 	"time"
 )
 
@@ -160,3 +163,98 @@ func SendWxMsgWithActivityAppointmentRemind(first, keyword1, keyword2, keyword3,
 	WxSendTemplateMsg(sendUrl, sendMap, openIdList)
 	return
 }
+
+type SendWxTemplate struct {
+	First          string   `description:"模板消息first字段"`
+	Keyword1       string   `description:"模板消息keyword1字段"`
+	Keyword2       string   `description:"模板消息keyword2字段"`
+	Keyword3       string   `description:"模板消息keyword3字段"`
+	Keyword4       string   `description:"模板消息keyword4字段"`
+	Remark         string   `description:"模板消息remark字段"`
+	TemplateId     string   `description:"模板id"`
+	RedirectUrl    string   `description:"跳转地址"`
+	RedirectTarget int      `description:"小程序跳转目标:1:弘则研报小程序,2:随手办公小程序"`
+	Resource       string   `description:"资源唯一标识"`
+	SendType       int      `description:"发送的消息类型:1:报告,2:指标更新提醒,3:审批通知,4:销售领取客户通知,5:活动取消通知,6活动更改时间通知,7:关注的作者发布报告通知,8:发送日报（周报、双周报、月报）模板消息,9:活动预约/报名时间通知"`
+	OpenIdArr      []string `description:"消息接收者openid"`
+}
+
+//推送模板消息
+func SendTemplateMsgV2(sendInfo *SendWxTemplate) (err error) {
+	postData, err := json.Marshal(sendInfo)
+	if err != nil {
+		alarm_msg.SendAlarmMsg("SendTemplateMsg json.Marshal Err:"+err.Error(), 1)
+		return err
+	}
+	body := ioutil.NopCloser(strings.NewReader(string(postData)))
+	client := &http.Client{}
+	req, err := http.NewRequest("POST", utils.SendWxTemplateMsgUrl, body)
+	if err != nil {
+		alarm_msg.SendAlarmMsg("SendTemplateMsg http.NewRequest Err:"+err.Error(), 1)
+		return err
+	}
+	contentType := "application/json;charset=utf-8"
+	req.Header.Set("Content-Type", contentType)
+	req.Header.Set("Authorization", utils.SendTemplateMsgAuthorization)
+	resp, err := client.Do(req)
+	if err != nil {
+		fmt.Println("http client.Do Err:" + err.Error())
+		return err
+	}
+	defer resp.Body.Close()
+	b, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return err
+	}
+	result := new(models.BaseResponse)
+	err = json.Unmarshal(b, &result)
+	if err != nil {
+		return err
+	}
+	if result.Ret != 200 {
+		err = errors.New(string(b))
+		return err
+	}
+	return
+}
+
+// SendYbVoiceBroadcastWxMsg 推送研报语音播报模板消息
+func SendYbVoiceBroadcastWxMsg(broadcastId int, sectionName, broadcastName string) (err error) {
+	var msg string
+	defer func() {
+		if err != nil {
+			errMsg := "SendYbVoiceBroadcastWxMsg-定时任务发送语音播报模版消息失败; Err: " + err.Error() + "; Msg: " + msg
+			utils.FileLog.Info("%s", errMsg)
+			go alarm_msg.SendAlarmMsg(errMsg, 3)
+		}
+	}()
+
+	openIdList, err := models.GetOpenIdListV2()
+	if err != nil {
+		msg = "get openIdList err:" + err.Error()
+		return
+	}
+	openIdArr := make([]string, 0)
+	for _, v := range openIdList {
+		openIdArr = append(openIdArr, v.OpenId)
+	}
+
+	first := "您好，有新的语音播报待查看"
+	keyword1 := fmt.Sprint(sectionName, "：", broadcastName)
+	keyword2 := "待查看"
+	remark := "请点击详情查看"
+	wxAppPath := fmt.Sprintf("pages-voice/voiceDetail?voiceId=%d", broadcastId)
+	sendInfo := new(SendWxTemplate)
+	sendInfo.First = first
+	sendInfo.Keyword1 = keyword1
+	sendInfo.Keyword2 = keyword2
+	sendInfo.RedirectUrl = wxAppPath
+	sendInfo.TemplateId = utils.YbCommonTemplateId
+	sendInfo.RedirectTarget = 1
+	sendInfo.Resource = wxAppPath
+	sendInfo.SendType = utils.TEMPLATE_MSG_YB_VOICE_BROADCAST
+	sendInfo.OpenIdArr = openIdArr
+	sendInfo.Remark = remark
+	err = SendTemplateMsgV2(sendInfo)
+	return
+}

utils/config.go

@@ -27,6 +27,7 @@ var (
 	TemplateId                  string
 	RemindTemplateId            string
 	AppointmentRemindTemplateId string //活动预约通知模板id
+	YbCommonTemplateId          string //研报小程序消息模板ID
 
 	WxYbAppId string //微信研报小程序
 
@@ -62,6 +63,11 @@ var (
 	COMEIN_SECREKEY string
 )
 
+//模板消息推送
+var (
+	SendWxTemplateMsgUrl string
+)
+
 func init() {
 	tmpRunMode, err := web.AppConfig.String("run_mode")
 	if err != nil {
@@ -123,6 +129,9 @@ ZwIDAQAB
 
 		EDB_LIB_URL = "http://172.19.173.232:8300/edbapi/"
 		//EDB_LIB_URL = "http://47.102.213.75:8300/edbapi/"
+
+		SendWxTemplateMsgUrl = "http://127.0.0.1:8086/v1/wechat/send_template_msg"
+		YbCommonTemplateId = "dYg6iHooRq74PyCXmw_Ns7qdJZmbtLoKS2p2FKeaXl0"
 	} else {
 		CompanyId = 16
 		RealName = "超级管理员"
@@ -140,6 +149,9 @@ ZwIDAQAB
 		Hz_Server_Data_Url = "http://139.196.136.213:7000/"
 
 		EDB_LIB_URL = "http://8.136.199.33:8300/edbapi/"
+
+		SendWxTemplateMsgUrl = "http://127.0.0.1:8086/v1/wechat/send_template_msg"
+		YbCommonTemplateId = "CB7bOl7f3viMG4s1uhRo7WM0Jbx3WvodKuIZ8A_z8fM"
 	}
 
 	// 进门财经开放api配置

utils/constants.go

@@ -131,3 +131,28 @@ var (
 	REPORT_TYPE_MONTH    = "month"
 	REPORT_TYPE_OTHER    = "other"
 )
+
+const (
+	SendTemplateMsgAuthorization = "dc855fce962a639faa779cbdd4cd332f"
+)
+
+//模板消息推送类型
+const (
+	TEMPLATE_MSG_REPORT                = iota + 1 //日度点评报告推送
+	TEMPLATE_MSG_INDEX                            //指标更新
+	TEMPLATE_MSG_APPLY                            //审批通知
+	TEMPLATE_MSG_RECEIVE                          //销售领取客户通知
+	TEMPLATE_MSG_CYGX_ACTIVITY_CACLE              //查研观向活动取消通知
+	TEMPLATE_MSG_CYGX_ACTIVITY_UPDATE             //查研观向活动更改时间通知
+	TEMPLATE_MSG_CYGX_ARTICLE                     //关注的作者发布报告通知
+	TEMPLATE_MSG_CYGX_DAY_REPORT                  //发送日报（周报、双周报、月报）
+	TEMPLATE_MSG_ACTIVITY_APPOINTMENT             //活动预约/报名时间通知
+	TEMPLATE_MSG_RECEIVE_PERMISSION               //销售"添加客户/领取客户"权限变更通知
+	TEMPLATE_MSG_YB_COMMUNITY_QUESTION            //研报问答社区
+	TEMPLATE_MSG_CYGX_ACTIVITY_ADD                //查研观向小程序活动更新推送 12
+	TEMPLATE_MSG_CYGX_ARTICLE_ADD                 //查研观向报告更新推送  13
+	TEMPLATE_MSG_YB_PRICE_DRIVEN                  //研报价格驱动 14
+	TEMPLATE_MSG_SEAL_FINISHED                    //用印申请已迁回通知 15
+	TEMPLATE_MSG_YB_COMMUNITY_VIDEO               //研报视频社区 16
+	TEMPLATE_MSG_YB_VOICE_BROADCAST               //研报语音播报 17
+)