Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_9.3.1_0

controllers/chart_permission.go

@@ -6,7 +6,7 @@ import (
 	"hongze/hongze_cygx/utils"
 )
 
-//品种
+// 品种
 type ChartPermissionController struct {
 	BaseCommonController
 }
@@ -152,6 +152,7 @@ func (this *ChartPermissionAuthController) ReportDetail() {
 
 // @Title 获取策略下的所有分类
 // @Description 获取策略下的所有分类接口
+// @Param   ChartPermissionId   query   int  false     "行业id"
 // @Success 200 {object} models.ReportMappingResp
 // @router /strategyAll [get]
 func (this *ChartPermissionAuthController) StrategyDetail() {
@@ -166,8 +167,13 @@ func (this *ChartPermissionAuthController) StrategyDetail() {
 		br.Ret = 408
 		return
 	}
+	//默认给策略的ID
+	chartPermissionId, _ := this.GetInt("ChartPermissionId")
+	if chartPermissionId == 0 {
+		chartPermissionId = utils.CE_LUE_ID
+	}
 	uid := user.UserId
-	list, err := models.GetReportMappingStrategyHomeAll()
+	list, err := models.GetReportMappingStrategyHomeAll(chartPermissionId)
 
 	if err != nil {
 		br.Msg = "获取信息失败"
@@ -289,6 +295,10 @@ func (this *ChartPermissionAuthController) ReportDetailV7() {
 			resp.List[k].IsShowSustainable = true
 		}
 	}
+	item := new(models.ChartPermission)
+	item.PermissionName = utils.GU_SHOU_NAME
+	item.ChartPermissionId = utils.GU_SHOU_ID
+	resp.List = append(resp.List, item)
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

controllers/report.go

@@ -1555,11 +1555,11 @@ func (this *ReportController) Detail() {
 		br.Ret = 408
 		return
 	}
-	if user.CompanyId != utils.HZ_COMPANY_ID {
-		br.Msg = "报告编辑中，请稍后"
-		br.IsSendEmail = false
-		return
-	}
+	//if user.CompanyId != utils.HZ_COMPANY_ID {
+	//	br.Msg = "报告编辑中，请稍后"
+	//	br.IsSendEmail = false
+	//	return
+	//}
 	uid := user.UserId
 	articleId, _ := this.GetInt("ArticleId")
 	isBestNew, _ := this.GetBool("IsBestNew")

models/article.go

@@ -214,12 +214,11 @@ func GetArticleDetailByIdStr(articleIdStr string) (items []*ArticleDetail, err e
 func GetArticlePermission(companyId int) (item *ChartPermission, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-			b.* 
+			a.chart_permission_name as  permission_name
 			FROM
 			cygx_report_mapping AS a
-			INNER JOIN chart_permission AS b ON a.chart_permission_id = b.chart_permission_id 
 			WHERE
-			a.category_id = ?`
+			a.category_id = ? LIMIT  1 `
 	err = o.Raw(sql, companyId).QueryRow(&item)
 	//_, err = o.Raw(sql, companyId).QueryRows(&item)
 	return

models/report_mapping.go

@@ -56,7 +56,7 @@ func GetReportMappingStrategyAll() (items []*ReportMapping, err error) {
 }
 
 // 获取策略下面的所有分类
-func GetReportMappingStrategyHomeAll() (items []*ReportMappingHome, err error) {
+func GetReportMappingStrategyHomeAll(chartPermissionId int) (items []*ReportMappingHome, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
 	re.category_id,re.sub_category_name,re.match_type_name
@@ -65,12 +65,12 @@ FROM
 	INNER JOIN cygx_article AS art ON art.category_id = re.category_id 
 WHERE
 	re.report_type = 1 
-	AND re.chart_permission_id = 23 
+	AND re.chart_permission_id = ? 
 GROUP  BY
 	re.match_type_name
 ORDER BY
 	sort DESC , art.publish_date DESC`
-	_, err = o.Raw(sql).QueryRows(&items)
+	_, err = o.Raw(sql, chartPermissionId).QueryRows(&items)
 	return
 }
 
@@ -136,7 +136,7 @@ func GetdetailByCategoryIdSet(categoryId int) (ids string, err error) {
 // 通过分类ID获取详情
 func GetdetailByCategoryIdPush(categoryId int) (item *ReportMapping, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_report_mapping WHERE category_id=? `
+	sql := `SELECT * FROM cygx_report_mapping WHERE category_id=?  LIMIT 1 `
 	err = o.Raw(sql, categoryId).QueryRow(&item)
 	return
 }

services/article.go

@@ -674,15 +674,16 @@ func GetArticleListByApi(cont context.Context) (err error) {
 	return
 }
 
-func init122() {
-	allList, err := models.GetArticleAll()
-
-	fmt.Println(err)
-	for _, v := range allList {
-		HandleArticleListByApi(v.ArticleId)
-	}
+//func init() {
+//allList, err := models.GetArticleAll()
+//
+//fmt.Println(err)
+//for _, v := range allList {
+//	HandleArticleListByApi(v.ArticleId)
+//}
+//HandleArticleListByApi(7930)
 
-}
+//}
 
 // 处理同步过来的文章
 func HandleArticleListByApi(artcleId int) (err error) {
@@ -1160,7 +1161,7 @@ func HandleArticleListByApi(artcleId int) (err error) {
 }
 
 //func init() {
-//	DoArticleOnenIdWxTemplateMsg(6940)
+//	DoArticleOnenIdWxTemplateMsg(8081)
 //}
 
 // 过滤策略平台报告，研选报告重复推送，以及权限勾选的推送
@@ -1191,6 +1192,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 	articleInfo.Abstract, _ = GetReportContentTextSub(articleInfo.Abstract)
 	var chartPermissionId int
 
+	//固收的权限，暂时当策略的逻辑一样处理
 	var chartPermissionName string
 	reportMapDetail, err := models.GetdetailByCategoryIdPush(articleInfo.CategoryId)
 	if err != nil {
@@ -1198,6 +1200,8 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 	}
 	if reportMapDetail.ChartPermissionId == utils.CE_LUE_ID {
 		chartPermissionId = utils.CE_LUE_ID
+	} else if reportMapDetail.ChartPermissionId == utils.GU_SHOU_ID {
+		chartPermissionId = utils.GU_SHOU_ID
 	} else {
 		if reportMapDetail.PermissionType == 1 {
 			chartPermissionName = reportMapDetail.ChartPermissionName + "(主观)"
@@ -1214,7 +1218,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 	//文章关联的产业
 	var industryName string
 	var industrialManagementId string
-	if chartPermissionId == utils.CE_LUE_ID {
+	if chartPermissionId == utils.CE_LUE_ID || chartPermissionId == utils.GU_SHOU_ID {
 		industryName = reportMapDetail.SubCategoryName
 	} else {
 		detailIndustryNameList, err := models.GetIndustrialManagemenDetailByAaticleID(articleId)
@@ -1298,6 +1302,9 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 	slicepermissionId := strings.Split(strconv.Itoa(chartPermissionId), ",")
 	if len(slicepermissionId) > 0 {
 		for _, v := range slicepermissionId {
+			if v == strconv.Itoa(utils.GU_SHOU_ID) {
+				v = strconv.Itoa(utils.CE_LUE_ID)
+			}
 			permissionIdList = append(permissionIdList, v)
 		}
 		condition += ` AND p.chart_permission_id  IN (` + utils.GetOrmInReplace(len(slicepermissionId)) + ` )  `
@@ -1307,12 +1314,13 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 	if err != nil {
 		return err
 	}
+	//return
 	for _, v := range openidPowerList {
 		mapOpenidPower[v.UserId] = v.OpenId
 	}
 	//获取关注这个文章对应产业的用户的 openid
 	mapOpenidFllow := make(map[int]string)
-	if chartPermissionId != utils.CE_LUE_ID {
+	if chartPermissionId != utils.CE_LUE_ID && chartPermissionId != utils.GU_SHOU_ID {
 		openidFllowList, err := models.GetCygxUserFllowOpenid(articleId)
 		if err != nil {
 			return err
@@ -1359,7 +1367,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 	keyword4 := articleInfo.Abstract
 	mapAlreadySend := make(map[int]int)
 	//如果是策略就按照策略的推送方式来写
-	if reportMapDetail.ChartPermissionName == utils.CE_LUE_NAME {
+	if reportMapDetail.ChartPermissionName == utils.CE_LUE_NAME || reportMapDetail.ChartPermissionName == utils.GU_SHOU_NAME {
 		//获取提交过推送规则的用户的 openid
 		mapUserFllowCeLue := make(map[int]string)
 		userFllowCeLueList, err := models.GetCygxUserFllowCeLueOpenid(articleInfo.CategoryId)

services/yidong.go

@@ -12,7 +12,7 @@ import (
 	"time"
 )
 
-//GetActivityTypeIdWithYiDong 根据易董同步过来的活动类型，自动匹配行业
+// GetActivityTypeIdWithYiDong 根据易董同步过来的活动类型，自动匹配行业
 func GetActivityTypeIdWithYiDong(industrySwName string) (chartPermissionId int) {
 	mapIndustrySwName := map[string]int{
 		"家用电器": utils.XIAO_FEI_ID,
@@ -69,7 +69,7 @@ func GetActivityTypeIdWithYiDong(industrySwName string) (chartPermissionId int)
 	return
 }
 
-//GetActivityTypeIdWithYiDong 根据易董同步过来的活动类型，自动匹配行业
+// GetActivityTypeIdWithYiDong 根据易董同步过来的活动类型，自动匹配行业
 func GetActivityTypeNameWithYiDong(industrySwName string) (chartPermissionName string) {
 	mapIndustrySwName := map[string]string{
 		"家用电器": utils.XIAO_FEI_NAME,
@@ -126,7 +126,7 @@ func GetActivityTypeNameWithYiDong(industrySwName string) (chartPermissionName s
 	return
 }
 
-//获取易董token
+// 获取易董token
 func GetYiDongToken() (token string, err error) {
 	defer func() {
 		if err != nil {
@@ -177,7 +177,7 @@ func GetYiDongToken() (token string, err error) {
 	return
 }
 
-//获取易董活动列表
+// 获取易董活动列表
 func GetYiDongActivity(cont context.Context) (err error) {
 	//func GetYiDongActivity() (err error) {
 	defer func() {
@@ -257,11 +257,11 @@ func GetYiDongActivity(cont context.Context) (err error) {
 			item.YidongActivityId = v.ID
 			item.ActivityTypeId = 3
 			item.ActivityTypeName = "公司调研电话会"
-			sliceCompanyInfo := strings.Split(v.Title, "（")
-			sliceActivityTitle := strings.Split(v.Title, "）")
+			sliceCompanyInfo := strings.Split(v.CompanyInfo, "（")
+			sliceActivityTitle := strings.Split(v.CompanyInfo, "）")
 			companyInfo := sliceCompanyInfo[0]
 			if len(sliceActivityTitle) > 1 {
-				item.ActivityName = companyInfo + sliceActivityTitle[len(sliceActivityTitle)-1]
+				item.ActivityName = companyInfo + v.Title
 			} else {
 				item.ActivityName = v.Title
 			}
@@ -336,7 +336,7 @@ func GetYiDongActivity(cont context.Context) (err error) {
 	return
 }
 
-//获取易董活动详情
+// 获取易董活动详情
 func GetYiDongActivityDetail(activityId string) (detail *models.ApifoxModaldetail, err error) {
 	defer func() {
 		if err != nil {
@@ -390,7 +390,7 @@ func GetYiDongActivityDetail(activityId string) (detail *models.ApifoxModaldetai
 	return
 }
 
-//生成用户相关信息接口 获取用户tgc
+// 生成用户相关信息接口 获取用户tgc
 func GetYiDongCreateUserInfo(user *models.WxUserItem) (userTgc string, err error) {
 	defer func() {
 		if err != nil {
@@ -441,7 +441,7 @@ func GetYiDongCreateUserInfo(user *models.WxUserItem) (userTgc string, err error
 	return
 }
 
-//GetYiDongOriginalLink 将易懂的短连接转为长链接
+// GetYiDongOriginalLink 将易懂的短连接转为长链接
 func GetYiDongOriginalLink(item *models.ActivityDetail) (yidongLongLink string, err error) {
 	defer func() {
 		if err != nil {
@@ -504,7 +504,7 @@ func GetYiDongOriginalLink(item *models.ActivityDetail) (yidongLongLink string,
 	return
 }
 
-//处理易董这边过来的时间格式
+// 处理易董这边过来的时间格式
 func GetActivityTextTime(timeYidong string) (timeText string) {
 	strTime := timeYidong
 	startTime := utils.StrTimeToTime(strTime)
@@ -546,7 +546,7 @@ func init232() {
 	//fmt.Println(timeText)
 }
 
-//GetYiDongActivityMeeting获取易董到会详情
+// GetYiDongActivityMeeting获取易董到会详情
 func GetYiDongActivityMeeting(cont context.Context) (err error) {
 	var condition string
 
@@ -672,7 +672,7 @@ func GetYiDongActivityMeeting(cont context.Context) (err error) {
 	return
 }
 
-//YidongActivityGroup 添加活动与产业标的的关联
+// YidongActivityGroup 添加活动与产业标的的关联
 func YidongActivityGroup(subjectName string, activityId int) (err error) {
 	subjectList, err := models.GetCygxIndustrialSubjectList(subjectName)
 	if err != nil {

utils/constants.go

@@ -98,6 +98,8 @@ const (
 	HZ_COMPANY_ID                    int    = 16                                                                                                                                                                                                 // 弘则公司的ID
 	HONG_GUAN_NAME                   string = "宏观"
 	HONG_GUAN_ID                     int    = 1
+	GU_SHOU_NAME                     string = "固收"
+	GU_SHOU_ID                       int    = 100000   // 自定义权限类型ID ，十万起步
 	YAN_XUAN_ARTICLE_TYPE_IDS        string = "1,2,12" // 属于研选的报告类型ID
 	NO_YAN_XUAN_ARTICLE_TYPE_IDS     string = "13"     // 不属于研选的报告类型ID
 )