rdluck 3 years ago
parent
commit
6e1cb1fbcb
4 changed files with 24 additions and 11 deletions
  1. 1 1
      controllers/search.go
  2. 8 6
      services/tactics.go
  3. 7 4
      services/task.go
  4. 8 0
      utils/config.go

+ 1 - 1
controllers/search.go

@@ -65,7 +65,7 @@ func (this *SearchController) SearchList() {
 		categoryName := strings.Join(categoryNameArr, ",")
 	*/
 	//indexName := "article_list"
-	indexName := "test_article"
+	indexName := utils.IndexName
 	result, total, err := services.EsMultiMatchFunctionScoreQuery(indexName, keyWord, startSize, pageSize) //services.EsMatchFunctionScoreQuery(indexName, keyWord, startSize, pageSize) //services.EsMatchQuery(indexName, keyWord)
 	//result, total, err := services.EsMultiMatchFunctionScoreQueryFix(indexName, keyWord, startSize, pageSize)
 	if err != nil {

+ 8 - 6
services/tactics.go

@@ -19,11 +19,10 @@ func SyncTacticsList() (err error) {
 		}
 	}()
 	fmt.Println("同步数据")
-	//indexName := "article_list"
-	indexName := "test_article"
-	//endDate := time.Now().AddDate(0, 0, -5).Format(utils.FormatDate)
-	//list, err := models.GetTacticsList(endDate)
-	list, err := models.GetTacticsListAll()
+	indexName := utils.IndexName
+	endDate := time.Now().AddDate(0, 0, -7).Format(utils.FormatDate)
+	list, err := models.GetTacticsList(endDate)
+	//list, err := models.GetTacticsListAll()
 	if err != nil {
 		fmt.Println("GetTacticsList Err:", err.Error())
 		return
@@ -31,7 +30,7 @@ func SyncTacticsList() (err error) {
 	fmt.Println("list len:", len(list))
 
 	for k, v := range list {
-		v.Department="弘则权益研究"
+		v.Department = "弘则权益研究"
 		fmt.Println(k, v.ArticleId)
 
 		publishDate, err := time.Parse(utils.FormatDateTime, v.PublishDate)
@@ -75,6 +74,9 @@ func SyncTacticsList() (err error) {
 			updateParams["ExpertBackground"] = expertContentStr
 			updateParams["ExpertNumber"] = expertNumStr
 			updateParams["InterviewDate"] = interviewDateStr
+			if v.Department != "弘则权益研究" {
+				v.Department = "弘则权益研究"
+			}
 			updateParams["Department"] = v.Department
 			whereParam := map[string]interface{}{"article_id": v.ArticleId}
 			err = models.UpdateByExpr(models.CygxArticle{}, whereParam, updateParams)

+ 7 - 4
services/task.go

@@ -2,15 +2,18 @@ package services
 
 import (
 	"fmt"
+	"github.com/astaxie/beego/toolbox"
+	"hongze/hongze_cygx/utils"
+
 	//"github.com/astaxie/beego/cache"
 )
 
 func Task() {
 	fmt.Println("start")
 	//同步数据
-	//syncTacticsList := toolbox.NewTask("syncTacticsList", "0 */5 * * * *", SyncTacticsList)
-	//toolbox.AddTask("syncTacticsList", syncTacticsList)
-	//toolbox.StartTask()
+	syncTacticsList := toolbox.NewTask("syncTacticsList", "0 */5 * * * *", SyncTacticsList)
+	toolbox.AddTask("syncTacticsList", syncTacticsList)
+	toolbox.StartTask()
 	//SyncTacticsList()
 	fmt.Println("end")
 }
@@ -168,7 +171,7 @@ searchItem.Title = title
 searchItem.PublishDate = article.PublishDate
  */
 func CreateIndex() {
-	indexName := "test_article"
+	indexName := utils.IndexName
 	mappingJson := `{
   "mappings": {
     "dynamic": true,

+ 8 - 0
utils/config.go

@@ -30,6 +30,10 @@ var (
 	WxPlatform        = 4 //注册平台,1:日度点评公众号,2:管理后台,3:pc端网站,4:查研观向小程序
 )
 
+var (
+	IndexName string
+)
+
 func init() {
 	RunMode = beego.AppConfig.String("run_mode")
 	config, err := beego.AppConfig.GetSection(RunMode)
@@ -49,6 +53,8 @@ func init() {
 		WxPublicAppId = "wx4a844c734d8c8e56"
 		WxPublicAppSecret = "26c586e7ccb3c575433f0f37797b3eeb"
 		WxPublicId = "gh_b67e0049fb8c"
+		IndexName="cygx_article"
+
 	} else {
 		WxAppId = "wxcc32b61f96720d2f"
 		WxAppSecret = "06894933fafb24dafead7eaae09c08e0"
@@ -61,6 +67,8 @@ func init() {
 		WxPublicAppId = "wx9b5d7291e581233a"
 		WxPublicAppSecret = "f4d52e34021eee262dce9682b31f8861"
 		WxPublicId = "gh_5dc508325c6f"
+
+		IndexName="test_article"
 	}
 }