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

controllers/activity.go

@@ -961,7 +961,7 @@ func (this *ActivityCoAntroller) Detail() {
 					}
 				}
 				for k, v := range industrialList {
-					if mapIndustrial[v.IndustrialManagementId] > 0 {
+					if mapIndustrial[v.IndustrialManagementId] > 0 && !industrialList[k].IsResearch {
 						industrialList[k].IsJump = true
 					}
 					industrialList[k].IndustryNewLabel = industryNewMap[v.IndustrialManagementId]
@@ -3007,27 +3007,36 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 
 	// 查研观向7.4-判断标签是否为产业, 为产业时是否跳转资源包
 	if label != "" {
-		sourceIndustry, e := models.GetSourceIndustryByName(label)
+		industry, e := models.GetIndustryByName(label)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取标签产业资源包失败, Err:" + e.Error()
+			br.ErrMsg = "获取标签产业失败, Err:" + e.Error()
 			return
 		}
-		if sourceIndustry != nil {
-			resp.IndustrialManagementId = sourceIndustry.IndustrialManagementId
-			resp.IsJump = true
-			if sourceIndustry.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
-				resp.IsResearch = true
-			}
+		if industry != nil {
 			// 产业新标签
-			industryIds := []int{sourceIndustry.IndustrialManagementId}
+			industryIds := []int{industry.IndustrialManagementId}
 			industryNewMap, e := services.GetIndustryNewLabelMap(industryIds)
 			if e != nil {
 				br.Msg = "获取信息失败"
 				br.ErrMsg = "获取产业新标签失败, Err: " + e.Error()
 				return
 			}
-			resp.IndustryNewLabel = industryNewMap[sourceIndustry.IndustrialManagementId]
+			resp.IndustryNewLabel = industryNewMap[industry.IndustrialManagementId]
+			sourceIndustry, e := models.GetSourceIndustryByName(label)
+			if e != nil && e.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取标签产业资源包失败, Err:" + e.Error()
+				return
+			}
+			if sourceIndustry != nil {
+				resp.IndustrialManagementId = sourceIndustry.IndustrialManagementId
+				resp.IsJump = true
+				// 研选产业不跳资源包
+				if sourceIndustry.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+					resp.IsJump = false
+				}
+			}
 		}
 	}
 

controllers/report_billboard.go

@@ -83,8 +83,6 @@ func (this *ReportBillboardController) FllowList() {
 	nowTime := time.Now().Local()
 	startTime := nowTime.AddDate(0, -1, 0)
 	endTime := nowTime.AddDate(0, 0, -1)
-	// TODO:方便测试，暂时调整
-	endTime = nowTime
 	condition += ` AND idf.create_time BETWEEN ? AND ?`
 	pars = append(pars, startTime, endTime)
 
@@ -225,8 +223,6 @@ func (this *ReportBillboardController) ReadList() {
 		nowTime := time.Now().Local()
 		startTime := nowTime.AddDate(0, -1, 0)
 		endTime := nowTime.AddDate(0, 0, -1)
-		// TODO:方便测试，暂时调整
-		endTime = nowTime
 		collectCond += ` AND ac.create_time BETWEEN ? AND ?`
 		collectPars = append(collectPars, startTime, endTime)
 		collectList, e := models.GetReportCollectionBillboardList(topNum, collectPars, collectCond)

models/industrial_management.go

@@ -606,9 +606,17 @@ func GetSourceIndustryByName(industryName string) (item *IndustrialManagement, e
 			INNER JOIN cygx_industrial_article_group_management AS mg ON mg.industrial_management_id = m.industrial_management_id
 			INNER JOIN cygx_article AS a ON a.article_id = mg.article_id AND a.article_type != 'lyjh'
 			WHERE
-				1 = 1 AND m.industry_name = ? AND a.publish_status = 1
+				1 = 1 AND m.industry_name = ? AND a.publish_status = 1 AND a.category_name != "买方研选"
 			GROUP BY
 				m.industrial_management_id`
 	err = orm.NewOrm().Raw(sql, industryName).QueryRow(&item)
 	return
 }
+
+
+// GetIndustryByName 通过名称获取产业
+func GetIndustryByName(industryName string) (item *IndustrialManagement, err error) {
+	sql := `SELECT * FROM cygx_industrial_management WHERE industry_name = ? LIMIT 1`
+	err = orm.NewOrm().Raw(sql, industryName).QueryRow(&item)
+	return
+}

services/industrial_management.go

@@ -242,13 +242,23 @@ func GetIndustryNewLabelMap(industryIds []int) (labelMap map[int]bool, err error
 	// 判断产业是否为新
 	nowTime := time.Now().Local()
 	threeMonthBefore := nowTime.AddDate(0, -3, 0)
-	nullTime, _ := time.Parse(utils.FormatDateTime, "0001-01-01 00:00:00")
+	nullTime, _ := time.ParseInLocation(utils.FormatDateTime, "0001-01-01 00:00:00", time.Local)
+	industryMap := make(map[int]*models.IndustryArticleMinMaxPublishTime, 0)
 	for i := range industryTimeList {
-		// 最早发布时间为空 / 最早发布时间在三个月前之后
-		if industryTimeList[i].MinPublishTime == nullTime || (industryTimeList[i].MinPublishTime.After(threeMonthBefore)) {
-			labelMap[industryTimeList[i].IndustrialManagementId] = true
+		industryMap[industryTimeList[i].IndustrialManagementId] = industryTimeList[i]
+	}
+	for i := range industryIds {
+		iid := industryIds[i]
+		item := industryMap[iid]
+		if item != nil {
+			// 最早发布时间为空 / 最早发布时间在三个月前之后
+			if item.MinPublishTime.Equal(nullTime) || (item.MinPublishTime.After(threeMonthBefore)) {
+				labelMap[iid] = true
+			}
+		} else {
+			// 产业无报告, 则为新产业
+			labelMap[iid] = true
 		}
 	}
-
 	return
 }

services/report_billboard.go

@@ -20,8 +20,6 @@ func UpdateDailyMonthReadBillboard(cont context.Context) (err error) {
 	nowTime := time.Now().Local()
 	startTime := nowTime.AddDate(0, -1, 0)
 	endTime := nowTime.AddDate(0, 0, -1)
-	// TODO:方便测试，暂时调整
-	endTime = nowTime
 	list, e := models.GetTopReadRecordArticleListFromSource(startTime, endTime)
 	if e != nil {
 		err = errors.New("获取阅读量排行榜失败, Err: " + e.Error())

services/task.go

@@ -87,9 +87,7 @@ func Task() {
 		getYiDongActivityMeeting := task.NewTask("getYiDongActivityMeeting", "0 */10 * * * *", GetYiDongActivityMeeting) //同步易董的活动信息
 		task.AddTask("getYiDongActivityMeeting", getYiDongActivityMeeting)
 
-		// TODO:方便测试，暂时调整
-		//updateDailyMonthReadBillboard := task.NewTask("updateDailyMonthReadBillboard", "0 0 3 * * *", UpdateDailyMonthReadBillboard) // 每日3:00更新阅读飙升榜单
-		updateDailyMonthReadBillboard := task.NewTask("updateDailyMonthReadBillboard", "0 */2 * * * *", UpdateDailyMonthReadBillboard) // 每日两分钟更新阅读飙升榜单
+		updateDailyMonthReadBillboard := task.NewTask("updateDailyMonthReadBillboard", "0 0 3 * * *", UpdateDailyMonthReadBillboard) // 每日3:00更新阅读飙升榜单
 		task.AddTask("updateDailyMonthReadBillboard", updateDailyMonthReadBillboard)
 
 		dotongbuShangHai := task.NewTask("dotongbuShangHai", "0 */20 * * * *", DotongbuShangHai) //把信息同步到上海策略品台