no message

controllers/research.go

@@ -605,22 +605,20 @@ func (this *ResearchController) ArticleNewList() {
 		return
 	}
 	var condition string
-	condition = " AND is_show_yanx  = 1 "
-	list, err := models.GetCygxArticleTypeListCondition(condition)
+	condition = `   AND a.article_type_id > 0  AND publish_status = 1 GROUP BY a.article_id ORDER BY collect_num_order DESC, publish_date DESC LIMIT 15 `
+	list, err := models.GetArticleCollectionList(condition, user.UserId)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 		return
 	}
-	resp := new(models.CygxArticleTypeListResp)
-	for _, v := range list {
-		item := models.CygxArticleTypeResp{
-			ArticleTypeId:   v.ArticleTypeId,
-			ArticleTypeName: v.ArticleTypeName,
-			ButtonStyle:     v.ButtonStyle,
+	for k, v := range list {
+		if v.MyCollectNum > 0 {
+			list[k].IsCollect = true
 		}
-		resp.List = append(resp.List, &item)
 	}
+	resp := new(models.ArticleCollectionLIstResp)
+	resp.List = list
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

routers/commentsRouter.go

@@ -108,8 +108,8 @@ func init() {
 
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
         beego.ControllerComments{
-            Method: "ActivityList",
-            Router: `/list`,
+            Method: "ActivityListNew",
+            Router: `/listNew`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,
@@ -117,8 +117,8 @@ func init() {
 
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
         beego.ControllerComments{
-            Method: "ActivityListNew",
-            Router: `/listNew`,
+            Method: "ActivityListSearch",
+            Router: `/listSearch`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,
@@ -126,8 +126,8 @@ func init() {
 
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
         beego.ControllerComments{
-            Method: "ActivityListSearch",
-            Router: `/listSearch`,
+            Method: "ActivityList",
+            Router: `/list_del_test`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,
@@ -1024,6 +1024,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"],
+        beego.ControllerComments{
+            Method: "ArticleNewList",
+            Router: `/article/newList`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"],
         beego.ControllerComments{
             Method: "ArticleType",

services/industrial_management.go

@@ -11,7 +11,7 @@ import (
 	"time"
 )
 
-//修改标签状态
+// 修改标签状态
 func UpdateIndustrialManagementLabel(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
@@ -41,7 +41,7 @@ func UpdateIndustrialManagementLabel(cont context.Context) (err error) {
 	return
 }
 
-//修改活动状态
+// 修改活动状态
 func UpdateIndustrialManagementSubjectNnames() (err error) {
 	defer func() {
 		if err != nil {
@@ -108,7 +108,7 @@ func ReportBillboardUpdate(cont context.Context) (err error) {
 	return
 }
 
-//修改产业关注数量
+// 修改产业关注数量
 func IndustryFllowCountUpdate() (err error) {
 	defer func() {
 		if err != nil {
@@ -129,7 +129,7 @@ func IndustryFllowCountUpdate() (err error) {
 	return err
 }
 
-//修改文章收藏数量
+// 修改文章收藏数量
 func ArticleCollectCountUpdate() (err error) {
 	defer func() {
 		if err != nil {
@@ -150,7 +150,7 @@ func ArticleCollectCountUpdate() (err error) {
 	return err
 }
 
-//根据行业处理所选的全部赛道字段
+// 根据行业处理所选的全部赛道字段
 func DoXzsChooseSend(chartPermissionName string) string {
 	var allIn string
 	if chartPermissionName == utils.YI_YAO_NAME {
@@ -167,7 +167,7 @@ func DoXzsChooseSend(chartPermissionName string) string {
 	return allIn
 }
 
-//行业关注或者取消关注的时候，对于用户全部赛道的影响
+// 行业关注或者取消关注的时候，对于用户全部赛道的影响
 func IndustryFllowWithTrack(industrialManagementId, count, uid int) (err error) {
 	defer func() {
 		if err != nil {
@@ -272,7 +272,7 @@ func GetIndustryNewLabelMap(industryIds []int) (labelMap map[int]bool, err error
 //	GetIndustrialManagementArticleNewPublishData()
 //}
 
-//批量修改获取产业关联文章的最新发布时间
+// 批量修改获取产业关联文章的最新发布时间
 func GetIndustrialManagementArticleNewPublishData() (err error) {
 	defer func() {
 		if err != nil {
@@ -309,7 +309,7 @@ func GetIndustrialManagementArticleNewPublishData() (err error) {
 	return
 }
 
-//HandleIndustryList预处理产业列表字段
+// HandleIndustryList预处理产业列表字段
 func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUserItem) (items []*models.IndustrialManagement, err error) {
 	userId := user.UserId
 	fllowList, err := models.GetUserFllowIndustrialList(userId)
@@ -432,11 +432,11 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 	industrialIdMap := make(map[string]time.Time)
 	for _, v := range recrodList {
 		industrialManagementIdstr = strings.TrimLeft(v.Parameter, "PageSize=10&CurrentIndex=1&CategoryId=99999&IndustrialManagementId=")
-		if createTime, ok := industrialIdMap[industrialManagementIdstr]; ok{
+		if createTime, ok := industrialIdMap[industrialManagementIdstr]; ok {
 			if createTime.Before(v.CreateTime) {
 				industrialIdMap[industrialManagementIdstr] = v.CreateTime
 			}
-		}else {
+		} else {
 			industrialIdMap[industrialManagementIdstr] = v.CreateTime
 		}
 	}
@@ -452,7 +452,7 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 	timeLineRedMap := make(map[int]bool, 0)
 
 	for _, industrialId := range industrialIdArr {
-		if createTime, ok := industrialIdMap[strconv.Itoa(industrialId)]; ok{
+		if createTime, ok := industrialIdMap[strconv.Itoa(industrialId)]; ok {
 			if createTime.Before(morningMeetingTimeMap[industrialId]) {
 				timeLineRedMap[industrialId] = true
 			}
@@ -505,3 +505,37 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 	items = list
 	return
 }
+
+// 通过文章ID获取文章所关联的产业
+//func GetArticleIndustrialByArticleId() {
+//	var condition string
+//	var pars []interface{}
+//	pars = make([]interface{}, 0)
+//	condition = ` AND a.article_id IN (` + utils.GetOrmInReplace(len(articleIds)) + `)`
+//	pars = append(pars, articleIds)
+//	articleIds = strings.TrimRight(articleIds, ",")
+//	silcearticleIds := strings.Split(articleIds, ",")
+//	var parsindustrial []interface{}
+//	parsindustrial = make([]interface{}, 0)
+//	articleIdList := make([]string, 0)
+//	for _, v := range silcearticleIds {
+//		articleIdList = append(articleIdList, v)
+//	}
+//	conditionindustrial := ` AND mg.article_id IN (  ` + utils.GetOrmInReplace(len(silcearticleIds)) + ` )  `
+//	parsindustrial = append(parsindustrial, articleIdList)
+//	industrialList, err := models.GetIndustrialListByarticleId(parsindustrial, conditionindustrial)
+//	if err != nil {
+//		return
+//	}
+//	industrialMap := make(map[int][]*models.IndustrialManagementResp)
+//	if len(industrialList) > 0 {
+//		for _, v := range industrialList {
+//			item := new(models.IndustrialManagementResp)
+//			//item.ArticleId = v.ArticleId
+//			item.IndustrialManagementId = v.IndustrialManagementId
+//			item.IndustryName = v.IndustryName
+//			item.ChartPermissionId = v.ChartPermissionId
+//			industrialMap[v.ArticleId] = append(industrialMap[v.ArticleId], item)
+//		}
+//	}
+//}