rdluck 4 年之前
父节点
当前提交
01537af21e
共有 4 个文件被更改,包括 14 次插入11 次删除
  1. 2 0
      controllers/home.go
  2. 2 2
      models/tactics.go
  3. 6 4
      services/tactics.go
  4. 4 5
      services/task.go

+ 2 - 0
controllers/home.go

@@ -64,6 +64,8 @@ func (this *HomeController) ListHome() {
 		condition = ` AND category_id IN(` + categoryId + `)`
 	}
 
+	condition = ` AND a.category_id NOT IN(85,71)`
+
 	total, err := models.GetHomeCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取信息失败"

+ 2 - 2
models/tactics.go

@@ -34,7 +34,7 @@ func GetTacticsList(endDate string) (list []*Tactics, err error) {
 				INNER JOIN article_content AS b ON a.id=b.article_id
 				INNER JOIN article_category AS c ON a.id=c.article_id
 				INNER JOIN article_categoryinfo AS d ON c.category_id=d.id
-				WHERE a.publish_status=1 AND a.publish_date>=? AND d.id IN (79, 28, 32, 84) `
+				WHERE a.publish_status=1 AND a.publish_date>=? AND d.id IN (28,32,45,50,57,62,71,72,74,79,80,84,85,86,88,89,90) `
 	_, err = o.Raw(sql, endDate).QueryRows(&list)
 	return
 }
@@ -47,7 +47,7 @@ func GetTacticsListAll() (list []*Tactics, err error) {
 			INNER JOIN article_content AS b ON a.id=b.article_id
 			INNER JOIN article_category AS c ON a.id=c.article_id
 			INNER JOIN article_categoryinfo AS d ON c.category_id=d.id
-			WHERE a.publish_status=1 AND d.id IN (79, 28, 32, 84) `
+			WHERE a.publish_status=1 AND d.id IN (28,32,45,50,57,62,71,72,74,79,80,84,85,86,88,89,90) `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }

+ 6 - 4
services/tactics.go

@@ -21,9 +21,9 @@ func SyncTacticsList() (err error) {
 	fmt.Println("同步数据")
 	indexName := "article_list"
 
-	endDate := time.Now().AddDate(0, 0, -5).Format(utils.FormatDate)
-	list, err := models.GetTacticsList(endDate)
-	//list, err := models.GetTacticsListAll()
+	//endDate := time.Now().AddDate(0, 0, -5).Format(utils.FormatDate)
+	//list, err := models.GetTacticsList(endDate)
+	list, err := models.GetTacticsListAll()
 	if err != nil {
 		fmt.Println("GetTacticsList Err:", err.Error())
 		return
@@ -113,7 +113,9 @@ func SyncTacticsList() (err error) {
 			fmt.Println("create doc err:", err.Error())
 			return err
 		}
-
+		doc.Find("a").Each(func(i int, a *goquery.Selection) {
+			a.Remove()
+		})
 		bodyText := doc.Text()
 		item := new(ElasticArticleDetail)
 		item.ArticleId = v.ArticleId

+ 4 - 5
services/task.go

@@ -2,17 +2,16 @@ package services
 
 import (
 	"fmt"
-	"github.com/astaxie/beego/toolbox"
-
 	//"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")
 }