Merge branch 'cygx/cygx_15_0_1' of http://8.136.199.33:3000/hongze/hz_crm_api

controllers/cygx/report_selection.go

@@ -208,6 +208,7 @@ func (this *ReportSelectionController) PreserveAndPublish() {
 	//	existMap[v.ChartPermissionId] = v.ChartPermissionId
 	//}
 	go cygxService.UpdateReportSelectionResourceData(req.ArticleId) //首页最新页面数据逻辑处理 V11.1.1
+	go cygxService.UpdateReportSelectionSubjectNameList()           //获取报告精选最新一期标的名称
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"
@@ -582,6 +583,7 @@ func (this *ReportSelectionController) PublishAndCancel() {
 		return
 	}
 	go cygxService.UpdateReportSelectionResourceData(articleId) //首页最新页面数据逻辑处理 V11.1.1
+	go cygxService.UpdateReportSelectionSubjectNameList()       //获取报告精选最新一期标的名称
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"
@@ -969,6 +971,7 @@ func (this *ReportSelectionController) VisibleRange() {
 		return
 	}
 	go cygxService.UpdateReportSelectionResourceData(articleId) //首页最新页面数据逻辑处理 V11.1.1
+	go cygxService.UpdateReportSelectionSubjectNameList()       //获取报告精选最新一期标的名称
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"

controllers/cygx/search_keyword.go

@@ -50,10 +50,10 @@ func (this *SearchKeywordController) HostKeywordList() {
 	startSize = utils.StartIndex(currentIndex, pageSize)
 	var condition string
 	var pars []interface{}
-	currentTime := time.Now()
-	starTime := currentTime.AddDate(0, 0, -8).Format("2006-01-02") + " 00:00:00"
-	endTime := currentTime.AddDate(0, 0, -1).Format("2006-01-02") + " 23:59:59"
-	condition += ` AND create_time < ` + "'" + endTime + "'" + `AND create_time > ` + "'" + starTime + "'"
+	starTime := time.Now().AddDate(0, 0, -8).Format(utils.FormatDate)
+	endTime := time.Now().Format(utils.FormatDate)
+	condition += ` AND create_time > ? AND create_time < ?  AND user_id > 0 `
+	pars = append(pars, starTime, endTime)
 	total, err := cygx.GetSearchKeyWordCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"

models/cygx/report_selection.go

@@ -370,3 +370,11 @@ func GetArticleInfoByIdAndTable(table string, articleId int) (item *CygxArticleI
 	err = o.Raw(sql, articleId).QueryRow(&item)
 	return
 }
+
+// 获取最新一期
+func GetCygxReportSelectionInfoBestNew() (item *CygxReportSelectionRep, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT * FROM cygx_report_selection WHERE   publish_status = 1  ORDER BY  article_id  DESC  LIMIT  1  `
+	err = o.Raw(sql).QueryRow(&item)
+	return
+}

models/cygx/search_keyword.go

@@ -28,12 +28,22 @@ func GetSearchKeyWordCount(condition string, pars []interface{}) (count int, err
 
 // 获取搜索关键词列表
 func GetSearchKeyWordList(condition string, pars []interface{}, startSize, pageSize int) (items []*KeyWordList, err error) {
-	sql := `SELECT COUNT( key_word ) AS key_word_num, key_word FROM cygx_search_key_word WHERE 1= 1`
+	o := orm.NewOrmUsingDB("hz_cygx")
+	//sql := `SELECT COUNT( key_word ) AS key_word_num, key_word FROM cygx_search_key_word WHERE 1= 1`
+
+	sql := `SELECT
+				key_word,
+				MAX(id) as max_id ,
+				COUNT( DISTINCT user_id ) AS key_word_num 
+			FROM
+				cygx_search_key_word 
+			WHERE
+				1 = 1 `
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` GROUP BY key_word ORDER BY COUNT( key_word ) DESC LIMIT ?,? `
-	o := orm.NewOrmUsingDB("hz_cygx")
+	sql += ` GROUP BY key_word ORDER BY key_word_num DESC, max_id DESC LIMIT ?,? `
+
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }

services/cygx/report_selection.go

@@ -0,0 +1,59 @@
+package cygx
+
+import (
+	"errors"
+	"fmt"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/services/alarm_msg"
+	"strings"
+	"time"
+)
+
+//func init() {
+//	UpdateReportSelectionSubjectNameList()
+//}
+
+// 获取报告精选最新一期标的名称
+func UpdateReportSelectionSubjectNameList() {
+	time.Sleep(2 * time.Second)
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println("err：", err)
+			go alarm_msg.SendAlarmMsg("获取报告精选最新一期标的名称，UpdateReportSelectionSubjectNameList Err："+err.Error(), 3)
+		}
+	}()
+	detail, e := cygx.GetCygxReportSelectionInfoBestNew()
+	if e != nil {
+		err = errors.New("GetCygxReportSelectionInfoBestNew, Err: " + e.Error())
+		return
+	}
+
+	articleId := detail.ArticleId
+	listSelectionLog, e := cygx.GetReportSelectionlogListAll(articleId)
+	if e != nil {
+		err = errors.New("GetReportSelectionlogListAll, Err: " + e.Error())
+		return
+	}
+
+	var keyNames []string
+	for _, v := range listSelectionLog {
+		if v.ThirdName != "" {
+			keyNames = append(keyNames, v.ThirdName)
+		} else if v.SubjectName != "" {
+			keyNames = append(keyNames, v.SubjectName)
+		} else {
+			keyNames = append(keyNames, v.IndustrialManagementNames)
+		}
+	}
+
+	keyNameStr := strings.Join(keyNames, ",")
+	keyNameStr = strings.Replace(keyNameStr, "/", ",", -1)
+	e = cygx.CygxConfigUpdateByCode(keyNameStr, "cygx_report_selection_subject")
+	if e != nil {
+		err = errors.New("CygxConfigUpdateByCode, Err: " + e.Error())
+		return
+	}
+	return
+
+}