no message

controllers/report_billboard.go

@@ -1,7 +1,11 @@
 package controllers
 
 import (
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_cygx/models"
+	"hongze/hongze_cygx/utils"
+	"strconv"
+	"time"
 )
 
 //报告榜单
@@ -11,7 +15,7 @@ type ReportBillboardController struct {
 
 // @Title 报告榜单table栏
 // @Description 报告榜单table栏
-// @Success 200 {object} cygx.UserRemarksListResp
+// @Success 200 {object} models.ReportBillboardTableListResp
 // @router /table/list [get]
 func (this *ReportBillboardController) CompanyTableList() {
 	br := new(models.BaseResponse).Init()
@@ -25,7 +29,9 @@ func (this *ReportBillboardController) CompanyTableList() {
 		br.Ret = 408
 		return
 	}
-	List := []*models.ReportBillboardTableResp{{Name: "产业关注", Source: 1}, {Name: "阅读飙升", Source: 2}, {Name: "报告收藏", Source: 3}}
+	ListPermission := []*models.ChartPermission{{PermissionName: utils.YI_YAO_NAME, ChartPermissionId: utils.YI_YAO_ID}, {PermissionName: utils.XIAO_FEI_NAME, ChartPermissionId: utils.XIAO_FEI_ID}, {PermissionName: utils.KE_JI_NAME, ChartPermissionId: utils.KE_JI_ID}, {PermissionName: utils.ZHI_ZAO_NAME, ChartPermissionId: utils.ZHI_ZAO_ID}}
+	ListAllPermission := []*models.ChartPermission{{PermissionName: utils.YI_YAO_NAME, ChartPermissionId: utils.YI_YAO_ID}, {PermissionName: utils.XIAO_FEI_NAME, ChartPermissionId: utils.XIAO_FEI_ID}, {PermissionName: utils.KE_JI_NAME, ChartPermissionId: utils.KE_JI_ID}, {PermissionName: utils.ZHI_ZAO_NAME, ChartPermissionId: utils.ZHI_ZAO_ID}, {PermissionName: utils.CE_LUE_NAME, ChartPermissionId: utils.CE_LUE_ID}}
+	List := []*models.ReportBillboardTableResp{{Name: "产业关注", Source: 1, List: ListPermission}, {Name: "阅读飙升", Source: 2, List: ListPermission}, {Name: "报告收藏", Source: 3, List: ListAllPermission}}
 	resp := new(models.ReportBillboardTableListResp)
 	resp.List = List
 	br.Ret = 200
@@ -33,3 +39,120 @@ func (this *ReportBillboardController) CompanyTableList() {
 	br.Msg = "获取成功"
 	br.Data = resp
 }
+
+// @Title 产业关注榜
+// @Description 获取产业关注榜接口
+// @Param   ChartPermissionId   query   int  true       "分类ID"
+// @Success 200 {object} models.IndustrialManagementList
+// @router /industry/fllowList [get]
+func (this *ReportBillboardController) FllowList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	user := this.User
+	if user == nil {
+		br.Msg = "请重新登录"
+		br.Ret = 408
+		return
+	}
+	uid := user.UserId
+
+	ChartPermissionId, _ := this.GetInt("ChartPermissionId")
+	orderColumn := this.GetString("OrderColumn")
+
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+	var orderSrt string
+	var condition string
+	var startSize int
+	resp := new(models.IndustrialManagementList)
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+
+	startSize = paging.StartIndex(currentIndex, pageSize)
+	if isNewLabel == "1" {
+		condition += ` AND is_new_label = ` + isNewLabel
+	}
+	if isDeepLabel == "1" {
+		condition += ` AND is_deep_label = ` + isDeepLabel
+	}
+	var sqlChartPermissionId string
+	if ChartPermissionId > 0 {
+		sqlChartPermissionId += ` AND man_g.industrial_management_id IN ( SELECT industrial_management_id FROM cygx_industrial_management WHERE chart_permission_id = ` + strconv.Itoa(ChartPermissionId) + ` ) `
+		condition += ` AND man.chart_permission_id IN (` + strconv.Itoa(ChartPermissionId) + `)`
+	}
+	var list []*models.IndustrialManagement
+	total, err := models.GetIndustrialManagementAllCount(condition)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取数量失败,Err:" + err.Error()
+		return
+	}
+	page := paging.GetPaging(currentIndex, pageSize, total)
+	if orderColumn == "" {
+		orderColumn = "NewTime"
+	}
+	if orderColumn == "NewTime" {
+		orderSrt = "update_time DESC"
+	} else {
+		orderSrt = "man.recommended_index DESC,update_time DESC"
+	}
+	if ChartPermissionId == 0 {
+		ChartPermissionId = 20
+	}
+	detailHot3, err := models.GetIndustrialManagementHot3(ChartPermissionId)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取信息失败,Err:" + err.Error()
+		return
+	}
+
+	list, err = models.GetIndustrialManagementAll(uid, condition, orderSrt, startSize, pageSize)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+		return
+	}
+	for k, v := range list {
+		industrialSubjectList, err := models.GetIndustrialSubjectAll(v.IndustrialManagementId)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+			return
+		}
+		list[k].IndustrialSubjectList = industrialSubjectList
+		list[k].LayoutTime = utils.TimeRemoveHms(v.LayoutTime)
+		newArtinfo, err := models.GetIndustrialNewArticleDetail(v.IndustrialManagementId)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+			return
+		}
+		list[k].UpdateTime = utils.TimeRemoveHms(newArtinfo.PublishDate)
+		recordCount, err := models.GetUserToArticleCount(uid, newArtinfo.ArticleId)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取信息失败，Err:" + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(newArtinfo.ArticleId)
+			return
+		}
+		if recordCount == 0 && user.CreatedTime.Before(utils.StrTimeToTime(newArtinfo.PublishDate)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(newArtinfo.PublishDate)) {
+			list[k].IsRed = true
+		}
+		if v.ArticleReadNum >= detailHot3.ArticleReadNum {
+			list[k].IsHot = true
+		}
+	}
+
+	resp.List = list
+	resp.Paging = page
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

models/report.go

@@ -694,6 +694,7 @@ func GetSearchResourceList(condition string) (items []*IndustrialManagementHotRe
 type ReportBillboardTableResp struct {
 	Name   string `description:"名称"`
 	Source int    `description:"类型"`
+	List   []*ChartPermission
 }
 
 //切换列表

utils/constants.go

@@ -72,9 +72,21 @@ const (
 )
 
 const (
-	CHART_PERMISSION_NAME_YANXUAN    = "研选"
-	CHART_PERMISSION_NAME_MF_YANXUAN = "买方研选"
-	CHART_PERMISSION_ID_YANXUAN      = 31
+	CHART_PERMISSION_NAME_YANXUAN    string = "研选"
+	CHART_PERMISSION_NAME_MF_YANXUAN string = "买方研选"
+	CHART_PERMISSION_ID_YANXUAN      int    = 31
+	C_CLASS_ACTIVITY_TYPE_ID         int    = 7 //C类电话会会议ID
+	ANALYST_TELL_ACTIVITY_TYPE_ID    int    = 2 //分析师电话会ID
+	CE_LUE_NAME                      string = "策略"
+	CE_LUE_ID                        int    = 23
+	YI_YAO_NAME                      string = "医药"
+	YI_YAO_ID                        int    = 22
+	XIAO_FEI_NAME                    string = "消费"
+	XIAO_FEI_ID                      int    = 21
+	KE_JI_NAME                       string = "科技"
+	KE_JI_ID                         int    = 20
+	ZHI_ZAO_NAME                     string = "智造"
+	ZHI_ZAO_ID                       int    = 19
 )
 
 const (