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

controllers/quanshi.go

@@ -1,9 +1,13 @@
 package controllers
 
 import (
+	"encoding/json"
 	"fmt"
+	quanshiReq "hongze/hongze_open_api/models/request/quanshi"
 	"hongze/hongze_open_api/services/quanshi"
+	"hongze/hongze_open_api/services/yb"
 	"hongze/hongze_open_api/utils"
+	"strconv"
 )
 
 // QuanShiControllerCommon 报告模块
@@ -30,5 +34,48 @@ func (c *QuanShiControllerCommon) CallBack() {
 		return
 	}
 
+	var req1 quanshiReq.QsCallBackReq
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req1)
+	if err != nil {
+		c.FailWithMessage("参数解析异常")
+		return
+	}
+	switch req1.Method {
+	case "report":
+		//报告
+		var req quanshiReq.QsCallBackReportReq
+		err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
+		if err != nil {
+			c.FailWithMessage("参数解析异常")
+			return
+		}
+		eventId, err := strconv.Atoi(req.Report.EventID)
+		if err != nil {
+			c.FailWithMessage("会议id异常：" + req.Report.EventID)
+			return
+		}
+		err = yb.SyncUser(eventId)
+	case "record":
+		//录制
+		var req quanshiReq.QsCallBackRecordReq
+		err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
+		if err != nil {
+			c.FailWithMessage("参数解析异常")
+			return
+		}
+		eventId, err := strconv.Atoi(req.Record.EventID)
+		if err != nil {
+			c.FailWithMessage("会议id异常：" + req.Record.EventID)
+			return
+		}
+		err = yb.SyncVideo(eventId, req.Record.VideoURL)
+	default:
+		c.OkWithMessage("ok")
+		return
+	}
+	if err != nil {
+		c.FailWithMessage("同步数据失败")
+		return
+	}
 	c.Ok()
 }

models/custom/contract/contract_service.go

@@ -1,7 +1,7 @@
 package contract
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_open_api/models/tables/contract_service_detail"
 	"time"
 )

models/custom/wechat.go

@@ -1,6 +1,6 @@
 package custom
 
-import "github.com/rdlucklib/rdluck_tools/orm"
+import "github.com/beego/beego/v2/client/orm"
 
 type WechatSign struct {
 	AppId     string

models/db_init.go

@@ -1,8 +1,8 @@
 package models
 
 import (
+	"github.com/beego/beego/v2/client/orm"
 	_ "github.com/go-sql-driver/mysql"
-	"github.com/rdlucklib/rdluck_tools/orm"
 	"hongze/hongze_open_api/models/tables/admin"
 	"hongze/hongze_open_api/models/tables/article"
 	"hongze/hongze_open_api/models/tables/company"
@@ -38,6 +38,8 @@ func init() {
 		new(admin.Admin),                  //系统用户表
 		new(article.CygxArticleCeluePush), //策略平台推送过来更新的文章
 	)
+	orm.Debug = true
+	orm.DebugLog = orm.NewLog(utils.Binlog)
 
 	// 注册研报相关的表
 	initYb()

models/request/quanshi/quanshi.go

@@ -0,0 +1,65 @@
+package quanshi
+
+// QsCallBackReq 全时请求
+type QsCallBackReq struct {
+	CustomerCode string `json:"customerCode"`
+	Method       string `json:"method"`
+	MsgID        string `json:"msgId"`
+	SiteID       int64  `json:"siteId"`
+	Timestamp    int64  `json:"timestamp"`
+}
+
+// QsCallBackMeetingReq 全时会议通知请求
+type QsCallBackMeetingReq struct {
+	CustomerCode string `json:"customerCode"`
+	Meetinginfo  struct {
+		AttendeeJoinURL string `json:"attendeeJoinUrl"`
+		BillingCode     string `json:"billingCode"`
+		ConfID          string `json:"confId"`
+		EventID         string `json:"eventId"`
+		HostID          string `json:"hostId"`
+		HostJoinURL     string `json:"hostJoinUrl"`
+	} `json:"meetinginfo"`
+	Method    string `json:"method"`
+	MsgID     string `json:"msgId"`
+	SiteID    int64  `json:"siteId"`
+	Timestamp int64  `json:"timestamp"`
+}
+
+// QsCallBackReportReq 全时会议报告通知请求
+type QsCallBackReportReq struct {
+	CustomerCode string `json:"customerCode"`
+	Report       struct {
+		AttendeeJoinURL string `json:"attendeeJoinUrl"`
+		ConfID          string `json:"confId"`
+		DownloadURL     string `json:"downloadUrl"`
+		EventID         string `json:"eventId"`
+		HostID          string `json:"hostId"`
+		HostJoinURL     string `json:"hostJoinUrl"`
+		ReportName      string `json:"reportName"`
+	} `json:"report"`
+	Method    string `json:"method"`
+	MsgID     string `json:"msgId"`
+	SiteID    int64  `json:"siteId"`
+	Timestamp int64  `json:"timestamp"`
+}
+
+// QsCallBackRecordReq 全时会议录制信息通知请求
+type QsCallBackRecordReq struct {
+	CustomerCode string `json:"customerCode"`
+	Record       struct {
+		AttendeeJoinURL string `json:"attendeeJoinUrl"`
+		ConfID          string `json:"confId"`
+		EventID         string `json:"eventId"`
+		HostJoinURL     string `json:"hostJoinUrl"`
+		OperatorID      string `json:"operatorId"`
+		Thumbnail       string `json:"thumbnail"`
+		VideoLength     int64  `json:"videoLength"`
+		VideoSize       int64  `json:"videoSize"`
+		VideoURL        string `json:"videoURL"`
+	} `json:"record"`
+	Method    string `json:"method"`
+	MsgID     string `json:"msgId"`
+	SiteID    int64  `json:"siteId"`
+	Timestamp int64  `json:"timestamp"`
+}

models/tables/admin/admin.go

@@ -1,7 +1,7 @@
 package admin
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/article/cygx_article_celue_push.go

@@ -1,7 +1,7 @@
 package article
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/company/company.go

@@ -1,7 +1,7 @@
 package company
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/company_product/company_product.go

@@ -1,7 +1,7 @@
 package company_product
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/company_report_permission/custom_query.go

@@ -2,7 +2,7 @@ package company_report_permission
 
 import (
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )

models/tables/company_user.go

@@ -2,7 +2,7 @@ package tables
 
 import (
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_open_api/utils"
 	"time"
 )
@@ -450,16 +450,14 @@ func GetCountUserViewHistoryByEmails(emails string) (items []*UserViewEmailTotal
 }
 
 func GetReportViewMaxTimeByMobile(dayStr string) (items []*UserViewMobileTotalSlice, err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	rddpSql := `SELECT mobile,MAX(create_time) AS created_time,COUNT(1) AS total FROM report_view_record WHERE create_time >= ? and mobile !="" group by mobile`
 	_, err = o.Raw(rddpSql, dayStr+" 00:00:00").QueryRows(&items)
 	return
 }
 
 func GetReportViewMaxTimeByEmails(emails string) (items []*UserViewEmailTotalSlice, err error) {
-	o := orm.NewOrm()
-	o.Using("rddp")
+	o := orm.NewOrmUsingDB("rddp")
 	rddpSql := `SELECT mobile,MAX(create_time) AS created_time,COUNT(1) AS total FROM report_view_record WHERE email in (` + emails + `) group by email`
 	_, err = o.Raw(rddpSql).QueryRows(&items)
 	return

models/tables/open_api_user/open_api_user.go

@@ -1,7 +1,7 @@
 package open_api_user
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 )
 
 type OpenApiUser struct {

models/tables/qs_event/qs_event.go

@@ -13,6 +13,7 @@ type QsEvent struct {
 	Time         int       `description:"会议时长，单位：分"`
 	StartTime    time.Time `description:"会议开始时间"`
 	EndTime      time.Time `description:"会议结束时间"`
+	People       int       `description:"参会人数"`
 	QsStatus     int       `description:"全时会议状态，0：未开始，1：进行中，2：已完成，3：已取消"`
 	Status       int       `description:"状态，0：未同步，1：已创建，2：已取消"`
 	VideoUrl     string    `description:"录制的流媒体文件下载地址"`

models/tables/report/report.go

@@ -1,18 +1,18 @@
 package report
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_open_api/models/tables/company_report_permission"
 	"hongze/hongze_open_api/utils"
 	"time"
 )
 
 type ReportList struct {
-	ResearchReportId   int    `json:"research_report_id",orm:"column(research_report_id)";description:"报告Id"`
-	ResearchReportName string `json:"research_report_name",orm:"column(research_report_name)"description:"标题"`
-	Periods            int    `json:"periods",description:"期数"`
-	ResearchReportDate string `json:"research_report_date",description:"发布时间"`
-	HttpUrl            string `json:"http_url",description:"报告详情"`
+	ResearchReportId   int    `json:"research_report_id" orm:"column(research_report_id)" description:"报告Id"`
+	ResearchReportName string `json:"research_report_name" orm:"column(research_report_name)" description:"标题"`
+	Periods            int    `json:"periods" description:"期数"`
+	ResearchReportDate string `json:"research_report_date" description:"发布时间"`
+	HttpUrl            string `json:"http_url" description:"报告详情"`
 }
 
 type ReportListResp struct {

models/tables/report/user_report_power.go

@@ -1,7 +1,7 @@
 package report
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 )
 
 func GetUserReportFiccCount(mobile string) (count int, err error) {

models/tables/user_view_statistics/user_view_statistics.go

@@ -1,7 +1,7 @@
 package user_view_statistics
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

models/tables/wx_user/wx_user.go

@@ -1,7 +1,7 @@
 package wx_user
 
 import (
-	"github.com/rdlucklib/rdluck_tools/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 

services/yb/activity.go

@@ -8,13 +8,12 @@ import (
 	"hongze/hongze_open_api/models/tables/user_view_statistics"
 	"hongze/hongze_open_api/models/tables/wx_user"
 	"hongze/hongze_open_api/services/quanshi"
-	"strconv"
 	"strings"
 	"time"
 )
 
 // SyncUser 用户同步
-func SyncUser(qsEventId int) {
+func SyncUser(qsEventId int) (err error) {
 	qsEventInfo, err := qs_event.GetQsEventByQsEventId(qsEventId)
 	if err != nil {
 		return
@@ -29,19 +28,11 @@ func SyncUser(qsEventId int) {
 		fmt.Println(err)
 		return
 	}
-	fmt.Println(qsData)
 
-	//获取全时录制的流媒体信息
-	qsVideoData, err := quanshi.QsEventReportQueryVideo(int64(qsEventId))
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	fmt.Println(qsData)
-
-	if qsData.Summary != nil && len(qsData.Summary) > 0 {
+	companyProductMap := make(map[string]*company_product.CompanyProduct)
+	people := len(qsData.Summary) //参与人数
+	if qsData.Summary != nil && people > 0 {
 		for _, v := range qsData.Summary {
-			fmt.Println(v)
 			mobile := v.Mobile
 			trimMobile := mobile
 			countryCode := "86"
@@ -54,11 +45,18 @@ func SyncUser(qsEventId int) {
 					trimMobile = trimMobileSlice[1]
 					countryCode = strings.Replace(trimMobileSlice[0], "+", "", -1)
 				}
-				fmt.Println(trimMobile)
-				fmt.Println(countryCode)
 				wxUserInfo, _ = wx_user.GetWxUserByMobileCountryCode(trimMobile, countryCode)
 				if wxUserInfo != nil {
-					companyProductInfo, _ = company_product.GetCompanyProductByCompanyIdAndProductId(wxUserInfo.CompanyId, 1)
+					//获取客户产品信息
+					key := fmt.Sprint(wxUserInfo.CompanyId, "_", 1)
+					if tmpCompanyProductInfo, ok := companyProductMap[key]; ok {
+						companyProductInfo = tmpCompanyProductInfo
+					} else {
+						companyProductInfo, _ = company_product.GetCompanyProductByCompanyIdAndProductId(wxUserInfo.CompanyId, 1)
+						if companyProductInfo != nil {
+							companyProductMap[key] = companyProductInfo
+						}
+					}
 				}
 			}
 
@@ -91,6 +89,8 @@ func SyncUser(qsEventId int) {
 					qsEventUserInfo.LastViewTime = userViewStatisticsInfo.LastViewTime
 				}
 
+				qsEventUserInfo.UserId = int(wxUserInfo.UserId)
+				qsEventUserInfo.Name = wxUserInfo.RealName
 				qsEventUserInfo.CompanyId = companyProductInfo.CompanyId
 				qsEventUserInfo.ProductId = companyProductInfo.ProductId
 				qsEventUserInfo.CompanyName = companyProductInfo.ProductName
@@ -104,14 +104,20 @@ func SyncUser(qsEventId int) {
 		}
 	}
 
-	videoUrl := ``
-	for k, v := range qsVideoData.Records {
-		if k == strconv.Itoa(qsEventId) {
-			videoUrl = v.VideoURL
-		}
-	}
-	qsEventInfo.VideoUrl = videoUrl
 	qsEventInfo.IsSync = 1
 	qsEventInfo.QsStatus = 2
-	err = qsEventInfo.Update([]string{"VideoUrl", "IsSync"})
+	qsEventInfo.People = people
+	err = qsEventInfo.Update([]string{"IsSync", "QsStatus", "People"})
+	return
+}
+
+// SyncVideo 录音同步
+func SyncVideo(qsEventId int, videoUrl string) (err error) {
+	qsEventInfo, err := qs_event.GetQsEventByQsEventId(qsEventId)
+	if err != nil {
+		return
+	}
+	qsEventInfo.VideoUrl = videoUrl
+	err = qsEventInfo.Update([]string{"VideoUrl"})
+	return
 }

utils/logs.go

@@ -1,12 +1,57 @@
 package utils
 
 import (
+	"encoding/json"
 	"github.com/beego/beego/v2/adapter/logs"
+	"os"
 )
 
 var FileLog *logs.BeeLogger
+var Binlog *logs.BeeLogger
 
 func init() {
 	FileLog = logs.NewLogger(1000000)
 	FileLog.SetLogger(logs.AdapterFile, `{"filename":"./rdlucklog/hongze_open_api.log"}`)
+
+	//初始化binlog日志
+	initBinlog()
+}
+
+func initBinlog() {
+	//binlog日志
+	binLogDir := `./binlog`
+	os.MkdirAll(binLogDir, os.ModePerm)
+	Binlog = logs.NewLogger(1000000)
+	logConfig := getDefaultLogConfig()
+	logConfig.FileName = "./binlog/binlog.log"
+	logConfig.MaxLines = 10000000
+	logConfig.Rotate = true
+	b, _ := json.Marshal(logConfig)
+	Binlog.SetLogger(logs.AdapterFile, string(b))
+	Binlog.EnableFuncCallDepth(true)
+}
+
+type logConfig struct {
+	FileName string `json:"filename" description:"保存的文件名"`
+	MaxLines int    `json:"maxlines"  description:"每个文件保存的最大行数，默认值 1000000"`
+	MaxSize  int    `json:"maxsize" description:"每个文件保存的最大尺寸，默认值是 1 << 28, //256 MB"`
+	Daily    bool   `json:"daily" description:"是否按照每天 logrotate，默认是 true"`
+	MaxDays  int    `json:"maxdays" description:"文件最多保存多少天，默认保存 7 天"`
+	Rotate   bool   `json:"rotate" description:"是否开启 logrotate，默认是 true"`
+	Level    int    `json:"level" description:"日志保存的时候的级别，默认是 Trace 级别"`
+	Color    bool   `json:"color" description:"日志是否输出颜色"`
+	//Perm     string `json:"perm" description:"日志文件权限"`
+}
+
+func getDefaultLogConfig() logConfig {
+	return logConfig{
+		FileName: "",
+		MaxLines: 0,
+		MaxSize:  1 << 28,
+		Daily:    true,
+		MaxDays:  31, //我就是喜欢31天，咋滴，不喜欢你就自己改-_-!
+		Rotate:   true,
+		Level:    logs.LevelTrace,
+		//Perm:     "",
+	}
 }