xingzai 2 vuotta sitten
vanhempi
commit
5268298304
3 muutettua tiedostoa jossa 18 lisäystä ja 8 poistoa
  1. 5 1
      services/article.go
  2. 12 6
      services/tactics.go
  3. 1 1
      utils/config.go

+ 5 - 1
services/article.go

@@ -863,7 +863,10 @@ func HandleArticleListByApi(artcleId int) (err error) {
 			}
 		}
 		//是否属于纪要库的数据
-		if _, has := summaryMap[v.CategoryId]; has {
+		//if _, has := summaryMap[v.CategoryId]; has {
+		//	v.IsSummary = 1
+		//}
+		if v.TypeName == "纪要" {
 			v.IsSummary = 1
 		}
 		//排除不属于纪要库类型的文章
@@ -1036,6 +1039,7 @@ func HandleArticleListByApi(artcleId int) (err error) {
 				return err
 			}
 			go UpdateResourceData(v.ArticleId, "article", "add", time.Now().Format(utils.FormatDateTime))
+
 			//fmt.Println(newId)
 			//报告自动归类,以及推送相关模板消息
 			if v.ReportType == 2 {

+ 12 - 6
services/tactics.go

@@ -13,7 +13,7 @@ import (
 	"time"
 )
 
-//同步策略文章
+// 同步策略文章
 func SyncTacticsList() (err error) {
 	defer func() {
 		if err != nil {
@@ -133,7 +133,7 @@ func SyncTacticsList() (err error) {
 	return
 }
 
-//同步策略文章
+// 同步策略文章
 func SyncCygxArticleList() (err error) {
 	defer func() {
 		if err != nil {
@@ -180,7 +180,7 @@ func SyncCygxArticleList() (err error) {
 	return
 }
 
-//body 解析
+// body 解析
 func BodyAnalysis(body string) (expertNumStr, expertContentStr, interviewDateStr string) {
 	body = html.UnescapeString(body)
 	doc, err := goquery.NewDocumentFromReader(strings.NewReader(body))
@@ -284,7 +284,7 @@ func BodyAnalysis(body string) (expertNumStr, expertContentStr, interviewDateStr
 	return
 }
 
-//同步策略,报告文章
+// 同步策略,报告文章
 func SyncTacticsListAddreport(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
@@ -520,7 +520,7 @@ func SyncTacticsListAddreport(cont context.Context) (err error) {
 	return
 }
 
-//同步策略到Es
+// 同步策略到Es
 func SyncTacticsListToEs() (err error) {
 	defer func() {
 		if err != nil {
@@ -570,7 +570,7 @@ func SyncTacticsListToEs() (err error) {
 	return
 }
 
-//body 解析
+// body 解析
 func BodyAnalysis2(body string) (expertNumStr, expertContentStr, interviewDateStr, fileLink, bodyReturn string) {
 	body = html.UnescapeString(body)
 	//fmt.Println(body)
@@ -737,6 +737,12 @@ func GetSummarytoEs(articleId int) (err error) {
 		fmt.Println("GetArticleAll Err:", err.Error())
 		return
 	}
+	if v == nil {
+		return
+	}
+	if v.IsSummary != 1 {
+		return
+	}
 	indexName := utils.IndexName
 	//for _, v := range allList {
 	content := html.UnescapeString(v.Body)

+ 1 - 1
utils/config.go

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