Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_fix_need_11-30

models/db.go

@@ -128,6 +128,7 @@ func init() {
 		new(CygxActivitySpecialTrip),
 		new(CygxArticleData),
 		new(CygxArticleComment),
+		new(CygxResourceData),
 	)
 	// 记录ORM查询日志
 	orm.Debug = true

models/resource_data.go

@@ -0,0 +1,51 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type CygxResourceData struct {
+	Id          int       `orm:"column(id);pk"`
+	SourceId    int       `description:"资源ID"`
+	Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
+	Title       string    `description:"标题"`
+	Annotation  string    `description:"核心观点"`
+	CreateTime  time.Time `description:"创建时间"`
+	PublishDate string    `description:"发布时间"`
+	Abstract    string    `description:"摘要"`
+}
+
+//添加
+func AddCygxResourceData(item *CygxResourceData) (lastId int64, err error) {
+	o := orm.NewOrm()
+	lastId, err = o.Insert(item)
+	return
+}
+
+//删除数据
+func DeleteResourceData(sourceId int, source string) (err error) {
+	o := orm.NewOrm()
+	sql := ` DELETE FROM cygx_resource_data WHERE source_id = ? AND source =?  `
+	_, err = o.Raw(sql, sourceId, source).Exec()
+	return
+}
+
+//修改数据
+func UpdateResourceData(sourceId int, source, publishDate string) (err error) {
+	o := orm.NewOrm()
+	sql := `UPDATE cygx_resource_data SET publish_date=?  WHERE source_id=?  AND source =? `
+	_, err = o.Raw(sql, publishDate, sourceId, source).Exec()
+	return
+}
+
+//批量删除
+func DeleteResourceDataList(condition string, pars []interface{}) (err error) {
+	if condition == "" {
+		return
+	}
+	o := orm.NewOrm()
+	sql := `DELETE  FROM cygx_resource_data   WHERE  1=1 ` + condition
+	_, err = o.Raw(sql, pars).Exec()
+	return
+}

models/send_company_user.go

@@ -321,7 +321,7 @@ func GetCompanyOperationRecord(createTime string) (items []*WxUserOpLogDeleteRes
 			FROM
 				company_operation_record AS p 
 			WHERE
-				 operation IN ('move_seller')
+				 1=1
 				 AND p.create_time > '` + createTime + `'  GROUP BY company_id  `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return

services/article.go

@@ -673,7 +673,7 @@ func GetArticleListByApi(cont context.Context) (err error) {
 }
 
 //func init() {
-//	HandleArticleListByApi(5818)
+//	HandleArticleListByApi(7801)
 //}
 
 //处理同步过来的文章
@@ -805,6 +805,8 @@ func HandleArticleListByApi(artcleId int) (err error) {
 			fmt.Println("UpdateArticlePublish Err:", err.Error())
 			return err
 		}
+
+		go UpdateResourceData(artcleId, "article", "delete", time.Now().Format(utils.FormatDateTime))
 		go models.UpdateCygxArticleCeluePush(artcleId)
 		return err
 	}
@@ -932,6 +934,7 @@ func HandleArticleListByApi(artcleId int) (err error) {
 				//fmt.Println("触发推送规则")
 				//更新字数大于一百字触发推送规则
 				go DoArticleOnenIdWxTemplateMsg(v.ArticleId)
+				go UpdateResourceData(v.ArticleId, "article", "update", time.Now().Format(utils.FormatDateTime))
 			}
 			var isCustom bool
 			updateParams := make(map[string]interface{})
@@ -1021,6 +1024,7 @@ func HandleArticleListByApi(artcleId int) (err error) {
 				fmt.Println("AddCygxArticle Err:", err.Error())
 				return err
 			}
+			go UpdateResourceData(v.ArticleId, "article", "add", time.Now().Format(utils.FormatDateTime))
 			//fmt.Println(newId)
 			//报告自动归类，以及推送相关模板消息
 			if v.ReportType == 2 {

services/chart.go

@@ -64,7 +64,7 @@ func GetChartListByApi(cont context.Context) (err error) {
 	for _, v := range chartAllList {
 		mapAllChartid[v.ChartId] = v.ChartId
 	}
-
+	var chartIdsDelete []int
 	url := utils.ApiUrl + "charts/mp?take=100&skip=0"
 	authorization := utils.ApiAuthorization
 	body, err := PublicGetDate(url, authorization)
@@ -99,10 +99,16 @@ func GetChartListByApi(cont context.Context) (err error) {
 		//如果没有就新增 有就更新
 		if mapChartid[v.ChartId] == 0 {
 			_, err := models.AddCygxChart(item)
+			if item.PublishStatus == 1 {
+				go UpdateResourceData(item.ChartId, "newchart", "add", time.Now().Format(utils.FormatDateTime))
+			}
 			if err != nil {
 				return err
 			}
 		} else {
+			if item.PublishStatus == 0 {
+				chartIdsDelete = append(chartIdsDelete, item.ChartId)
+			}
 			updateParams := make(map[string]interface{})
 			updateParams["Title"] = v.Title
 			updateParams["PtagId"] = v.PtagId
@@ -124,6 +130,12 @@ func GetChartListByApi(cont context.Context) (err error) {
 				return err
 			}
 		}
+
+	}
+
+	fmt.Println("删除的", chartIdsDelete)
+	if len(chartIdsDelete) > 0 {
+		go Deletenewchart(chartIdsDelete)
 	}
 
 	//策略平台图表，记录所有，的显示用户收藏使用

services/resource_data.go

@@ -0,0 +1,51 @@
+package services
+
+import (
+	"fmt"
+	"hongze/hongze_cygx/models"
+	"hongze/hongze_cygx/utils"
+	"strconv"
+	"time"
+)
+
+//同步活动到最新数据表
+func UpdateResourceData(sourceId int, source, doType, publishDate string) (err error) {
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg("同步到最新数据表失败，Err："+err.Error()+"资源ID"+strconv.Itoa(sourceId)+"资源类型"+source+"操作方式"+doType, 3)
+		}
+	}()
+	if doType == "add" {
+		item := new(models.CygxResourceData)
+		item.SourceId = sourceId
+		item.Source = source
+		item.PublishDate = publishDate
+		item.CreateTime = time.Now()
+		_, err = models.AddCygxResourceData(item)
+	} else if doType == "delete" {
+		err = models.DeleteResourceData(sourceId, source)
+	} else if doType == "update" {
+		err = models.UpdateResourceData(sourceId, source, publishDate)
+	}
+	return
+}
+
+//批量删除最新图表数据
+func Deletenewchart(chartIdsDelete []int) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go utils.SendAlarmMsg("批量删除最新图表数据，Err："+err.Error(), 3)
+		}
+	}()
+	lenchartIdsDelete := len(chartIdsDelete)
+	if lenchartIdsDelete == 0 {
+		return
+	}
+	var condition string
+	var pars []interface{}
+	condition += ` AND source = 'newchart' AND source_id IN (` + utils.GetOrmInReplace(lenchartIdsDelete) + `) `
+	pars = append(pars, chartIdsDelete)
+	err = models.DeleteResourceDataList(condition, pars)
+	return
+}

utils/config.go

@@ -159,7 +159,7 @@ func init() {
 		WxPublicAppId = "wx4a844c734d8c8e56"
 		WxPublicAppSecret = "26c586e7ccb3c575433f0f37797b3eeb"
 		WxPublicId = "gh_b67e0049fb8c"
-		IndexName = "cygx_article_v0718"
+		IndexName = "cygx_article_v1213"
 		IndexNameArticleHistory = "cygx_article_history_v07_08"
 
 		//接收附件邮箱