Merge branch 'cygx_4.0' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/research.go

@@ -158,6 +158,9 @@ func (this *MobileResearchController) ArticleNewList() {
 
 // @Title KOL榜列表
 // @Description KOL榜列表接口
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
+// @Param   ThemeType   query   int  true       "主题类型，1关注度、2更新时间 "
 // @Success 200 {object} models.DepartmentListResp
 // @router /kolList [get]
 func (this *MobileResearchController) KolList() {
@@ -172,7 +175,32 @@ func (this *MobileResearchController) KolList() {
 		br.Ret = 408
 		return
 	}
-	list, err := models.GetDepartmentList(user.UserId)
+	themeType, _ := this.GetInt("ThemeType")
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+	var startSize int
+	if pageSize <= 0 {
+		pageSize = utils.PageSize15
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	startSize = utils.StartIndex(currentIndex, pageSize)
+
+	total, err := models.GetDepartmentlistCount("")
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	var condition string
+	if themeType != 2 {
+		condition = `ORDER BY fllow_num DESC `
+	} else {
+		condition = `ORDER BY publish_date DESC `
+	}
+
+	list, err := models.GetDepartmentList(condition, user.UserId, startSize, pageSize)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
@@ -189,6 +217,7 @@ func (this *MobileResearchController) KolList() {
 		if v.FllowNum > 0 {
 			list[k].IsFollow = true
 		}
+		list[k].PublishDate = utils.StrTimeToTime(v.PublishDate).Format(utils.FormatDate) //时间字符串格式转时间格式
 		for _, v2 := range listIndustrial {
 			if v2.DepartmentId == v.DepartmentId {
 				if departmentMap["D"+strconv.Itoa(v2.DepartmentId)+"In"+strconv.Itoa(v2.IndustrialManagementId)] == "" && len(list[k].List) < 4 {
@@ -199,6 +228,8 @@ func (this *MobileResearchController) KolList() {
 		}
 	}
 	resp := new(models.DepartmentListResp)
+	page := paging.GetPaging(currentIndex, pageSize, total)
+	resp.Paging = page
 	resp.List = list
 	br.Ret = 200
 	br.Success = true
@@ -427,3 +458,133 @@ func (this *MobileResearchController) ThemeDetail() {
 	br.Msg = "获取成功"
 	br.Data = resp
 }
+
+// @Title 研选作者详情
+// @Description 研选作者详情接口
+// @Param   DepartmentId   query   int  true       "作者ID"
+// @Success 200 {object} models.DepartmentDetailResp
+// @router /departmentId/detail [get]
+func (this *MobileResearchController) DepartmentIdDetail() {
+	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
+	}
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+	var startSize int
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	startSize = paging.StartIndex(currentIndex, pageSize)
+	departmentId, _ := this.GetInt("DepartmentId")
+	if departmentId < 1 {
+		br.Msg = "请输入作者ID"
+		return
+	}
+	var condition string
+	var pars []interface{}
+	articleTypeIds, err := services.GetYanXuanArticleTypeIds()
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "GetYanXuanArticleTypeIds,Err:" + err.Error()
+		return
+	}
+	if articleTypeIds != "" {
+		condition = ` AND a.article_type_id IN (` + articleTypeIds + `)  `
+	} else {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "研选分类ID不能为空"
+		return
+	}
+	resp := new(models.DepartmentDetailResp)
+	detail, err := models.GetDepartmentDetail(user.UserId, departmentId)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取作者信息失败,Err:" + err.Error()
+		return
+	}
+	resp.DepartmentId = detail.DepartmentId
+	resp.NickName = detail.NickName
+	resp.ImgUrl = detail.ImgUrl
+	resp.FllowNum = detail.FllowNum
+	resp.ArticleNum = detail.ArticleNum
+	resp.CollectNum = detail.CollectNum
+	if detail.MyFllowNum > 0 {
+		resp.IsFllow = true
+	}
+
+	condition = `  AND a.department_id = ` + strconv.Itoa(departmentId)
+	condition += `   AND a.article_type_id IN (` + articleTypeIds + `) `
+	total, err := models.GetArticleResearchCount(condition, pars)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "GetArticleResearchCount,Err:" + err.Error()
+		return
+	}
+	list, err := models.GetArticleResearchList(condition, pars, startSize, pageSize, user.UserId)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+		return
+	}
+	list, err = services.HandleArticleCategoryImg(list)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "HandleArticleCategoryImg,Err:" + err.Error()
+		return
+	}
+	//处理对应的文章类型标签按钮
+	nameMap, styleMap, err := services.GetArticleTypeMap()
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "GetArticleTypeMap Err:" + err.Error()
+		return
+	}
+
+	//resp := new(models.ArticleResearchListResp)
+	for _, v := range list {
+		item := models.ArticleResearchResp{
+			ArticleId:       v.ArticleId,
+			ArticleTypeId:   v.ArticleTypeId,
+			Title:           v.Title,
+			PublishDate:     v.PublishDate,
+			DepartmentId:    v.DepartmentId,
+			NickName:        v.NickName,
+			IsCollect:       v.IsCollect,
+			Pv:              v.Pv,
+			CollectNum:      v.CollectNum,
+			Abstract:        v.Abstract,
+			Annotation:      v.Annotation,
+			ImgUrlPc:        v.ImgUrlPc,
+			ArticleTypeName: nameMap[v.ArticleTypeId],
+			ButtonStyle:     styleMap[v.ArticleTypeId],
+			List:            v.List,
+		}
+		resp.List = append(resp.List, &item)
+	}
+
+	condition = ` AND a.department_id =  ` + strconv.Itoa(departmentId)
+	listIndustrial, err := models.GetIndustrialManagementNewList(condition)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+		return
+	}
+	page := paging.GetPaging(currentIndex, pageSize, total)
+	resp.ListIndustrial = listIndustrial
+	resp.Paging = page
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

models/activity.go

@@ -225,7 +225,7 @@ type CygxActivityResp struct {
 // 列表
 func GetCygxActivityList(condition string, pars []interface{}, sortTime string, startSize, pageSize int) (items []*CygxActivity, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT	activity_id, label,temporary_label,is_show_subject_name, MAX( art.activity_time ) AS timesort, MIn( art.activity_time ) AS mintimesort , yidong_activity_id , activity_type_id 
+	sql := `SELECT	activity_id,city, label,temporary_label,is_show_subject_name, MAX( art.activity_time ) AS timesort, MIn( art.activity_time ) AS mintimesort , yidong_activity_id , activity_type_id 
 		FROM cygx_activity as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition

models/activity_type.go

@@ -55,6 +55,9 @@ type CygxActivityLabelList struct {
 	IsExternalLabel   bool   `description:"是否为外部资源"`
 	IsShowSubjectName int    `description:"小程序内是否展示标的名称 1是 ，0否 默认0 "`
 	TemporaryLabel    string `description:"临时标签"`
+	TripStatus        int    `description:"行程进行状态 1：预报名，2：确定行程"`
+	City              string `description:"城市"`
+	Days              int    `description:"天数"`
 }
 
 // 列表

models/article_department.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 
@@ -17,15 +18,18 @@ type CygxArticleDepartment struct {
 type DepartmentResp struct {
 	DepartmentId int    `description:"作者ID"`
 	CreateTime   string `description:"创建时间"`
+	PublishDate  string `description:"更新时间"`
 	NickName     string `description:"昵称"`
 	ImgUrl       string `description:"头像链接"`
 	IsFollow     bool   `description:"是否关注"`
+	IsHot        bool   `description:"是否标红"`
 	FllowNum     int    `description:"关注数量"`
 	List         []*IndustrialDepartmentListResp
 }
 
 type DepartmentListResp struct {
-	List []*DepartmentResp
+	Paging *paging.PagingItem `description:"分页数据"`
+	List   []*DepartmentResp
 }
 
 type CygxArticleDepartmentId struct {
@@ -62,12 +66,13 @@ type IndustrialSubjectList struct {
 }
 
 // 作者列表
-func GetDepartmentList(userId int) (items []*DepartmentResp, err error) {
+func GetDepartmentList(condition string, userId, startSize, pageSize int) (items []*DepartmentResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
 			d.nick_name,
 			d.department_id,
 			d.img_url,
+			MAX( a.publish_date ) AS publish_date,
 			( SELECT count( 1 ) FROM cygx_article_department_follow AS f  WHERE f.department_id = d.department_id  AND user_id =?  AND f.type= 1  ) AS fllow_num,
 			( SELECT count( 1 ) FROM cygx_article_department_follow  AS f INNER JOIN wx_user AS u ON u.user_id = f.user_id  WHERE f.department_id = d.department_id AND f.type= 1 ) +( SELECT count( 1 ) FROM cygx_article_collect AS ac INNER JOIN wx_user AS u ON u.user_id = ac.user_id  WHERE ac.article_id IN (SELECT article_id FROM cygx_article WHERE department_id = d.department_id ) 	AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( ac.create_time )  ) AS sum_num
 		FROM
@@ -78,10 +83,58 @@ func GetDepartmentList(userId int) (items []*DepartmentResp, err error) {
 			AND a.article_type_id > 0 
 			AND publish_status = 1 
 		GROUP BY
-				d.department_id
-		ORDER BY
-			sum_num DESC
-			LIMIT 15`
-	_, err = o.Raw(sql, userId).QueryRows(&items)
+					d.department_id ` + condition + ` LIMIT ?,?`
+	_, err = o.Raw(sql, userId, startSize, pageSize).QueryRows(&items)
 	return
 }
+
+// 用户收藏榜start
+type DepartmentDetailResp struct {
+	DepartmentId   int    `description:"作者Id"`
+	NickName       string `description:"作者昵称"`
+	ImgUrl         string `description:"图片链接"`
+	FllowNum       int    `description:"多少人关注"`
+	ArticleNum     int    `description:"文章数量"`
+	CollectNum     int    `description:"收藏人数"`
+	IsFllow        bool   `description:"是否关注"`
+	List           []*ArticleResearchResp
+	ListIndustrial []*IndustrialManagementNewResp
+	Paging         *paging.PagingItem
+}
+
+type IndustrialManagementNewResp struct {
+	IndustrialManagementId int    `description:"产业Id"`
+	IndustryName           string `description:"产业名称"`
+	IsHot                  bool   `description:"是否是热门"`
+	ArticleReadNum         int    `description:"文章阅读数量"`
+}
+
+type DepartmentDetail struct {
+	DepartmentId int    `description:"作者Id"`
+	NickName     string `description:"作者昵称"`
+	ImgUrl       string `description:"图片链接"`
+	FllowNum     int    `description:"多少人关注"`
+	ArticleNum   int    `description:"文章数量"`
+	CollectNum   int    `description:"收藏人数"`
+	IsFllow      bool   `description:"是否关注"`
+	MyFllowNum   int    `description:"本人是否关注"`
+}
+
+// 作者详情
+func GetDepartmentDetail(userId, departmentId int) (item DepartmentDetail, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+			d.department_id,
+			d.nick_name,
+			d.img_url,
+			( SELECT count( 1 ) FROM cygx_article_department_follow AS af WHERE af.user_id = ? AND af.department_id = d.department_id AND af.type= 1 ) AS my_fllow_num,
+			( SELECT count( 1 ) FROM cygx_article_department_follow AS f INNER JOIN wx_user as u ON  u.user_id = f.user_id   WHERE f.department_id = d.department_id  AND f.type= 1 ) AS fllow_num,
+			( SELECT count( 1 ) FROM cygx_article AS a WHERE a.department_id = d.department_id  ) AS article_num,
+			( SELECT count( 1 ) FROM cygx_article_collect  AS c INNER JOIN wx_user as u ON  u.user_id = c.user_id   WHERE c.article_id IN (SELECT  article_id FROM cygx_article AS a WHERE a.department_id = d.department_id )) AS collect_num
+		FROM
+			cygx_article_department AS d 
+		WHERE
+			d.department_id = ?`
+	err = o.Raw(sql, userId, departmentId).QueryRow(&item)
+	return
+} //end

models/industrial_management.go

@@ -84,7 +84,7 @@ type IndustryVideoDetailResp struct {
 	AuthInfo      *UserPermissionAuthInfo
 }
 
-//产业列表
+// 产业列表
 func GetIndustrialManagementAllCount(condition string) (count int, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
@@ -106,7 +106,7 @@ func GetIndustrialManagementAllCount(condition string) (count int, err error) {
 	return
 }
 
-//获取产业下阅读数量第三的产业详情
+// 获取产业下阅读数量第三的产业详情
 func GetIndustrialManagementHot3(chartPermissionId int) (item *IndustrialManagementRep, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_industrial_management WHERE chart_permission_id = ? ORDER BY article_read_num DESC LIMIT 2,1`
@@ -114,7 +114,7 @@ func GetIndustrialManagementHot3(chartPermissionId int) (item *IndustrialManagem
 	return
 }
 
-//产业列表
+// 产业列表
 func GetIndustrialManagementAll(uid int, condition, orderSrt string, startSize, pageSize int, isBillboard bool) (items []*IndustrialManagement, err error) {
 	o := orm.NewOrm()
 	var conditionBillboard string
@@ -145,7 +145,7 @@ func GetIndustrialManagementAll(uid int, condition, orderSrt string, startSize,
 	return
 }
 
-//标的列表
+// 标的列表
 func GetIndustrialSubjectAll(IndustrialManagementId int) (items []*IndustrialSubject, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_industrial_subject WHERE industrial_management_id = ? `
@@ -153,7 +153,7 @@ func GetIndustrialSubjectAll(IndustrialManagementId int) (items []*IndustrialSub
 	return
 }
 
-//获取该产业下最新的文章详情
+// 获取该产业下最新的文章详情
 func GetIndustrialNewArticleDetail(industrialManagementId int) (item *ArticleDetail, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
@@ -170,7 +170,7 @@ ORDER BY
 	return
 }
 
-//获取该产业下最新的文章详情
+// 获取该产业下最新的文章详情
 func GetNewArticleDetailByIndustrialIds(industrialIdArr []int) (items []*IndustrialManagementArticle, err error) {
 	arrLen := len(industrialIdArr)
 	if arrLen == 0 {
@@ -196,7 +196,7 @@ func GetNewArticleDetailByIndustrialIds(industrialIdArr []int) (items []*Industr
 	return
 }
 
-//获取产业数量
+// 获取产业数量
 func GetIndustrialManagementCount(IndustrialManagementId int) (count int, err error) {
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_industrial_management WHERE industrial_management_id=? `
 	o := orm.NewOrm()
@@ -204,7 +204,7 @@ func GetIndustrialManagementCount(IndustrialManagementId int) (count int, err er
 	return
 }
 
-//获取关注数量
+// 获取关注数量
 func GetCountCygxIndustryFllow(industrialManagementId, userId int, condition string) (count int, err error) {
 	sql := `SELECT COUNT(1) AS count FROM cygx_industry_fllow WHERE user_id=? AND industrial_management_id=? ` + condition
 	err = orm.NewOrm().Raw(sql, userId, industrialManagementId).QueryRow(&count)
@@ -218,7 +218,7 @@ func GetIndustrialManagementDetail(industrialManagementId int) (items *Industria
 	return
 }
 
-//获取所有的产业
+// 获取所有的产业
 func GetindustrialManagement() (items []*IndustrialManagementRep, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
@@ -232,7 +232,7 @@ func GetindustrialManagement() (items []*IndustrialManagementRep, err error) {
 	return
 }
 
-//标的列表
+// 标的列表
 func GetIndustrialSubjectAllByIndustrialId(industrialIdArr []int) (items []*IndustrialSubject, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_industrial_subject WHERE industrial_management_id IN  (` + utils.GetOrmInReplace(len(industrialIdArr)) + `)   `
@@ -240,7 +240,7 @@ func GetIndustrialSubjectAllByIndustrialId(industrialIdArr []int) (items []*Indu
 	return
 }
 
-//获取标的列表
+// 获取标的列表
 func GetIndustrialListByarticleId(pars []interface{}, condition string) (items []*IndustrialManagementIdInt, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
@@ -366,3 +366,27 @@ func GetSourceIndustryByName(industryName string) (item *IndustrialManagement, e
 	err = orm.NewOrm().Raw(sql, industryName).QueryRow(&item)
 	return
 }
+
+// 近期更新主题列表
+func GetIndustrialManagementNewList(condition string) (items []*IndustrialManagementNewResp, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+			m.industrial_management_id,
+			m.industry_name,
+			m.article_read_num,
+			MAX( a.publish_date ) AS publish_date 
+		FROM
+			cygx_article AS a
+			INNER JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = a.article_id
+			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = mg.industrial_management_id 
+		WHERE
+			1 = 1
+			AND a.article_type_id > 0
+			AND publish_status = 1 ` + condition + `
+		GROUP BY
+			m.industrial_management_id 
+		ORDER BY
+			publish_date DESC LIMIT 12`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}

models/report.go

@@ -605,3 +605,25 @@ func GetThemeDetail(userId, industrialManagementId int, condition string) (items
 	_, err = o.Raw(sql, userId, industrialManagementId).QueryRows(&items)
 	return
 } //end
+
+func GetDepartmentlistCount(condition string) (count int, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+	count(*) AS count 
+FROM
+	(
+	SELECT
+		COUNT( 1 ) AS count 
+	FROM
+		cygx_article_department AS d
+		INNER JOIN cygx_article AS a ON d.department_id = a.department_id 
+	WHERE
+		1 = 1 
+		AND a.article_type_id > 0 
+		AND publish_status = 1 
+	GROUP BY
+	d.department_id 
+	) c `
+	err = o.Raw(sql).QueryRow(&count)
+	return
+}

routers/commentsRouter.go

@@ -403,6 +403,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_clpt/controllers:MobileResearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_clpt/controllers:MobileResearchController"],
+        beego.ControllerComments{
+            Method: "DepartmentIdDetail",
+            Router: `/departmentId/detail`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_clpt/controllers:MobileResearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_clpt/controllers:MobileResearchController"],
         beego.ControllerComments{
             Method: "HotList",

services/activity.go

@@ -8,6 +8,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"unicode/utf8"
 )
 
 // 获取活动列表查询权限的SQL
@@ -380,6 +381,9 @@ func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivit
 		if v.YidongActivityId != "" {
 			item.IsExternalLabel = true
 		}
+		if utf8.RuneCountInString(v.City) != 2 {
+			item.City = ""
+		}
 		item.IsNew = newLabelMap[v.ActivityId]
 		mapActivity[v.ActivityTypeId] = append(mapActivity[v.ActivityTypeId], item)
 		mapkeyWord[fmt.Sprint(v.ActivityTypeId, "-", item.KeyWord)] = item.KeyWord

services/activity_special.go

@@ -176,6 +176,11 @@ func GetActivityLabelSpecialList(user *models.WxUserItem, conditionActivitySpeci
 	}
 	for k2, v2 := range specialList {
 		v2.Resource = 2
+		if v2.Days == 0 {
+			specialList[k2].TripStatus = 1
+		} else {
+			specialList[k2].TripStatus = 2
+		}
 		specialList[k2].KeyWord = LabelStr(v2.KeyWord, v2.IsShowSubjectName, v2.TemporaryLabel)
 		specialList[k2].ImgUrlBg = "https://hzstatic.hzinsights.com/static/temp/20220426202204/20220426/XDLLsjC9XAAy8LIzQr7GsjrBbtX6.png"
 		specialList[k2].ImgUrlBg = utils.ACTIVITY_ZXDY_ImgUrl3