Merge branch 'cygx_14.2' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

models/industrial_management.go

@@ -920,3 +920,11 @@ func GetNewArticleDetailByIndustrialIdscondition(pars []interface{}, condition s
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
+
+// UpdateIndustrialManagementTimeLineData   更新时间线关联对应最新文章的数据信息
+func UpdateIndustrialManagementTimeLineData(industrialManagementId int, timeLineData string) (err error) {
+	o := orm.NewOrm()
+	sql := `UPDATE cygx_industrial_management SET time_line_data = ? WHERE  industrial_management_id = ?   `
+	_, err = o.Raw(sql, timeLineData, industrialManagementId).Exec()
+	return
+}

models/resource_data.go

@@ -90,7 +90,7 @@ func GetResourceDataListCondition(condition string, pars []interface{}, startSiz
 	if condition != "" {
 		sql += condition
 	}
-	sql += `  ORDER BY search_order_time DESC   LIMIT ?,? `
+	sql += `  ORDER BY  sort DESC , search_order_time DESC   LIMIT ?,? `
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }

services/es_comprehensive.go

@@ -1575,7 +1575,7 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
 	}
 	activityIds = append(activityIds, "0")
 
-	conditionActivity := " AND IF   ( source IN('activity') , source_id IN (" + strings.Join(activityIds, ",") + ") != 31 ,1=1 )"
+	conditionActivity := " AND IF   ( source IN('activity') , source_id IN (" + strings.Join(activityIds, ",") + ")  ,1=1 )"
 	keyWord = "%" + keyWord + "%"
 	var conditionTitle string
 	var parsTitle []interface{}

services/industrial_management.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"golang.org/x/net/html"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
 	"strconv"
@@ -1170,3 +1171,93 @@ func GetCygxIndustryFllowListTypeMapByMobile(mobile string) (mapFollowTypeResp m
 
 	return
 }
+
+//func init_14-2() {
+//	//IndustrialManagementTimeLineDateList3(127)
+//
+//	list, err := models.IndustrialManagementAll()
+//	if err != nil {
+//		fmt.Println("Error marshaling to JSON:", err)
+//		return
+//	}
+//	fmt.Println(len(list))
+//	for k, v := range list {
+//		fmt.Println(k)
+//		time.Sleep(200 * time.Millisecond)
+//		if v.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+//			continue
+//		}
+//		IndustrialManagementTimeLineDateList3(v.IndustrialManagementId)
+//	}
+//}
+
+// 时间线关联文章的三条数据
+func IndustrialManagementTimeLineDateList3(industrialManagementId int) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go utils.SendAlarmMsg("修改时间线关联文章的三条数据信息失败"+err.Error(), 2)
+		}
+	}()
+
+	list, e := models.GetTimeLineReportIndustrialList(0, industrialManagementId, 0, 3)
+	if e != nil {
+		err = errors.New("GetCompanySellerAndShareMobileByRai, Err: " + e.Error())
+		return
+	}
+
+	type TimeLineReportItem struct {
+		Title       string `description:"标题"`
+		PublishDate string `description:"发布时间"`
+	}
+
+	var listData []*TimeLineReportItem
+	for _, v := range list {
+		item := new(TimeLineReportItem)
+		if v.Resource == 3 {
+			item.Title, _ = extractTextBeforePeriodOrNewline(v.Content)
+			fmt.Println("Title", item.Title)
+		} else {
+			item.Title = v.Title
+		}
+		item.PublishDate = utils.TimeRemoveHms2(v.PublishTime)
+		listData = append(listData, item)
+	}
+
+	jsonData, err := json.Marshal(listData)
+	if err != nil {
+		fmt.Println("Error marshaling to JSON:", err)
+		return
+	}
+	err = models.UpdateIndustrialManagementTimeLineData(industrialManagementId, string(jsonData))
+	return err
+}
+
+func extractTextBeforePeriodOrNewline(htmlContent string) (string, error) {
+	var builder strings.Builder
+	reader := strings.NewReader(htmlContent)
+	z := html.NewTokenizer(reader)
+
+	for {
+		tokenType := z.Next()
+		switch tokenType {
+		case html.ErrorToken:
+			// End of document
+			return builder.String(), nil
+		case html.TextToken:
+			text := string(z.Text())
+			//fmt.Println("text", text)
+			if idx := strings.Index(text, "。"); idx != -1 {
+				builder.WriteString(text[:idx+len("。")])
+				return builder.String(), nil
+			} else {
+				return text, nil
+			}
+			builder.WriteString(text)
+		}
+	}
+}
+
+//func init_14_2() {
+//SELECT  * FROM cygx_resource_data WHERE  source_id  IN (SELECT article_id  FROM   cygx_article WHERE series_name IN ('行业深度','季度策略') )   AND source = 'article'
+//}