no message

controllers/banner.go

@@ -1,10 +1,7 @@
 package controllers
 
 import (
-	"encoding/json"
 	"hongze/hongze_mfyx/models"
-	"hongze/hongze_mfyx/services"
-	"hongze/hongze_mfyx/utils"
 )
 
 // Banner
@@ -12,96 +9,11 @@ type BannerController struct {
 	BaseAuthController
 }
 
-// @Title 列表
-// @Description 列表接口
-// @Success Ret=200 {object} cygx.CygxBannerListResp
-// @router /list [get]
-func (this *BannerController) List() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	user := this.User
-	if user == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，用户信息为空"
-		br.Ret = 408
-		return
-	}
-	resp := new(models.CygxBannerListResp)
-	var condition string
-	var pars []interface{}
-	condition += " AND art.show_type IN (0,1)	 AND art.status = 1 ORDER BY art.list_type ASC   , art.sort ASC  "
-	list, err := models.GetCygxBannerList(condition, pars, 0, 99999)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，Err:" + err.Error()
-		return
-	}
-	bannerImgList, err := models.GetCygxBannerImgList()
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，Err:" + err.Error()
-		return
-	}
-	mapImg := make(map[int]string)
-	for _, v := range bannerImgList {
-		mapImg[v.ImgId] = v.IndexImg
-	}
-	for _, v := range list {
-		v.IndexImg = mapImg[v.ImgId]
-		v.BannerUrlResp = services.GetBannerUrlBody(v.Link)
-	}
-	resp.List = list
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// @Title 记录点击信息
-// @Description 记录点击信息
-// @Param	request	body cygx.CygxBannerIdReq true "type json string"
-// @Success 200 Ret=200 发布成功
-// @router /add/history [post]
-func (this *BannerController) History() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	user := this.User
-	if user == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，用户信息为空"
-		br.Ret = 408
-		return
-	}
-	var req models.CygxBannerIdReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-	bannerId := req.BannerId
-	if bannerId == 0 {
-		br.Msg = "参数错误"
-		br.ErrMsg = "参数错误，id不可为空"
-		return
-	}
-	go services.AddCygxBannerHistory(user, bannerId)
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "记录成功"
-}
-
-// @Title 研选banner列表
+// @Title 首页banner图片
 // @Description 研选banner列表接口
-// @Success Ret=200 {object} cygx.CygxBannerListResp
-// @router /listYx [get]
-func (this *BannerController) ListYx() {
+// @Success Ret=200 {object} cygx.BannerUrHomeListResp
+// @router /listhome [get]
+func (this *BannerController) ListHome() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -114,67 +26,16 @@ func (this *BannerController) ListYx() {
 		br.Ret = 408
 		return
 	}
-	resp := new(models.BannerUrlYxListResp)
-	var listA []*models.BannerUrlYxResp
-	var listB []*models.BannerUrlYxResp
+	resp := new(models.BannerUrHomeListResp)
+	var list []*models.BannerUrlYxResp
 
-	if utils.RunMode == "release" {
-		listA = []*models.BannerUrlYxResp{
-			&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/1.png", Path: "pages-purchaser/leaflet/leaflet?leafletImage=https%3A%2F%2Fhzstatic.hzinsights.com%2Fcygx%2Fconfig%2Fresearch_11_0.png"},
-			&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/2.png", Path: "pages-purchaser/survey/surveySubmit"},
-			//&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/4.png", Path: "pages-purchaser/specialColumn/specialColumn"},
-			&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/3_long.png", Path: "pages-purchaser/researchList/researchList"},
-		}
-		listB = []*models.BannerUrlYxResp{
-			//&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/3.png", Path: "pages-purchaser/researchList/researchList"},
-			&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/4_short.png", Path: "pages-purchaser/specialColumn/specialColumn"},
-		}
-	} else {
-		listA = []*models.BannerUrlYxResp{
-			&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/1.png", Path: "pages-purchaser/leaflet/leaflet?leafletImage=https%3A%2F%2Fhzstatic.hzinsights.com%2Fcygx%2Fconfig%2Fresearch_11_0.png"},
-			&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/2.png", Path: "pages-purchaser/survey/surveySubmit"},
-		}
-		listB = []*models.BannerUrlYxResp{
-			//&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/4_short.png", Path: "pages-purchaser/specialColumn/specialColumn"},
-			&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/3.png", Path: "pages-purchaser/researchList/researchList"},
-		}
+	list = []*models.BannerUrlYxResp{
+		&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/1.png", Path: "pages-purchaser/leaflet/leaflet?leafletImage=https%3A%2F%2Fhzstatic.hzinsights.com%2Fcygx%2Fconfig%2Fresearch_11_0.png"},
+		&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/2.png", Path: "pages-purchaser/survey/surveySubmit"},
+		&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/4.png", Path: "pages-purchaser/specialColumn/specialColumn"},
+		&models.BannerUrlYxResp{IndexImg: "https://hzstatic.hzinsights.com/banner/yx/3_long.png", Path: "pages-purchaser/researchList/researchList"},
 	}
-
-	resp.ListA = listA
-	resp.ListB = listB
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// @Title 我要调研内容详情
-// @Description 我要调研内容详情接口
-// @Param   SuveryId   query   int  true       "ID"
-// @Success Ret=200 {object} cygx.CygxBannerListResp
-// @router /yxSurvey/detail [get]
-func (this *BannerController) YxSurveyDetail() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	user := this.User
-	if user == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，用户信息为空"
-		br.Ret = 408
-		return
-	}
-	suveryId, _ := this.GetInt("SuveryId")
-	resp := new(models.CygxBannerYxSurveyRespDetailResp)
-	detail, err := models.GetCygxBannerYxSurveyDetail(suveryId)
-	if err != nil {
-		br.Msg = "详情不存在"
-		br.ErrMsg = "获取失败，Err:" + err.Error()
-		return
-	}
-	resp.Detail = detail
+	resp.List = list
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

controllers/home.go

@@ -1,14 +1,11 @@
 package controllers
 
 import (
-	"encoding/json"
+	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_mfyx/models"
 	"hongze/hongze_mfyx/services"
 	"hongze/hongze_mfyx/utils"
-	"html"
-	"strconv"
-	"strings"
 	"time"
 )
 
@@ -20,360 +17,9 @@ type BaseHomeController struct {
 	BaseCommonController
 }
 
-// @Title 首页列表接口
-// @Description 首页列表接口
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
-// @Param   ChartPermissionId   query   int  true       "品类id，最新传0"
-// @Success 200 {object} models.HomeListResp
-// @router /list [get]
-func (this *HomeController) ListHome() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	user := this.User
-	if user == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，用户信息为空"
-		br.Ret = 408
-		return
-	}
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	chartPermissionId, _ := this.GetInt("ChartPermissionId")
-
-	var startSize int
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-	startSize = paging.StartIndex(currentIndex, pageSize)
-
-	var condition string
-	var pars []interface{}
-	var total int
-	resp := new(models.HomeListResp)
-	page := paging.GetPaging(currentIndex, pageSize, total)
-	resp.HaveResearch = true
-	userType, _, err := services.GetUserType(user.CompanyId)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取用户信息失败,Err:" + err.Error()
-		return
-	}
-	condition += ` AND is_summary = 1  `
-	if chartPermissionId > 0 {
-		categoryId, err := models.GetCategoryId(chartPermissionId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取分类权限信息失败，Err:" + err.Error()
-			return
-		}
-		categoryinfo, err := models.GetChartPermissionById(chartPermissionId)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取信息失败,Err:" + err.Error()
-			return
-		}
-		if userType == 1 && categoryinfo.PermissionName == "研选" {
-			resp.HaveResearch = false
-			resp.Paging = page
-			br.Ret = 200
-			br.Success = true
-			br.Msg = "获取成功"
-			br.Data = resp
-			return
-		}
-		page = paging.GetPaging(currentIndex, pageSize, total)
-		//if categoryId != "" {
-		//	condition += ` AND category_id IN(` + categoryId + `)`
-		//	condition += ` OR ( category_name LIKE '%研选%' AND publish_status = 1 AND is_summary = 1 )`
-		//} else {
-		//	condition += ` AND  category_name  LIKE '%研选%' `
-		//}
-		if categoryId != "" {
-			condition += ` AND category_id IN(` + categoryId + `)`
-			//condition += ` OR ( category_name  LIKE '%` + utils.CHART_PERMISSION_NAME_YANXUAN + `%' AND publish_status = 1 AND is_summary = 1 )`
-		} else {
-			condition += ` AND  category_name   LIKE '%` + utils.CHART_PERMISSION_NAME_YANXUAN + `%'`
-		}
-	}
-	//永续客户无法查看研选分类的内容
-	if userType == 1 {
-		condition += ` AND  category_name  NOT LIKE '%研选` + `%'`
-	}
-	total, err = models.GetHomeCount(condition, pars)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.Msg = "获取帖子总数失败，Err:" + err.Error()
-		return
-	}
-	page = paging.GetPaging(currentIndex, pageSize, total)
-	list, err := models.GetHomeList(condition, pars, startSize, pageSize)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.Msg = "获取帖子数据失败，Err:" + err.Error()
-		return
-	}
-	//研选的五张图片
-	detailResearch, err := models.GetConfigByCode("category_research_img_url")
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "获取数据研选分类图片失败，Err:" + err.Error()
-		return
-	}
-	researchList := strings.Split(detailResearch.ConfigValue, "{|}")
-	//对应分类的所图片
-	detailCategoryUrl, err := models.GetConfigByCode("category_map_img_url")
-	if err != nil {
-		br.Msg = "获取数据失败"
-		br.ErrMsg = "行业配置信息失败，Err:" + err.Error()
-		return
-	}
-	categoryUrlList := strings.Split(detailCategoryUrl.ConfigValue, "{|}")
-	mapCategoryUrl := make(map[string]string)
-	var categoryId string
-	var imgUrlChart string
-	for _, v := range categoryUrlList {
-		vslice := strings.Split(v, "_")
-		categoryId = vslice[0]
-		imgUrlChart = vslice[len(vslice)-1]
-		mapCategoryUrl[categoryId] = imgUrlChart
-	}
-
-	for k, v := range list {
-		item := list[k]
-		//如果文章一开始的内容是图片，优先展示第一张图片
-		imgurl, _ := services.FixArticleImgUrl(html.UnescapeString(list[k].Body))
-		newBody, _ := services.GetReportContentTextSub(item.Body)
-		list[k].Body = newBody
-		if imgurl != "" {
-			list[k].BodyHtml = imgurl
-		}
-		list[k].PublishDate = utils.StrTimeToTime(item.PublishDate).Format(utils.FormatDateTimeNoSecond) //时间字符串格式转时间格式
-		if strings.Contains(item.CategoryName, "研选") {
-			list[k].IsResearch = true
-		}
-		if item.Pv > 999 {
-			list[k].Pv = 999
-		}
-		//如果是研选系列的任意取五张图片的中的一张
-		if v.CategoryId == "0" {
-			knum := v.ArticleId % 5
-			list[k].ImgUrlPc = researchList[knum]
-		} else {
-			list[k].ImgUrlPc = mapCategoryUrl[v.CategoryId]
-		}
-		if list[k].ArticleId < utils.SummaryArticleId {
-			list[k].HttpUrl = utils.StrategyPlatform + strconv.Itoa(v.ArticleId)
-			list[k].IsNeedJump = true
-		}
-	}
-	resp.List = list
-	resp.Paging = page
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// @Title 首页/搜索头部导航接口
-// @Description 首页/搜索头部导航接口
-// @Param   SearchPage  query  int  false  "是否为搜索页面"
-// @Success 200 {object} models.HomeListResp
-// @router /header_tab [get]
-func (this *HomeController) HeaderTab() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	user := this.User
-	if user == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，用户信息为空"
-		br.Ret = 408
-		return
-	}
-	searchPage, _ := this.GetInt("SearchPage")
-
-	key := models.HomeHeaderTabConfigKey
-	conf, e := models.GetConfigByCode(key)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取首页头部导航失败, Err: " + e.Error()
-		return
-	}
-	if conf.ConfigValue == "" {
-		br.Msg = "获取失败"
-		br.ErrMsg = "首页头部导航配置值有误"
-		return
-	}
-
-	list := new(models.HomeHeaderTabList)
-	if e = json.Unmarshal([]byte(conf.ConfigValue), &list); e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "首页头部导航配置值解析失败, Err: " + e.Error()
-		return
-	}
-	resp := list.Home
-	if searchPage == 1 {
-		resp = list.SearchPage
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// @Title 首页列表接口v7.6版本
-// @Description 首页列表接口v7.6版本
-// @Param   PageSize   query   int  true       "每页数据条数"
-// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
-// @Param   ChartPermissionId   query   int  true       "品类id，最新传0"
-// @Param   CtagId   query   int  true       "图表子类ID"
-// @Param   ListType   query   int  true       "列表类型，1最新，2 纪要 ，3图表 默认1"
-// @Success 200 {object} models.HomeArtAndChartListResp
-// @router /artAndChart/list [get]
-func (this *HomeController) ListHomeArtAndChart() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	user := this.User
-	if user == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，用户信息为空"
-		br.Ret = 408
-		return
-	}
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	chartPermissionId, _ := this.GetInt("ChartPermissionId")
-	listType, _ := this.GetInt("ListType")
-
-	var startSize int
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-	if listType <= 0 {
-		listType = 1
-	}
-	startSize = paging.StartIndex(currentIndex, pageSize)
-
-	var condition string
-	var pars []interface{}
-	var total, chartTotal int
-	resp := new(models.HomeArtAndChartListResp)
-	page := paging.GetPaging(currentIndex, pageSize, total)
-	resp.HaveResearch = true
-
-	// 最新/纪要
-	if listType != 3 {
-		userType, _, err := services.GetUserType(user.CompanyId)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取用户信息失败,Err:" + err.Error()
-			return
-		}
-		condition = ` AND is_summary = 1  `
-		if chartPermissionId > 0 {
-			categoryId, err := models.GetCategoryId(chartPermissionId)
-			if err != nil && err.Error() != utils.ErrNoRow() {
-				br.Msg = "获取信息失败"
-				br.ErrMsg = "获取分类权限信息失败，Err:" + err.Error()
-				return
-			}
-			categoryInfo, err := models.GetChartPermissionById(chartPermissionId)
-			if err != nil {
-				br.Msg = "获取信息失败"
-				br.ErrMsg = "获取信息失败,Err:" + err.Error()
-				return
-			}
-			if userType == 1 && strings.Contains(categoryInfo.PermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
-				resp.HaveResearch = false
-				resp.Paging = page
-				br.Ret = 200
-				br.Success = true
-				br.Msg = "获取成功"
-				br.Data = resp
-				return
-			}
-			page = paging.GetPaging(currentIndex, pageSize, total)
-			if categoryId != "" {
-				condition += ` AND category_id IN(` + categoryId + `)`
-				//condition += ` OR ( category_name  LIKE '%` + utils.CHART_PERMISSION_NAME_YANXUAN + `%' AND publish_status = 1 AND is_summary = 1 )`
-			} else {
-				condition += ` AND  category_name   LIKE '%` + utils.CHART_PERMISSION_NAME_YANXUAN + `%'`
-			}
-		}
-		//永续客户无法查看研选分类的内容
-		if userType == 1 {
-			condition += ` AND  category_name  NOT LIKE '%` + utils.CHART_PERMISSION_NAME_YANXUAN + `%'`
-		}
-
-		list := make([]*models.HomeArticle, 0)
-		// 7.6-与音频作联合查询, 整体进行发布时间的排序(代码写的嘎嘎烂, 将就着用吧=_=!)
-		if listType == 1 {
-			var unionPars []interface{}
-			unionList, unionTotal, e := services.GetHomeNewestList(user.UserId, user.CompanyId, startSize, pageSize, condition, unionPars)
-			if e != nil {
-				br.Msg = "获取信息失败"
-				br.Msg = "获取纪要音频联合列表失败, Err: " + e.Error()
-				return
-			}
-			total = unionTotal
-			list = unionList
-		} else {
-			total, err = models.GetHomeCount(condition, pars)
-			if err != nil {
-				br.Msg = "获取信息失败"
-				br.Msg = "获取帖子总数失败，Err:" + err.Error()
-				return
-			}
-
-			homeList, err := models.GetHomeList(condition, pars, startSize, pageSize)
-			if err != nil {
-				br.Msg = "获取信息失败"
-				br.Msg = "获取帖子数据失败，Err:" + err.Error()
-				return
-			}
-			list = homeList
-		}
-
-		resp.List, err = services.HandleArticleCategoryImg(list)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.Msg = "处理封面图片失败，HandleArticleCategoryImg，Err:" + err.Error()
-			return
-		}
-		resp.List = list
-	}
-	if chartTotal > total {
-		total = chartTotal
-	}
-
-	page = paging.GetPaging(currentIndex, pageSize, total)
-	resp.Paging = page
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
-// @Title 首页列表接口
-// @Description 首页列表接口
-// @Param   TagIds   query   string  true       "标签选择"
-// @Param   ChartPermissionId   query   int	  false     "行业id"
+// @Title 最新首页列表接口
+// @Description 最新首页列表接口
+// @Param   LabelKeyword   query   string  true       "标签关键词"
 // @Param   PageSize   query   int  true       "每页数据条数"
 // @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
 // @Success 200 {object} models.HomeArtAndChartListResp
@@ -393,8 +39,7 @@ func (this *HomeController) NewList() {
 	}
 	pageSize, _ := this.GetInt("PageSize")
 	currentIndex, _ := this.GetInt("CurrentIndex")
-	tagIds := this.GetString("TagIds")
-	chartPermissionId, _ := this.GetInt("ChartPermissionId")
+	labelKeyword := this.GetString("LabelKeyword")
 
 	var startSize int
 	if pageSize <= 0 {
@@ -418,8 +63,19 @@ func (this *HomeController) NewList() {
 		return
 	}
 
-	if tagIds != "" {
-		conditionTagIdsInit, err := services.GetConditionInitByTagIds(tagIds, chartPermissionId)
+	yanxuanActivityIds := services.GetYanxuanActivityIds() // 获取所有的研选活动ID
+	yanxuanArticleIds := services.GetYanxuanArticleIds()   // 获取所有的研选文章ID
+	fmt.Println(len(yanxuanActivityIds))
+	fmt.Println(len(yanxuanArticleIds))
+
+	condition += `  AND IF ( source = 'article' , source_id   IN (` + utils.GetOrmInReplace(len(yanxuanArticleIds)) + `) ,1=1 ) `
+	pars = append(pars, yanxuanArticleIds)
+
+	condition += `  AND IF ( source = 'activity' , source_id   IN (` + utils.GetOrmInReplace(len(yanxuanActivityIds)) + `) ,1=1 ) `
+	pars = append(pars, yanxuanArticleIds)
+
+	if labelKeyword != "" {
+		conditionTagIdsInit, err := services.GetConditionInitByTagIds(labelKeyword, 0)
 		if err != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取活动权限数据失败，GetConditionInitByTagIds Err:" + err.Error()
@@ -427,77 +83,16 @@ func (this *HomeController) NewList() {
 		}
 		conditionInit += conditionTagIdsInit
 	}
-	//行业筛选
-	if chartPermissionId > 0 {
-		conditionInit += " AND chart_permission_id  =  " + strconv.Itoa(chartPermissionId)
-	}
 
-	if tagIds == "" && chartPermissionId == 0 {
+	if labelKeyword == "" {
 		//查询近一个月的数据
-		conditionInit += " AND publish_date  >   '" + time.Now().AddDate(0, 0, -30).Format(utils.FormatDateTime) + "'"
+		conditionInit += " AND publish_date  >   '" + time.Now().AddDate(0, 0, -60).Format(utils.FormatDateTime) + "'"
 	}
 
-	//conditionInit += `  AND source IN ('newchart')`
 	if user.CompanyId <= 1 || totalRai == 0 {
-		//condition += " AND source IN ('roadshow','article') "
-		condition += " AND source NOT IN ('activityspecial') "
-		listActivityYiDong, err := models.GetActivityListHomeNew("  AND art.yidong_activity_id != '' ", 0, 1000)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取可见活动数据失败，Err:" + err.Error()
-			return
-		}
-		//易董的活动不查看  v12.2.1
-		var yiDongactivityIds []int
-		for _, v := range listActivityYiDong {
-			yiDongactivityIds = append(yiDongactivityIds, v.ActivityId)
-		}
-		lenyiDongactivityIds := len(yiDongactivityIds)
-		condition += `  AND IF ( source = 'activity' , source_id  NOT IN (` + utils.GetOrmInReplace(lenyiDongactivityIds) + `) ,1=1 ) `
-		pars = append(pars, yiDongactivityIds)
+		conditionInit += " AND source IN ('article','yanxuanspecial')   "
 	} else {
-		condition += ` AND source NOT IN ('activity','activityspecial','newchart') ` + conditionInit
-		//conditionActivity, err := services.GetActivityonditionList(user, "", "", "", "1,2,3", "", 0, 0, "", 0, 1)
-		conditionActivity, err := services.ActivityConditioninitSql(user, "", 0)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
-			return
-		}
-		conditionActivity += ` AND art.publish_status = 1 `
-		var conditionOrder string
-		conditionOrder = ` ORDER BY art.activity_time DESC ,  art.active_state ASC   `
-		conditionActivity += conditionOrder
-		actPageSize := 200
-		if tagIds != "" {
-			actPageSize = 2000
-		}
-		listActivity, err := models.GetActivityListHomeNew(conditionActivity, 0, actPageSize)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取可见活动数据失败，Err:" + err.Error()
-			return
-		}
-
-		var activityIds []int
-		for _, v := range listActivity {
-			activityIds = append(activityIds, v.ActivityId)
-		}
-		lenActivityIds := len(activityIds)
-
-		var activityspecialIds []int
-
-		lenActivityspecialIds := len(activityspecialIds)
-
-		if lenActivityIds > 0 {
-			condition += ` OR ( source = 'activity' AND source_id IN (` + utils.GetOrmInReplace(lenActivityIds) + `) ` + conditionInit + ` )    `
-			pars = append(pars, activityIds)
-		}
-
-		if lenActivityspecialIds > 0 {
-			condition += ` OR ( source = 'activityspecial' AND source_id IN (` + utils.GetOrmInReplace(lenActivityspecialIds) + `) ` + conditionInit + ` )   `
-			pars = append(pars, activityspecialIds)
-		}
+		conditionInit += " AND source IN ('article','activity','yanxuanspecial')   "
 	}
 	total, err := models.GetResourceDataCount(condition, pars)
 	if err != nil {

controllers/tag.go

@@ -1,26 +1,23 @@
 package controllers
 
 import (
-	"encoding/json"
 	"hongze/hongze_mfyx/models"
-	"hongze/hongze_mfyx/services"
 )
 
 type TagController struct {
 	BaseAuthController
 }
 
-// @Title 获取标签列表-自定义顺序
-// @Description 获取标签列表-自定义顺序接口
-// @Success 200 {object} cygx.ChartPermissionResp
-// @router /list/custom [get]
-func (this *TagController) TagCustomizeList() {
+// @Title 首页标签列表
+// @Description 首页标签列表接口
+// @Success 200 {object} cygx.CygxTagListLabelResp
+// @router /list/label [get]
+func (this *TagController) ListLabel() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-
 	sysUser := this.User
 	if sysUser == nil {
 		br.Msg = "请登录"
@@ -28,101 +25,15 @@ func (this *TagController) TagCustomizeList() {
 		br.Ret = 408
 		return
 	}
-
-	var condition string
-
-	hasPermission, err := services.GetUserHasPermissionSimple(sysUser)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
-		return
-	}
-	if hasPermission > 1 {
-		list := make([]*models.CygxTagList, 0)
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		br.Data = list
-		return
-	}
-
-	list, err := models.GetCygxTagList(condition)
-	for _, v := range list {
-		if v.ArticleTypes != "" {
-			v.CheckList = append(v.CheckList, "A")
-		}
-		if v.ActivityTypes != "" {
-			v.CheckList = append(v.CheckList, "B")
-		}
-		if v.Industries != "" {
-			v.CheckList = append(v.CheckList, "C")
-		}
-		if v.SubjectNames != "" {
-			v.CheckList = append(v.CheckList, "D")
-		}
-		//固定标签默认都属于，前端互斥使用
-		if v.TagType > 0 {
-			v.CheckList = []string{"A", "B", "C", "D"}
-		}
-	}
-	if err != nil {
-		br.Msg = "获取标签失败"
-		br.ErrMsg = "获取标签信息失败,Err:" + err.Error()
-		return
-	}
-
-	//var condition string
-	condition = ` AND permission_name IN ('医药1','消费','科技','智造','策略') `
-	listPermission, err := models.GetChartPermissionReportAll(condition)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
-		return
-	}
-
-	resp := new(models.CygxTagListResp)
-
-	resp.List = list
-	resp.ListPermission = listPermission
+	list1 := []string{"全部活动", "买方交流", "专家调研", "上市公司小范围"}
+	list2 := []string{"全部报告", "专栏", "纪要", "买方沙龙"}
+	list3 := []string{"主题a", "主题b", "主题c"}
+	resp := new(models.CygxTagListLabelResp)
+	resp.List1 = list1
+	resp.List2 = list2
+	resp.List3 = list3
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = resp
 }
-
-// @Title 记录点击信息
-// @Description 记录点击信息
-// @Param	request	body cygx.CygxTagIdReq true "type json string"
-// @Success 200 Ret=200 发布成功
-// @router /add/history [post]
-func (this *TagController) History() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	user := this.User
-	if user == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，用户信息为空"
-		br.Ret = 408
-		return
-	}
-	var req models.CygxTagIdReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-	tagId := req.TagId
-	if tagId == 0 {
-		br.Msg = "参数错误"
-		br.ErrMsg = "参数错误，id不可为空"
-		return
-	}
-	go services.AddCygxTagHistory(user, tagId)
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "记录成功"
-}

models/activity.go

@@ -1,10 +1,8 @@
 package models
 
 import (
-	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_mfyx/utils"
 	"strings"
 	"time"
 )
@@ -342,41 +340,6 @@ type GetCygxActivityListRep struct {
 	IsShowResearchPoints   bool   `description:"是否展示研选扣点搜索"`
 }
 
-// 列表
-func GetActivityListAll(condition string, pars []interface{}, uid, startSize, pageSize, playBack int) (items []*ActivityDetail, err error) {
-	var sqlJiontable string
-	if playBack == 1 {
-		//sqlJiontable = ` INNER JOIN cygx_activity_voice AS ac ON ac.activity_id = art.activity_id `
-	}
-	o := orm.NewOrm()
-	sql := `SELECT art.* ,t.activity_type,t.img_url_text,
-		( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND s.user_id = ?   AND s.is_cancel = 0  AND s.do_fail_type = 0) AS is_signup,
-		( SELECT COUNT( DISTINCT user_id ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id   AND s.is_cancel = 0  AND s.do_fail_type = 0) AS signup_num,
-		( SELECT COUNT( 1 ) FROM cygx_activity_meeting_reminder AS m WHERE m.activity_id = art.activity_id AND m.user_id = ?  AND m.is_cancel = 0  ) AS is_cancel_meeting_reminder,
-		( SELECT COUNT( 1 ) FROM cygx_activity_appointment AS ap WHERE ap.activity_id = art.activity_id AND ap.user_id = ? ) AS is_appointment
-		FROM cygx_activity as art
-		INNER JOIN cygx_activity_type  as t ON t.activity_type_id = art.activity_type_id` + sqlJiontable + ` WHERE 1= 1 `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, pars, uid, uid, uid, startSize, pageSize).QueryRows(&items)
-	return
-}
-
-// 列表
-func GetActivityListByDateTime(startDate, endDate, activityIds, activityIdsLongTime string) (items []*CygxActivityList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_activity WHERE activity_time > '` + startDate + `' AND activity_time < '` + endDate + `' `
-	activityIds = strings.TrimRight(activityIds, ",")
-	if activityIds != "" {
-		sql += ` AND activity_id  NOT IN (` + activityIds + `,1328 )  `
-	}
-	sql += `  OR activity_id IN (` + activityIdsLongTime + `)`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
 // 获取我的日程数量
 func GetSpecialScheduleCount(uid int) (count int, err error) {
 	o := orm.NewOrm()
@@ -522,212 +485,6 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 	return
 }
 
-// 获取数量
-func GetActivityCountById(activityId int) (count int, err error) {
-	o := orm.NewOrm()
-	sqlCount := `SELECT COUNT(1) AS count  FROM cygx_activity WHERE activity_id = ?`
-	err = o.Raw(sqlCount, activityId).QueryRow(&count)
-	return
-}
-
-// 删除数据
-func DeleteActivity(activityId int) (err error) {
-	o := orm.NewOrm()
-	sql := ` DELETE FROM cygx_activity WHERE activity_id = ?`
-	_, err = o.Raw(sql, activityId).Exec()
-	return
-}
-
-// 修改活动状态至进行中
-func UpdateActivitySattusToHaveInHand() (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println(err)
-			go utils.SendAlarmMsg("修改活动状态至进行中失败"+err.Error(), 2)
-			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "修改活动状态至进行中失败 ErrMsg:"+err.Error(), utils.EmailSendToUsers)
-		}
-	}()
-	o := orm.NewOrm()
-	resultTime_30 := time.Now().Add(-time.Minute * 60).Format("2006-01-02 15:04:05") // 线上活动也改成60分钟之后结束了 2023.5.8
-	resultTime_60 := time.Now().Add(-time.Minute * 60).Format("2006-01-02 15:04:05")
-	var sqlOr string
-	var condition string
-	condition += ` AND activity_time < NOW()`
-	sqlOr = condition
-	condition += ` AND (activity_type_id IN ( 1, 2, 3, 7 ) AND  activity_time > ` + "'" + resultTime_30 + "'" + ")"
-	condition += ` OR(activity_type_id IN ( 4, 5, 6, 8 ) AND  activity_time > ` + "'" + resultTime_60 + "'" + sqlOr + ")"
-	msql := " UPDATE cygx_activity SET active_state = 2, top_time = 0  WHERE 1 = 1 " + condition
-	_, err = o.Raw(msql).Exec()
-	return
-}
-
-// 修改活动状态至已结束
-func UpdateActivitySattusToComplete() (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println(err)
-			go utils.SendAlarmMsg("修改活动状态至已结束"+err.Error(), 2)
-			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "修改活动状态至已结束 ErrMsg:"+err.Error(), utils.EmailSendToUsers)
-		}
-	}()
-	o := orm.NewOrm()
-	resultTime_30 := time.Now().Add(-time.Minute * 60).Format("2006-01-02 15:04:05") // 线上活动也改成60分钟之后结束了 2023.5.8
-	resultTime_60 := time.Now().Add(-time.Minute * 60).Format("2006-01-02 15:04:05")
-	//var sqlOr string
-	var condition string
-	//condition += ` AND activity_time < NOW()`
-	//sqlOr = condition
-	condition += ` AND (activity_type_id IN ( 1, 2, 3, 7 ) AND  activity_time < ` + "'" + resultTime_30 + "'" + ")"
-	condition += ` OR(activity_type_id IN ( 4, 5, 6 ,8 ) AND  activity_time < ` + "'" + resultTime_60 + "'" + ")"
-	msql := " UPDATE cygx_activity SET active_state = 3 WHERE 1 = 1 " + condition
-	_, err = o.Raw(msql).Exec()
-	return
-}
-
-// 活动详情
-type WxMsgCygxActivityList struct {
-	Id                      int    `description:"报名ID"`
-	UserId                  int    `description:"用户ID"`
-	ActivityId              int    `description:"活动ID 等于0新增活动，大于0修改活动"`
-	ActivityTypeId          int    `description:"活动类型id"`
-	ActivityName            string `description:"活动名称"`
-	ActivityTypeName        string `description:"活动类型名称"`
-	Speaker                 string `description:"主讲人"`
-	SignupType              int    `description:"报名方式，1预约外呼，2我要报名"`
-	ChartPermissionId       int    `description:"行业id"`
-	ChartPermissionName     string `description:"行业名称"`
-	IsLimitPeople           int    `description:"是否限制人数 1是，0否"`
-	LimitPeopleNum          int    `description:"限制的人数数量"`
-	ActivityTime            string `description:"活动时间"`
-	ActivityTimeText        string `description:"活动时间带文字"`
-	City                    string `description:"城市"`
-	Address                 string `description:"活动地址"`
-	DistinguishedGuest      string `description:"嘉宾"`
-	Expert                  string `description:"专家"`
-	IsSignup                int    `description:"是否已报名 1是 ，0 否"`
-	SignupNum               int    `description:"已报名人数"`
-	ActiveState             string `description:"活动进行状态 未开始：1、进行中2、已结束3"`
-	IsCancelMeetingReminder int    `description:"是否取消会议提醒 1展示取消会议提醒 ，0展示会议提醒"`
-	IsBrackets              int    `description:"是否有方括号 1是 ，0 否"`
-	OpenId                  string `description:"OenId"`
-	FailType                int    `description:"失败原因，0，未失败，1总人数已满，2单机构超限制，3，爽约次数超限"`
-}
-
-// 列表 3o分钟
-func GetActivitySendMsgListAll(endDate string) (items []*WxMsgCygxActivityList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-	s.id,
-	s.user_id,
-	s.fail_type,
-	cr.open_id,
-	a.*
-FROM
-	cygx_activity AS a
-	INNER JOIN cygx_activity_signup AS s ON s.activity_id = a.activity_id
-	INNER JOIN cygx_user_record AS cr ON cr.cygx_bind_account = s.mobile 
-WHERE
-	1 = 1 
-	AND s.is_send_wx_msg = 0 
-	AND s.do_fail_type = 0 
-	AND a.publish_status = 1
-	AND a.activity_time <= ? AND a.activity_time >= NOW() 
-	AND s.is_cancel = 0
-	AND( a.activity_type_id IN (4,5,6) OR (a.activity_type_id = 3 AND a.is_limit_people = 1 )) 	GROUP BY s.id`
-	_, err = o.Raw(sql, endDate).QueryRows(&items)
-	return
-}
-
-// 列表 15分钟提醒
-func GetActivitySendMsgListAllMeeting(endDate string) (items []*WxMsgCygxActivityList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-	m.id,
-	cr.open_id,
-	a.* 
-FROM
-	cygx_activity AS a
-	INNER JOIN cygx_activity_meeting_reminder AS m ON m.activity_id = a.activity_id
-	INNER JOIN user_record AS c ON c.bind_account = m.mobile 
-	INNER JOIN cygx_user_record AS cr ON cr.union_id = c.union_id 
-WHERE
-	1 = 1 
-	AND m.is_send_wx_msg = 0 
-	AND a.publish_status = 1 
-	AND a.activity_time <= ? AND a.activity_time >= NOW() 
-	AND m.is_cancel = 0 
-	AND c.create_platform = 4
-	AND (
-	a.activity_type_id IN ( 1, 2 ) 
-	OR ( a.activity_type_id = 3 AND a.is_limit_people = 0 ))
-	GROUP BY m.id`
-	_, err = o.Raw(sql, endDate).QueryRows(&items)
-	return
-}
-
-// 修改是否推送消息状态
-func UPdateSendedMsgStatus(signupIds string) (err error) {
-	sql := ` UPDATE cygx_activity_signup SET  is_send_wx_msg= 1  WHERE id IN(` + signupIds + `)`
-	o := orm.NewOrm()
-	_, err = o.Raw(sql).Exec()
-	return
-}
-
-// 修改是否推送消息状态
-func UPdateSendedYiDongSignUp(activityId int) (err error) {
-	sql := ` UPDATE cygx_activity SET  is_yidong_sign_up= 1  WHERE activity_id = ? `
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, activityId).Exec()
-	return
-}
-
-// 修改是否推送消息状态
-func UPdateSendedMsgMeetingStatus(signupIds string) (err error) {
-	sql := ` UPDATE cygx_activity_meeting_reminder SET  is_send_wx_msg= 1  WHERE id IN(` + signupIds + `)`
-	o := orm.NewOrm()
-	_, err = o.Raw(sql).Exec()
-	return
-}
-
-// 获取满足推送的活动ID数量
-func GetCountActivityIdToSendFile(endDate string) (count int, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-	COUNT(1) count
-FROM
-	cygx_activity AS a
-	INNER JOIN cygx_activity_signup AS s ON s.activity_id = a.activity_id 
-WHERE
-	1 = 1 
-	AND s.signup_type = 1 
-	AND s.fail_type = 0 
-	AND a.is_send_file_toemail = 0 
-	AND a.activity_time <= ? AND a.activity_time >= NOW() 	GROUP BY a.activity_id `
-	err = o.Raw(sql, endDate).QueryRow(&count)
-	return
-}
-
-// 获取满足推送的活动ID
-func GetActivityIdToSendFile(endDate string) (items []*ActivityIdRep, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-			* 
-		FROM
-			cygx_activity AS a
-			INNER JOIN cygx_activity_signup AS s ON s.activity_id = a.activity_id 
-			INNER JOIN cygx_activity_type AS t ON a.activity_type_id = t.activity_type_id
-		WHERE
-			1 = 1 
-			AND s.signup_type = 1 
-			AND a.yidong_activity_id = '' 
-			AND t.activity_type = 1
-			AND s.fail_type = 0 
-			AND a.is_send_file_toemail = 0 
-			AND a.activity_time <= ? AND a.activity_time >= NOW() 	GROUP BY a.activity_id `
-	_, err = o.Raw(sql, endDate).QueryRows(&items)
-	return
-}
-
 type SignupExportRep struct {
 	Mobile         string `description:"手机号"`
 	CompanyName    string `description:"公司名称"`
@@ -969,47 +726,6 @@ WHERE
 	return
 }
 
-// 通过活动ID获取活动详情
-func GetCygxActivitySpecialDetailById(uid, ActivityId int) (item *CygxActivitySpecialDetail, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT *,( SELECT COUNT( 1 ) FROM cygx_activity_special_signup AS s WHERE s.activity_id = a.activity_id AND s.user_id = ? ) AS is_signup 
-FROM
-	cygx_activity_special AS a 
-WHERE
-	activity_id = ?
-	AND publish_status = 1 	AND is_offline = 0  `
-	err = o.Raw(sql, uid, ActivityId).QueryRow(&item)
-	return
-}
-
-// 通过活动ID获取活动详情
-func GetCygxActivitySpecialDetail(ActivityId int) (item *CygxActivitySpecialDetail, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_activity_special  WHERE activity_id=? AND publish_status = 1 `
-	err = o.Raw(sql, ActivityId).QueryRow(&item)
-	return
-}
-
-func UpdateCygxActivityName(activityId int, Name string) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE cygx_activity SET activity_name_task = ? WHERE activity_id=?  `
-	_, err = o.Raw(sql, Name, activityId).Exec()
-	return
-}
-
-// 获取已发布但是为开始活动的权限
-func GetActivityWeekPermission() (permission string, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT
-			GROUP_CONCAT( DISTINCT chart_permission_name SEPARATOR ',' ) AS permission 
-		FROM
-			cygx_activity 
-		WHERE
-			active_state = 1`
-	err = o.Raw(sql).QueryRow(&permission)
-	return
-}
-
 // 列表
 func GetIndustrialActivityGroupManagementList(activityId int) (items []*IndustrialManagementRep, err error) {
 	o := orm.NewOrm()
@@ -1026,41 +742,6 @@ func GetIndustrialActivityGroupManagementList(activityId int) (items []*Industri
 	return
 }
 
-// GetActivityListByYiDong 获取易董同步过来的活动列表
-func GetActivityListByYiDong() (items []*CygxActivity, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM cygx_activity WHERE yidong_activity_id != '' `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-// GetActivityListByYiDong 获取易董同步过来的活动列表
-func GetActivityListByYiDongByCygx() (items []*CygxActivity, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM cygx_activity WHERE yidong_activity_id_by_cygx != '' `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-// AddCygxActivity 添加活动
-func AddCygxActivity(item *CygxActivity) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
-	return
-}
-
-// 列表
-func GetActivityListByYidong(condition string) (items []*ActivityDetail, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_activity WHERE 1 = 1 
-	AND ( yidong_activity_id != '' OR yidong_activity_id_by_cygx != '' )  AND publish_status = 1  `
-	if condition != "" {
-		sql += condition
-	}
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
 // 列表
 func GetActivityListByCondition(condition string, pars []interface{}) (items []*CygxActivity, err error) {
 	o := orm.NewOrm()
@@ -1080,105 +761,6 @@ func UpdateCygxActivitySubmitMeetingByActivityId(activityId int) (err error) {
 	return
 }
 
-// UpdateCygxActivitySubmitMeetingByYidong  ，跟易董返回的用户状态修改活动以提交到会状态
-func UpdateCygxActivitySubmitMeetingByYidong(yidongActivityId string) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE cygx_activity SET is_submit_meeting = 1 WHERE yidong_activity_id=? OR  yidong_activity_id_by_cygx = ? `
-	_, err = o.Raw(sql, yidongActivityId, yidongActivityId).Exec()
-	return
-}
-
-// UpdateActivityshowSubject 根据易董推过来的匹配信息，判断临时标签是否展示
-func UpdateActivityshowSubject(activityId int) (err error) {
-	sql := ` UPDATE cygx_activity SET  is_show_subject_name= 1 , temporary_label = ''  WHERE activity_id = ?`
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, activityId).Exec()
-	return
-}
-
-// GetActivitySpecialSearcheList 活动与专项调研的搜索
-func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditionSpecil string, parsSpecil []interface{}, startSize, pageSize int) (items []*ActivityDetail, total int, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-			art.activity_id,
-			art.activity_time_text,
-			art.activity_name,
-			art.chart_permission_id,
-			art.active_state,
-			t.activity_type,
-			t.img_url_text,
-			art.chart_permission_name,
-			art.distinguished_guest,
-			art.expert,
-			art.speaker,
-			"" AS trip_img_link,
-			"" AS activity_time_end,
-			art.yidong_activity_id,
-			art.is_can_appointment_minutes,
-			art.activity_type_id,
-			art.limit_people_num,
-			art.is_limit_people,
-			art.city,
-			1 AS source_type,
-			art.is_yidong_conduct,
-			art.activity_time,
-			art.is_external_label,
-			art.siginup_deadline,
-			art.is_research_points,
-			art.cancel_deadline
-		FROM
-			cygx_activity AS art
-			INNER JOIN cygx_activity_type AS t ON t.activity_type_id = art.activity_type_id
-		WHERE
-			1 = 1 `
-	if condition != `` {
-		sql += condition
-	}
-	sql += ` UNION ALL
-		SELECT
-			art.activity_id,
-			art.activity_time_text_by_day AS activity_time_text,
-			art.research_theme AS activity_name,
-			art.chart_permission_id,
-			"",
-			art.special_type AS activity_type,
-			"",
-			art.chart_permission_name,
-			"",
-			"",
-			"",
-			art.trip_img_link_fix AS trip_img_link,
-			art.activity_time_end,
-			"",
-			"",
-			"",
-			"",
-			"",
-			"",
-			2 AS source_type,
-			"",
-			art.activity_time,
-			"",
-			"",
-			"",
-			""
-		FROM
-			cygx_activity_special AS art
-		WHERE
-			1 = 1 `
-	if conditionSpecil != "" {
-		sql += conditionSpecil
-	}
-	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z `
-	err = o.Raw(totalSql, pars, parsSpecil).QueryRow(&total)
-	if err != nil {
-		return
-	}
-	sql += ` ORDER BY activity_time DESC   LIMIT ?,?`
-	_, err = o.Raw(sql, pars, parsSpecil, startSize, pageSize).QueryRows(&items)
-	return
-}
-
 // 列表
 func GetActivityListNew(condition string, pars []interface{}, uid, startSize, pageSize, playBack, filter int, typeName string) (items []*ActivityDetail, err error) {
 	var sqlJiontable string
@@ -1237,32 +819,6 @@ func GetActivityListHomeNew(condition string, startSize, pageSize int) (items []
 	return
 }
 
-// 主题列表
-func GetActivityLabelListAllNoLimit(condition, sortTime string, pars []interface{}, conditionSpecial string) (items []*CygxActivityLabelList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT	activity_id, label,temporary_label,is_show_subject_name, art.activity_time,	1 AS resource, yidong_activity_id 
-		FROM cygx_activity as art WHERE 1= 1 `
-	if condition != "" {
-		sql += condition
-	}
-	sql += `  UNION ALL `
-	sql += ` SELECT
-			art.activity_id,
-			art.label,
-			art.temporary_label,
-			is_show_subject_name,
-			art.activity_time,
-			2 AS resource,
-			'' AS yidong_activity_id 
-		FROM
-			cygx_activity_special AS art   WHERE 1= 1 ` + conditionSpecial
-
-	sql += ` GROUP BY label,resource  ORDER BY ` + sortTime + ` , activity_id DESC `
-
-	_, err = o.Raw(sql, pars).QueryRows(&items)
-	return
-}
-
 // 列表
 func GetCygxActivityList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivity, err error) {
 	o := orm.NewOrm()
@@ -1275,21 +831,13 @@ func GetCygxActivityList(condition string, pars []interface{}, startSize, pageSi
 	return
 }
 
-// 批量修改弘则活动与进门财经的一个活动关联
-func UpdateJmcjActivityIdGroup(items map[int]string) (err error) {
+// 列表
+func GetCygxActivityIdList(condition string, pars []interface{}) (items []*CygxActivity, err error) {
 	o := orm.NewOrm()
-	p, err := o.Raw("UPDATE cygx_activity SET jmcj_activity_id = ? WHERE activity_id = ? AND jmcj_activity_id= '' ").Prepare()
-	if err != nil {
-		return
-	}
-	defer func() {
-		_ = p.Close() // 别忘记关闭 statement
-	}()
-	for k, v := range items {
-		_, err = p.Exec(v, k)
-		if err != nil {
-			return
-		}
+	sql := `SELECT * FROM cygx_activity as art WHERE 1= 1 `
+	if condition != "" {
+		sql += condition
 	}
+	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }

models/article.go

@@ -2,7 +2,6 @@ package models
 
 import (
 	"github.com/beego/beego/v2/client/orm"
-	"strings"
 	"time"
 )
 
@@ -535,20 +534,6 @@ type ReportDetail struct {
 	ContentSub         string `description:"内容前两个章节"`
 }
 
-func GetReportList() (items []*ReportDetail, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT * FROM report WHERE  classify_id_second = '57'`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-func GetMaxArticleIdInfo() (item *ArticleDetail, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_article   ORDER BY article_id desc  LIMIT 1`
-	err = o.Raw(sql).QueryRow(&item)
-	return
-}
-
 type ArticleResultApi struct {
 	Data []ArticleResultApidate `json:"data"`
 	Code int                    `json:"code"`
@@ -647,113 +632,16 @@ type ArticleApiMap struct {
 	IsSummary int `description:"是否属于纪要，1是，0否"`
 }
 
-func GetArticleApiMap() (item []*ArticleApiMap, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT *  FROM	cygx_article_api_map WHERE	old_id > 0  AND is_update = 1 ORDER BY old_id ASC  `
-	_, err = o.Raw(sql).QueryRows(&item)
-	return
-}
-
-func GetArticleIdSubjectGroup(keyWord string) (articleid string, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT
-	GROUP_CONCAT(DISTINCT art.article_id   SEPARATOR ',') AS articleid
-FROM
-	cygx_article AS art
-	INNER JOIN cygx_industrial_article_group_subject AS sg ON sg.article_id = art.article_id
-	INNER JOIN cygx_industrial_subject AS s ON s.industrial_subject_id = sg.industrial_subject_id 
-WHERE
-	s.subject_name  LIKE '%` + keyWord + `%'  `
-	err = o.Raw(sql).QueryRow(&articleid)
-	return
-}
-
-func GetArticleIndustrialIdGroup(keyWord string) (articleid string, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT
-	GROUP_CONCAT(DISTINCT art.article_id   SEPARATOR ',') AS article_id
-FROM
-	cygx_article AS art
-	INNER JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = art.article_id
-	INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = mg.industrial_management_id 
-WHERE
-	m.industry_name LIKE  '%` + keyWord + `%'  `
-	err = o.Raw(sql).QueryRow(&articleid)
-	return
-}
-
-// 通过文章ID获取文章所关联的标的ID
-func GetSubjectIds(articleId int) (subjects string, err error) {
-	sql := ` SELECT
-			GROUP_CONCAT( DISTINCT industrial_subject_id ORDER BY id ASC SEPARATOR ',' ) AS subjects 
-			FROM
-			cygx_industrial_article_group_subject WHERE article_id = ?`
-	o := orm.NewOrm()
-	err = o.Raw(sql, articleId).QueryRow(&subjects)
-	return
-}
-
-// 修改发布状态
-func UpdateIsClassFail(articleId int) (err error) {
-	sql := `UPDATE cygx_article SET  is_class_fail=1  WHERE article_id=? `
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, articleId).Exec()
-	return
-}
-
 type SummaryArticleStock struct {
 	Id        int    `description:"新ID"`
 	ArticleId int    `description:"文章id"`
 	Stock     string `description:"个股标签"`
 }
 
-// 综述报告
-func GetSummaryArticle(chartPermissionId int) (items []*SummaryArticleStock, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-	* 
-FROM
-	cygx_article AS c
-	INNER JOIN cygx_report_mapping AS m 
-WHERE
-	c.type_name = '综述报告' 
-	AND m.category_id = c.category_id_two 
-	AND m.chart_permission_id = ? ORDER BY modify_time_by_cl DESC `
-
-	_, err = o.Raw(sql, chartPermissionId).QueryRows(&items)
-	return
-}
-
 type SummaryArticleStockResp struct {
 	List []*SummaryArticleStock
 }
 
-// 综述报告
-func GetArticleStock() (items []*SummaryArticleStock, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-			stock,article_id
-		FROM
-			cygx_article AS art 
-		WHERE
-			1 = 1 
-			AND type_name = '综述报告' `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-// 列表
-func GetCygxCygxArticleList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxArticle, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_article as art WHERE 1= 1 `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` LIMIT ?,?  `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
-	return
-}
-
 // 获取数量
 func GetCygxArticleCount(condition string, pars []interface{}) (count int, err error) {
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_article as art WHERE 1= 1  `
@@ -766,194 +654,12 @@ func GetCygxArticleCount(condition string, pars []interface{}) (count int, err e
 }
 
 // 列表
-func GetCygxCygxArticleListByCondition(articleTypesCond, activityTypesCond, industryStr, subjectNameStr, articleTypeStr string) (artIds, actIds, mmIds string, err error) {
+func GetCygxCygxArticleIdList(condition string, pars []interface{}) (items []*CygxArticle, err error) {
 	o := orm.NewOrm()
-	artSql := `SELECT GROUP_CONCAT(DISTINCT art.article_id SEPARATOR ',') AS art_ids FROM cygx_article as art `
-
-	actSql := ` SELECT GROUP_CONCAT(DISTINCT act.activity_id SEPARATOR ',') AS act_ids FROM cygx_activity as act `
-
-	mmSql := ` SELECT GROUP_CONCAT(DISTINCT mmc.id SEPARATOR ',') AS mm_ids FROM cygx_morning_meeting_review_chapter as mmc `
-
-	if industryStr != "" {
-		artSql += ` INNER JOIN cygx_industrial_article_group_management  AS iam ON iam.article_id = art.article_id 
-				INNER JOIN cygx_industrial_management AS im ON im.industrial_management_id=iam.industrial_management_id  `
-		actSql += ` INNER JOIN cygx_industrial_activity_group_management  AS iam ON iam.activity_id = act.activity_id 
-				INNER JOIN cygx_industrial_management AS im ON im.industrial_management_id=iam.industrial_management_id  `
-		mmSql += ` INNER JOIN cygx_morning_meeting_reviews  AS mm ON mmc.meeting_id = mm.id 
-				INNER JOIN cygx_industrial_management AS im ON im.industrial_management_id=mmc.industry_id  `
-	}
-	if subjectNameStr != "" {
-		artSql += ` INNER JOIN cygx_industrial_article_group_subject  AS ias ON ias.article_id = art.article_id 
-				INNER JOIN cygx_industrial_subject AS cis ON cis.industrial_subject_id=ias.industrial_subject_id  `
-		actSql += ` INNER JOIN cygx_industrial_activity_group_subject  AS ias ON ias.activity_id = act.activity_id 
-				INNER JOIN cygx_industrial_subject AS cis ON cis.industrial_subject_id=ias.industrial_subject_id  `
-		mmSql += ` IINNER JOIN cygx_morning_meeting_reviews  AS mm ON mmc.meeting_id = mm.id 
-				INNER JOIN cygx_industrial_subject AS cis ON cis.industrial_subject_id=mmc.industrial_subject_ids  `
-	}
-	artSql += ` WHERE 1=1 `
-	if articleTypesCond != "" || (articleTypesCond == "" && activityTypesCond == "") {
-		if industryStr != "" && subjectNameStr != "" {
-			artSql += articleTypesCond + ` AND (im.industry_name In (` + industryStr + `) OR cis.subject_name In (` + subjectNameStr + `) )`
-		} else if industryStr == "" && subjectNameStr != "" {
-			artSql += articleTypesCond + ` AND  cis.subject_name In (` + subjectNameStr + `) `
-		} else if industryStr != "" && subjectNameStr == "" {
-			artSql += articleTypesCond + ` AND im.industry_name In (` + industryStr + `) `
-		} else {
-			artSql += articleTypesCond
-		}
-		err = o.Raw(artSql).QueryRow(&artIds)
-	}
-
-	actSql += ` WHERE 1=1 `
-	if activityTypesCond != "" || (articleTypesCond == "" && activityTypesCond == "") {
-		if industryStr != "" && subjectNameStr != "" {
-			actSql += activityTypesCond + ` AND (im.industry_name In (` + industryStr + `) OR cis.subject_name In (` + subjectNameStr + `) )`
-		} else if industryStr == "" && subjectNameStr != "" {
-			actSql += activityTypesCond + ` AND  cis.subject_name In (` + subjectNameStr + `) `
-		} else if industryStr != "" && subjectNameStr == "" {
-			actSql += activityTypesCond + ` AND im.industry_name In (` + industryStr + `) `
-		} else {
-			actSql += activityTypesCond
-		}
-		err = o.Raw(actSql).QueryRow(&actIds)
-	}
-
-	if strings.Contains(articleTypeStr, "晨会精华") {
-		mmSql += ` WHERE 1=1 `
-		if industryStr != "" && subjectNameStr != "" {
-			mmSql += ` AND (im.industry_name In (` + industryStr + `) OR cis.subject_name In (` + subjectNameStr + `) )`
-		} else if industryStr == "" && subjectNameStr != "" {
-			mmSql += ` AND  cis.subject_name In (` + subjectNameStr + `) `
-		} else if industryStr != "" && subjectNameStr == "" {
-			mmSql += ` AND im.industry_name In (` + industryStr + `) `
-		}
-		err = o.Raw(mmSql).QueryRow(&mmIds)
-	}
-
-	return
-}
-
-// 单个tag时用，取合集
-func GetCygxCygxArticleListByConditionSoloTag(articleTypeCondSlice, activityTypesCondSlice, industriesCondSlice, subjectNamesSlice, articleTypeSlice []string) (artIds, actIds, mmIds string, err error) {
-	o := orm.NewOrm()
-	artSql := `SELECT GROUP_CONCAT(DISTINCT art.article_id SEPARATOR ',') AS art_ids FROM cygx_article as art `
-
-	actSql := ` SELECT GROUP_CONCAT(DISTINCT act.activity_id SEPARATOR ',') AS act_ids FROM cygx_activity as act `
-
-	mmSql := ` SELECT GROUP_CONCAT(DISTINCT mmc.id SEPARATOR ',') AS mm_ids FROM cygx_morning_meeting_review_chapter as mmc `
-
-	for _, s := range industriesCondSlice {
-		if s != "" {
-			artSql += ` INNER JOIN cygx_industrial_article_group_management  AS iam ON iam.article_id = art.article_id 
-				INNER JOIN cygx_industrial_management AS im ON im.industrial_management_id=iam.industrial_management_id  `
-			actSql += ` INNER JOIN cygx_industrial_activity_group_management  AS iam ON iam.activity_id = act.activity_id 
-				INNER JOIN cygx_industrial_management AS im ON im.industrial_management_id=iam.industrial_management_id  `
-			mmSql += ` INNER JOIN cygx_morning_meeting_reviews  AS mm ON mmc.meeting_id = mm.id 
-				INNER JOIN cygx_industrial_management AS im ON im.industrial_management_id=mmc.industry_id  `
-
-			break
-		}
-	}
-	for _, s := range subjectNamesSlice {
-		if s != "" {
-			artSql += ` INNER JOIN cygx_industrial_article_group_subject  AS ias ON ias.article_id = art.article_id 
-				INNER JOIN cygx_industrial_subject AS cis ON cis.industrial_subject_id=ias.industrial_subject_id  `
-			actSql += ` INNER JOIN cygx_industrial_activity_group_subject  AS ias ON ias.activity_id = act.activity_id 
-				INNER JOIN cygx_industrial_subject AS cis ON cis.industrial_subject_id=ias.industrial_subject_id  `
-			mmSql += ` IINNER JOIN cygx_morning_meeting_reviews  AS mm ON mmc.meeting_id = mm.id 
-				INNER JOIN cygx_industrial_subject AS cis ON cis.industrial_subject_id=mmc.industrial_subject_ids  `
-
-			break
-		}
-	}
-	artSql += ` WHERE 1=1 AND ((1=1 `
-	actSql += ` WHERE 1=1 AND ((1=1 `
-	mmSql += ` WHERE 1=1 AND ((1=1 `
-	var isNeedArt, isNeedAct, isNeedMm bool
-	for i, _ := range articleTypeCondSlice {
-		articleTypesCond := articleTypeCondSlice[i]
-		activityTypesCond := activityTypesCondSlice[i]
-		industryStr := industriesCondSlice[i]
-		subjectNameStr := subjectNamesSlice[i]
-		articleTypeStr := articleTypeSlice[i]
-
-		if articleTypesCond != "" || (articleTypesCond == "" && activityTypesCond == "") {
-			if industryStr != "" && subjectNameStr != "" {
-				artSql += articleTypesCond + ` AND (im.industry_name In (` + industryStr + `) OR cis.subject_name In (` + subjectNameStr + `) )`
-			} else if industryStr == "" && subjectNameStr != "" {
-				artSql += articleTypesCond + ` AND  cis.subject_name In (` + subjectNameStr + `) `
-			} else if industryStr != "" && subjectNameStr == "" {
-				artSql += articleTypesCond + ` AND im.industry_name In (` + industryStr + `) `
-			} else {
-				artSql += articleTypesCond
-			}
-
-			if i == len(articleTypeCondSlice)-1 {
-				artSql += `)) `
-			} else {
-				artSql += `) OR (1=1 `
-			}
-
-			isNeedArt = true
-		}
-
-		if activityTypesCond != "" || (articleTypesCond == "" && activityTypesCond == "") {
-			if industryStr != "" && subjectNameStr != "" {
-				actSql += activityTypesCond + ` AND (im.industry_name In (` + industryStr + `) OR cis.subject_name In (` + subjectNameStr + `) )`
-			} else if industryStr == "" && subjectNameStr != "" {
-				actSql += activityTypesCond + ` AND  cis.subject_name In (` + subjectNameStr + `) `
-			} else if industryStr != "" && subjectNameStr == "" {
-				actSql += activityTypesCond + ` AND im.industry_name In (` + industryStr + `) `
-			} else {
-				actSql += activityTypesCond
-			}
-
-			if i == len(articleTypeCondSlice)-1 {
-				actSql += `)) `
-			} else {
-				actSql += `) OR (1=1 `
-			}
-
-			isNeedAct = true
-		}
-
-		if strings.Contains(articleTypeStr, "晨会精华") {
-			if industryStr != "" && subjectNameStr != "" {
-				mmSql += ` AND (im.industry_name In (` + industryStr + `) OR cis.subject_name In (` + subjectNameStr + `) )`
-			} else if industryStr == "" && subjectNameStr != "" {
-				mmSql += ` AND  cis.subject_name In (` + subjectNameStr + `) `
-			} else if industryStr != "" && subjectNameStr == "" {
-				mmSql += ` AND im.industry_name In (` + industryStr + `) `
-			}
-
-			if i == len(articleTypeCondSlice)-1 {
-				mmSql += `)) `
-			} else {
-				mmSql += `) OR (1=1 `
-			}
-
-			isNeedMm = true
-		}
-	}
-
-	if isNeedArt {
-		err = o.Raw(artSql).QueryRow(&artIds)
-		if err != nil {
-			return
-		}
-	}
-	if isNeedAct {
-		err = o.Raw(actSql).QueryRow(&actIds)
-		if err != nil {
-			return
-		}
-	}
-	if isNeedMm {
-		err = o.Raw(mmSql).QueryRow(&mmIds)
-		if err != nil {
-			return
-		}
+	sql := `SELECT article_id FROM cygx_article as art WHERE 1= 1 `
+	if condition != "" {
+		sql += condition
 	}
-
+	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }

models/banner.go

@@ -1,91 +1,10 @@
 package models
 
-import (
-	"github.com/beego/beego/v2/client/orm"
-)
-
-type CygxBannerResp struct {
-	BannerId       int            `description:"BannerId等于0新增，大于零修改"`
-	ImgId          int            `description:"cygx_banner_img主键ID"`
-	IndexImg       string         `description:"小程序封面图"`
-	ListType       string         `description:"ABC哪一列"`
-	BannerTypeName string         `description:"添加类型名称"`
-	Title          string         `description:"标题"`
-	Link           string         `description:"链接地址"`
-	Subtitle       string         `description:"副标题"`
-	BannerUrlResp  *BannerUrlResp `description:"跳转地址"`
-}
-
-type CygxBannerIdReq struct {
-	BannerId int `description:"BannerId"`
-}
-
-type GetCygxBannerImgRespDetailResp struct {
-	Detail *CygxBannerResp
-}
-
-// 通过ID获取详情
-func GetCygxBannerDetail(banneId int) (item *CygxBannerResp, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_banner  WHERE banner_id=? `
-	err = o.Raw(sql, banneId).QueryRow(&item)
-	return
-}
-
-// 获取数量
-func GetCygxBannerCount(condition string, pars []interface{}) (count int, err error) {
-	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_banner as art WHERE 1= 1  `
-	if condition != "" {
-		sqlCount += condition
-	}
-	o := orm.NewOrm()
-	err = o.Raw(sqlCount, pars).QueryRow(&count)
-	return
-}
-
-// 列表
-func GetCygxBannerList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxBannerResp, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_banner as art WHERE 1= 1 `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` LIMIT ?,?  `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
-	return
-}
-
-type CygxBannerListResp struct {
-	List []*CygxBannerResp
-}
-
-type CygxBannerImgResp struct {
-	ImgId    int    `description:"图片ID"`
-	IndexImg string `description:"小程序封面图"`
-}
-
-type BannerUrlResp struct {
-	ChartPermissionId int    `description:"行业id"`
-	SourceId          int    `description:"资源ID"`
-	Type              int    `description:"类型：1普通文本，2：文章、3：活动、4：产业、5:关于我们、6:产品内测"`
-	Body              string `description:"内容"`
-	Path              string `description:"小程序路径"`
-}
-
 type BannerUrlYxResp struct {
 	IndexImg string `description:"小程序封面图"`
 	Path     string `description:"小程序路径"`
 }
 
-type BannerUrlYxListResp struct {
-	ListA []*BannerUrlYxResp
-	ListB []*BannerUrlYxResp
-}
-
-// 列表
-func GetCygxBannerImgList() (items []*CygxBannerImgResp, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_banner_img as art WHERE 1= 1 `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
+type BannerUrHomeListResp struct {
+	List []*BannerUrlYxResp
 }

models/chart_permission.go

@@ -23,37 +23,6 @@ type ChartPermissionResp struct {
 	List []*ChartPermission
 }
 
-func GetChartPermissionAll(condition string) (items []*ChartPermission, err error) {
-	o := orm.NewOrmUsingDB("weekly_report")
-	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND show_type=1  AND permission_type!=2  ` + condition + ` ORDER BY sort ASC `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-func GetChartPermissionListRai() (items []*ChartPermission, err error) {
-	o := orm.NewOrmUsingDB("weekly_report")
-	sql := `SELECT * FROM chart_permission WHERE product_id=2  ORDER BY sort ASC `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-func GetCategoryId(chartPermissionId int) (category_id string, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT GROUP_CONCAT(a.category_id) AS category_id 
-			FROM cygx_report_mapping AS a
-			WHERE a.chart_permission_id=? AND a.is_summary = 1
-			GROUP BY a.chart_permission_id `
-	err = o.Raw(sql, chartPermissionId).QueryRow(&category_id)
-	return
-}
-
-func GetChartPermissionReportAll(condition string) (items []*ChartPermission, err error) {
-	o := orm.NewOrmUsingDB("weekly_report")
-	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND is_report=1 AND permission_type!=2 ` + condition + ` ORDER BY sort ASC `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
 func GetChartPermissionById(chartPermissionId int) (item *ChartPermission, err error) {
 	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT * FROM chart_permission WHERE chart_permission_id = ? `
@@ -119,36 +88,3 @@ func GetUserCompanyPermissionSandO(companyId int) (items []*ActivityChartPermiss
 	_, err = o.Raw(sql, companyId).QueryRows(&items)
 	return
 }
-
-// 获取策略下面的所有分类
-func GetCompanyReportPermissionAll() (items []*CompanyReportPermission, err error) {
-	o := orm.NewOrmUsingDB("weekly_report")
-	sql := `SELECT * FROM company_report_permission WHERE chart_permission_id IN (19,20,21,22) AND status IN ('正式','试用','永续')  AND created_time <= '2021-12-28 15:05:43'`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-// 获取海通国际开通的默认权限
-func GetCompanyPermissionIdWithHtgj() (chartpermissionids string, err error) {
-	sql := ` SELECT GROUP_CONCAT(DISTINCT chart_permission_id  ORDER BY b.sort ASC  SEPARATOR ',') AS chartpermissionids
-			FROM chart_permission as  b 
-			WHERE chart_permission_name IN ('医药','消费','科技','智造','买方研选')`
-	o := orm.NewOrmUsingDB("weekly_report")
-	err = o.Raw(sql).QueryRow(&chartpermissionids)
-	return
-}
-
-// GetChartPermissionById 主键获取权限
-func GetChartPermissionByRemark(remark string) (item *ChartPermission, err error) {
-	o := orm.NewOrmUsingDB("weekly_report")
-	sql := `SELECT * FROM chart_permission WHERE remark = ? LIMIT 1`
-	err = o.Raw(sql, remark).QueryRow(&item)
-	return
-}
-
-func GetChartPermissionIdByName(condition string, pars []interface{}) (chartpermissionids string, err error) {
-	o := orm.NewOrmUsingDB("weekly_report")
-	sql := `SELECT GROUP_CONCAT(DISTINCT chart_permission_id   SEPARATOR ',') AS chartpermissionids FROM chart_permission  WHERE product_id=2  ` + condition
-	err = o.Raw(sql, pars).QueryRow(&chartpermissionids)
-	return
-}

models/cygx_tag.go

@@ -65,74 +65,12 @@ func GetCygxTagListCondition(condition string, pars []interface{}, startSize, pa
 	return
 }
 
-// 获取tag列表
-func GetCygxTagList(cond string) (items []*CygxTagList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_tag  WHERE 1=1 AND status = 1 `
-	if cond != "" {
-		sql += cond
-	} else {
-		sql += `  ORDER BY sort ASC `
-	}
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-func UpdateCygxTagStatus(id, status int) (err error) {
-	o := orm.NewOrm()
-	sql := ``
-	if status == 1 {
-		sql = ` UPDATE  cygx_tag
-			SET
-			  status =1,
-			  online_time = NOW(),
-			  modify_time = NOW() 
-			WHERE tag_id = ?`
-	} else {
-		sql = ` UPDATE  cygx_tag
-			SET
-			  status =0,
-			  offline_time = NOW(),
-			  modify_time = NOW() 
-			WHERE tag_id = ?`
-	}
-
-	_, err = o.Raw(sql, id).Exec()
-	return
-}
-
-// GetCygxTagByTagId 根据指标id获取指标信息
-func GetCygxTagByTagId(tagId int) (item *CygxTag, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_tag WHERE tag_id=? `
-	err = o.Raw(sql, tagId).QueryRow(&item)
-	return
-}
-
-// GetCygxTagMinSort 获取最小不等于0的排序
-func GetCygxTagMinSort() (sort int, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT min(sort) FROM cygx_tag WHERE  sort <> 0 `
-	err = o.Raw(sql).QueryRow(&sort)
-	return
-}
-
-// MoveDownCygxTagBySort 往下移动
-func MoveDownCygxTagBySort(prevSort, currentSort int) (err error) {
-	o := orm.NewOrm()
-	sql := `update cygx_tag set sort = sort - 1 where sort <= ? and sort> ? `
-	_, err = o.Raw(sql, prevSort, currentSort).Exec()
-	return
-}
-
-// MoveUpCygxTagBySort 往下移动
-func MoveUpCygxTagBySort(prevSort, currentSort int) (err error) {
-	o := orm.NewOrm()
-	sql := `update cygx_tag set sort = sort + 1 where sort >= ? and sort< ? `
-	_, err = o.Raw(sql, prevSort, currentSort).Exec()
-	return
-}
-
 type CygxTagIdReq struct {
 	TagId int `description:"TagId"`
 }
+
+type CygxTagListLabelResp struct {
+	List1 []string
+	List2 []string
+	List3 []string
+}

routers/commentsRouter.go

@@ -252,35 +252,8 @@ func init() {
 
     beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:BannerController"] = append(beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:BannerController"],
         beego.ControllerComments{
-            Method: "History",
-            Router: `/add/history`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:BannerController"] = append(beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:BannerController"],
-        beego.ControllerComments{
-            Method: "List",
-            Router: `/list`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:BannerController"] = append(beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:BannerController"],
-        beego.ControllerComments{
-            Method: "ListYx",
-            Router: `/listYx`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:BannerController"] = append(beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:BannerController"],
-        beego.ControllerComments{
-            Method: "YxSurveyDetail",
-            Router: `/yxSurvey/detail`,
+            Method: "ListHome",
+            Router: `/listhome`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,
@@ -403,33 +376,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:HomeController"] = append(beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:HomeController"],
-        beego.ControllerComments{
-            Method: "ListHomeArtAndChart",
-            Router: `/artAndChart/list`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:HomeController"] = append(beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:HomeController"],
-        beego.ControllerComments{
-            Method: "HeaderTab",
-            Router: `/header_tab`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:HomeController"] = append(beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:HomeController"],
-        beego.ControllerComments{
-            Method: "ListHome",
-            Router: `/list`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:HomeController"] = append(beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:HomeController"],
         beego.ControllerComments{
             Method: "NewList",
@@ -585,17 +531,8 @@ func init() {
 
     beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:TagController"] = append(beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:TagController"],
         beego.ControllerComments{
-            Method: "History",
-            Router: `/add/history`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:TagController"] = append(beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:TagController"],
-        beego.ControllerComments{
-            Method: "TagCustomizeList",
-            Router: `/list/custom`,
+            Method: "ListLabel",
+            Router: `/list/label`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,

routers/router.go

@@ -81,6 +81,11 @@ func init() {
 				&controllers.ActivitySignCoAntroller{},
 			),
 		),
+		web.NSNamespace("/banner",
+			web.NSInclude(
+				&controllers.BannerController{},
+			),
+		),
 		web.NSNamespace("/tag",
 			web.NSInclude(
 				&controllers.TagController{},

services/activity.go

@@ -7,8 +7,6 @@ import (
 	"hongze/hongze_mfyx/utils"
 	"strconv"
 	"strings"
-	"time"
-	"unicode/utf8"
 )
 
 // 获取 用户类型   //1、永续客户 //2、大套餐客户（4个行业全开通的正式客户） //3、分行业套餐客户（开通对应行业的正式客户） //4、仅开通专家套餐的正式客户 //5、开通对应行业套餐或专家套餐的试用客户;6、冻结客户；7、流失客户
@@ -508,289 +506,6 @@ func CheckUserPowerByActivityChoose(user *models.WxUserItem, activityInfo *model
 	return
 }
 
-// 获取活动列表查询权限的SQL
-// @Param   ChartPermissionIds   query   string  false     "行业id 多个用 , 隔开"
-// @Param   ActivityTypeIds   query   string  false     "活动类型id 多个用 , 隔开"
-// @Param   ActiveState   query   string  false       "活动进行状态 未开始：1、进行中2、已结束3"
-// @Param   WhichDay   query   string  false       "哪一天 今天：1、明天:2，多个用 , 隔开"
-// @Param   IsPower   query   int  false       "是否选择有权限行业 ，1是 0 否 默认0"
-// @Param   Label   query   string  false       "搜索主题 多个用 , 隔开"
-// @Param   PlayBack   query   int  false       "是否仅展示回放 1：是、0：否 默认0"
-// @Param   KeyWord   query   string  false       "搜索关键词 多个用 , 隔开"
-// @Param   ikType   query   int  false       "联想词类型 ， 1不做联想，2，做除初始词的联想，3所有联想"
-func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermissionIds, whichDay, activeState, label string, isPower, source int, keyWord string, playBack, ikType int) (conditionActivity string, err error) {
-	keyWordNoIk := keyWord
-	adminIds, err := models.GetSelleridWhichGroup(user.CompanyId, 2)
-	if err != nil {
-		return
-	}
-	userType, permissionStr, permissionStrZhengShi, err := GetUserTypeZhengShi(user.CompanyId)
-	if err != nil {
-		return
-	}
-	//判断客户规模是否属于可见范围的活动
-	companyProduct, err := models.GetCompanyProductDetail(user.CompanyId, 2)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		return
-	}
-	isMaker := user.IsMaker
-	slicePer := strings.Split(permissionStr, ",")
-	var permissionSqlStr string
-	var permissionNameStr string
-	for _, v := range slicePer {
-		if userType == 1 {
-			//研选权限处理
-			if !strings.Contains(v, utils.CHART_PERMISSION_NAME_YANXUAN) {
-				permissionNameStr += "'" + v + "',"
-			}
-		} else {
-			permissionNameStr += "'" + v + "',"
-		}
-	}
-	permissionNameStr = strings.Replace(permissionNameStr, "(主观)", "", -1)
-	permissionNameStr = strings.Replace(permissionNameStr, "(客观)", "", -1)
-	permissionNameStr = strings.TrimRight(permissionNameStr, ",")
-
-	slicePerZhengShi := strings.Split(permissionStrZhengShi, ",")
-
-	var permissionNameStrZhengShi string
-	for _, v := range slicePerZhengShi {
-		if userType == 1 {
-			//研选权限处理
-			if !strings.Contains(v, utils.CHART_PERMISSION_NAME_YANXUAN) {
-				permissionNameStrZhengShi += "'" + v + "',"
-			}
-		} else {
-			permissionNameStrZhengShi += "'" + v + "',"
-		}
-	}
-	permissionNameStrZhengShi = strings.Replace(permissionNameStrZhengShi, "(主观)", "", -1)
-	permissionNameStrZhengShi = strings.Replace(permissionNameStrZhengShi, "(客观)", "", -1)
-	permissionNameStrZhengShi = strings.TrimRight(permissionNameStrZhengShi, ",")
-	mapUserType, e := GetActivityCcustomerTypeList()
-	if e != nil {
-		err = e
-		return
-	}
-	var userTypeStr string
-	userTypeStr = mapUserType[userType]
-	// 查研观向7.4-始终查询宏观的权限(无论是否有权限)
-	if permissionNameStr == `` {
-		permissionNameStr = `'宏观'`
-	} else {
-		permissionNameStr += `, '宏观'`
-	}
-	var condition string
-	var conditionAdmin string
-	var conditionHz string // 弘则权限处理
-	var sqlExport string   // 专家权限处理
-	//permissionSqlStr = `  AND art.chart_permission_name  IN (` + permissionNameStr + `)`
-	sqlExport = ` AND (art.customer_type_ids LIKE '%` + userTypeStr + `%' `
-	//if userType == 2 {
-	//	sqlExport += ` OR  art.customer_type_ids LIKE '%3%' `
-	//}
-	//if (userType == 2 || userType == 3) && strings.Contains(permissionStr, "专家") {
-	//	sqlExport += ` OR  art.customer_type_ids LIKE '%4%' `
-	//}
-	sqlExport += `) `
-	// 如果是C类电话会就不展示内容，且合并到分析师电话会
-	if activityTypeId != "" {
-		if activityTypeId == strconv.Itoa(utils.ANALYST_TELL_ACTIVITY_TYPE_ID) {
-			condition = ` AND art.publish_status = 1  AND art.label != ''  AND art.activity_type_id IN (` + activityTypeId + "," + strconv.Itoa(utils.C_CLASS_ACTIVITY_TYPE_ID) + `)`
-		} else {
-			condition = ` AND art.publish_status = 1  AND art.label != ''  AND art.activity_type_id IN (` + activityTypeId + `)`
-		}
-	}
-
-	//主题
-	if label != "" {
-		condition = ` AND art.label  LIKE "%` + label + `%" `
-	}
-
-	if isPower == 1 {
-		condition += permissionSqlStr
-	}
-
-	//行业名称
-	if len(chartPermissionIds) > 0 {
-		condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
-	}
-	//如果是PC的，则不看易董的
-	if source == 1 {
-		condition += ` AND art.yidong_activity_id = '' `
-	}
-
-	var conditionOr string
-	if whichDay != "" {
-		var startDate string
-		var endDate string
-		if whichDay == "1" {
-			startDate = time.Now().Format(utils.FormatDate)
-			endDate = startDate
-		} else if whichDay == "2" {
-			startDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
-			endDate = startDate
-		} else if whichDay == "3" {
-			startDate = utils.GetNowWeekMonday().Format(utils.FormatDate)
-			endDate = utils.GetNowWeekSunday().Format(utils.FormatDate)
-		} else if whichDay == "4" {
-			startDate = utils.GetLastWeekMonday().Format(utils.FormatDate)
-			endDate = utils.GetLastWeekSunday().Format(utils.FormatDate)
-		} else if whichDay == "5" {
-			startDate = utils.GetNowMonthFirstDay().Format(utils.FormatDate)
-			endDate = utils.GetNowMonthLastDay().Format(utils.FormatDate)
-		} else if whichDay == "6" {
-			startDate = utils.GetLastMonthFirstDay().Format(utils.FormatDate)
-			endDate = utils.GetLastMonthLastDay().Format(utils.FormatDate)
-		} else if whichDay == "1,2" {
-			startDate = time.Now().Format(utils.FormatDate)
-			endDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
-		} else if whichDay == "3,4" {
-			startDate = utils.GetLastWeekMonday().Format(utils.FormatDate)
-			endDate = utils.GetNowWeekSunday().Format(utils.FormatDate)
-		} else if whichDay == "5,6" {
-			startDate = utils.GetLastMonthFirstDay().Format(utils.FormatDate)
-			endDate = utils.GetNowMonthLastDay().Format(utils.FormatDate)
-		} else {
-			startDate = time.Now().Format(utils.FormatDate)
-			endDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
-		}
-		condition += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
-		condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
-	}
-
-	//有搜索条件传过来时，不判进行状态条件
-	if keyWord != "" {
-		if ikType == 2 || ikType == 3 {
-			keyWordArr, e := GetIndustryMapNameSliceV3(keyWord)
-			if e != nil {
-				err = errors.New("获取分词失败,GetIndustryMapNameSliceV3, Err: " + keyWord + e.Error())
-				return
-			}
-			keyWordArr = RemoveDuplicatesAndEmpty(keyWordArr)
-			//var keywords string
-			if len(keyWordArr) > 1 {
-				if ikType == 2 {
-					keyWord = KeyWordArrSqlRegexp(keyWordArr)
-					condition += `	AND (art.label NOT LIKE  '%` + keyWordNoIk + `%' AND   art.activity_name NOT LIKE '%` + keyWordNoIk + `%' ) `
-				} else if ikType == 3 {
-					keyWord = KeyWordArrSqlRegexpAll(keyWordArr)
-				}
-			}
-		}
-		condition += ` AND (art.label   REGEXP '` + keyWord + `' OR art.activity_name  REGEXP '` + keyWord + `' ) `
-	} else {
-		if activeState != "" {
-			// 默认查看未开始跟进行中
-			if activeState == "1" {
-				condition += ` AND art.active_state  IN (1,2)`
-			} else {
-				condition += ` AND art.active_state  IN (` + activeState + `)`
-			}
-		} else {
-			condition += ` AND art.active_state  IN (1,2)`
-		}
-	}
-
-	if playBack == 1 {
-		var pars []interface{}
-		ativityVIdArry := make([]string, 0)
-		voiceList, e := models.GetActivityVoiceListAll("", pars, 0, 1000)
-		if e != nil && e.Error() != utils.ErrNoRow() {
-			err = e
-			return
-		}
-		for _, v := range voiceList {
-			ativityVIdArry = append(ativityVIdArry, strconv.Itoa(v.ActivityId))
-		}
-
-		videoList, e := models.GetActivityVideoListAll("", pars, 0, 1000)
-		if e != nil && e.Error() != utils.ErrNoRow() {
-			err = e
-			return
-		}
-		for _, v := range videoList {
-			ativityVIdArry = append(ativityVIdArry, strconv.Itoa(v.ActivityId))
-		}
-
-		//活动音频，设置有效时间为30天，失效后该活动就不再支持音频回放。有效期起始时间为活动的开始时间
-		//endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
-		//condition += ` AND art.activity_time > '` + endTime + `'  `
-		if len(ativityVIdArry) > 0 {
-			ativityVIdstr := strings.Join(ativityVIdArry, ",")
-			condition += ` AND art.activity_id IN  (` + ativityVIdstr + `) `
-		} else {
-			condition += ` AND art.activity_id = 0    `
-		}
-	}
-
-	//查询全部可见的数据（是否全部客户可见）
-	//condition += ` AND art.visible_range != 1  AND art.publish_status = 1 `
-	condition += `   AND art.publish_status = 1 `
-	if adminIds == "" {
-		//condition += `  AND art.visible_range != 1 `
-	} else {
-		condition += ` 	AND ( art.visible_range != 1  OR  (	 art.admin_id IN ( ` + adminIds + ` )  AND art.visible_range = 1 ))  `
-	}
-
-	conditionHz = condition
-	//活动仅决策人可见
-	if isMaker == 0 {
-		condition += ` AND art.is_maker_show = 0  `
-	}
-	conditionAdmin = condition + `  AND art.visible_range = 1 `
-	//condition += `  AND art.visible_range != 1 `
-	if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
-		conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
-	}
-	if (userType == 5) && strings.Contains(permissionStr, "专家") {
-		conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%5%'	 ` + condition + `) `
-	}
-	if userType == 1 {
-		conditionOr += ` OR ( art.is_limit_people = 0 ` + condition + permissionSqlStr + `) `
-	} else {
-		conditionOr += ` OR ( art.is_limit_people = 0 ` + condition + `) `
-	}
-	if userType == 6 || userType == 7 {
-		conditionOr += ` OR (   art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%'	 ` + condition + `) `
-	}
-	if companyProduct != nil {
-		if companyProduct.Scale != "" {
-			conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
-		}
-	}
-
-	if adminIds != "" {
-
-		if userType == 3 {
-			conditionAdmin += `  AND art.chart_permission_name  IN (` + permissionNameStrZhengShi + `) `
-		}
-		conditionOr += ` OR (  art.customer_type_ids LIKE '%` + userTypeStr + `%' ` + ` AND  art.admin_id IN (` + adminIds + `) ` + conditionAdmin + `) `
-		if companyProduct != nil {
-			if companyProduct.Scale != "" {
-				conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'` + ` AND  art.admin_id IN (` + adminIds + `) ` + conditionAdmin + `) `
-			}
-		}
-	}
-
-	//弘则研究下的客户不做权限，限制，C类电话会，仅本组销售、部门管理员、admin、权益研究员账号能看到
-	if user.CompanyId == utils.HZ_COMPANY_ID {
-		mapMobile, e := GetAdminMobileMap()
-		if e != nil {
-			err = e
-			return
-		}
-		if _, ok := mapMobile[user.Mobile]; ok {
-			conditionOr += ` OR (  art.publish_status = 1 ` + conditionHz + `) `
-		}
-	}
-	if userType == 3 {
-		condition += `  AND art.chart_permission_name  IN (` + permissionNameStrZhengShi + `) `
-	}
-	conditionActivity = condition + permissionSqlStr + sqlExport + conditionOr
-	return
-}
-
 // 根据用户身份处理活动可见
 func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower int) (conditionActivity string, err error) {
 	//未登录的用户也可以查看所有活动v12.2.1
@@ -933,203 +648,6 @@ func LabelStr(label string) (labelNew string) {
 	return labelNew
 }
 
-// 5.3版本活动标签字符串处理
-func LabelStrV5(label string, isShowSubjectName int, temporaryLabel string) (labelNew string) {
-	slicebr := strings.Split(label, "-")
-	if len(slicebr) > 1 {
-		if isShowSubjectName == 1 {
-			labelNew = slicebr[1]
-		} else {
-			labelNew = slicebr[0]
-		}
-	} else {
-		labelNew = label
-	}
-	if temporaryLabel != "" {
-		labelNew = temporaryLabel
-	}
-	return labelNew
-}
-
-// 查研观向处理活动用户限制报名
-func AddCygxActivityRestrictSignupByAdmin(activityId int) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("err：", err)
-			go utils.SendAlarmMsg("查研观向处理活动用户限制报名失败，Err："+err.Error()+"activityId"+strconv.Itoa(activityId), 3)
-		}
-	}()
-	activityInfo, e := models.GetAddActivityInfoById(activityId)
-	if e != nil {
-		err = errors.New("GetAddActivityInfoById" + e.Error())
-		return
-	}
-	if activityInfo == nil {
-		return
-	}
-	//不限制报名的不做爽约限制处理
-	//if activityInfo.IsLimitPeople > 0 {
-	//total, err := cygx.GetActivitySignupNomeetingCount(activityId)
-
-	if err != nil {
-		return
-	}
-	mobileList, _ := models.GetUserMeetingMobile(activityId)
-	var userIdArr []int
-	if len(mobileList) > 0 {
-		for _, v := range mobileList {
-			userIdArr = append(userIdArr, v.UserId)
-		}
-		lenuserIdArr := len(userIdArr)
-		var condition string
-		var pars []interface{}
-		condition = ` AND user_id IN (` + utils.GetOrmInReplace(lenuserIdArr) + `)`
-
-		pars = append(pars, userIdArr)
-		restrictSignupList, e := models.GetCygxActivityRestrictSignupList(condition, pars, 0, 9999)
-		if e != nil {
-			err = errors.New("GetCygxActivityRestrictSignupList" + e.Error())
-			return
-		}
-		//获取这些用户是否被加入到限制报名了
-		maptotalRestrict := make(map[int]bool)
-		for _, v := range restrictSignupList {
-			maptotalRestrict[v.UserId] = true
-		}
-
-		pars = make([]interface{}, 0)
-		condition = `   AND a.is_limit_people  = 1  AND  v.is_meeting = 0 	AND  v.do_fail_type = 0   AND  v.user_id IN (` + utils.GetOrmInReplace(lenuserIdArr) + `)`
-		pars = append(pars, userIdArr)
-		listSignup, e := models.GetActivitySignupInnerActivityList(condition, pars)
-		if e != nil && e.Error() != utils.ErrNoRow() {
-			err = errors.New("GetActivitySignupInnerActivityList" + e.Error())
-			return
-		}
-		mapNomeet := make(map[int]int)
-		if len(listSignup) > 0 {
-			for _, v := range listSignup {
-				mapNomeet[v.UserId]++
-			}
-		}
-		var userIdDelArr []int
-		for _, v := range mobileList {
-			//如果加入了爽约限制但是爽约次数少于3条就删除爽约记录
-			if maptotalRestrict[v.UserId] && mapNomeet[v.UserId] < 3 {
-				userIdDelArr = append(userIdDelArr, v.UserId)
-			}
-		}
-		if len(userIdDelArr) > 0 {
-			e = models.DeleteCygxActivityRestrictSignupByUserIds(userIdDelArr)
-			if e != nil {
-				err = errors.New("DeleteCygxActivityRestrictSignupByUserIds" + e.Error())
-				return
-			}
-		}
-	}
-	//if total == 0 {
-	//	return
-	//}
-	//}
-	list, e := models.GetActivitySignupNomeetingCountList(activityId)
-	if e != nil {
-		err = errors.New("GetActivitySignupNomeetingCountList" + e.Error())
-		return
-	}
-	var userIdSiginArr []int
-	var items []*models.CygxActivitySignupBreak
-	for _, v := range list {
-		userIdSiginArr = append(userIdSiginArr, v.UserId)
-		//添加爽约记录
-		item := new(models.CygxActivitySignupBreak)
-		item.UserId = v.UserId
-		item.ActivityId = v.ActivityId
-		item.CreateTime = time.Now()
-		item.Mobile = v.Mobile
-		item.Email = v.Email
-		item.CompanyId = v.CompanyId
-		item.CompanyName = v.CompanyName
-		item.RealName = v.RealName
-		item.SellerName = v.SellerName
-		items = append(items, item)
-	}
-	if len(list) == 0 {
-		return
-	}
-
-	var itemsRestrict []*models.CygxActivityRestrictSignup
-	maptotalRestrict := make(map[int]bool)
-	lenuserIdSiginArr := len(userIdSiginArr)
-	var condition string
-	var pars []interface{}
-	condition = ` AND user_id IN (` + utils.GetOrmInReplace(lenuserIdSiginArr) + `)`
-	pars = append(pars, userIdSiginArr)
-	restrictSignupList, e := models.GetCygxActivityRestrictSignupList(condition, pars, 0, 9999)
-	if e != nil {
-		err = errors.New("GetCygxActivityRestrictSignupList" + e.Error())
-		return
-	}
-	//获取这些用户是否被加入到限制报名了
-	for _, v := range restrictSignupList {
-		maptotalRestrict[v.UserId] = true
-	}
-
-	pars = make([]interface{}, 0)
-	condition = `    AND a.is_limit_people  = 1  AND  v.is_meeting = 0 	AND  v.do_fail_type = 0  AND user_id IN (` + utils.GetOrmInReplace(lenuserIdSiginArr) + `)`
-	pars = append(pars, userIdSiginArr)
-	listSignup, e := models.GetActivitySignupInnerActivityList(condition, pars)
-	if e != nil && e.Error() != utils.ErrNoRow() {
-		err = errors.New("GetActivitySignupInnerActivityList" + e.Error())
-		return
-	}
-	mapNomeet := make(map[int]int)
-	if len(listSignup) > 0 {
-		for _, v := range listSignup {
-			mapNomeet[v.UserId]++
-		}
-	}
-
-	for _, v := range mobileList {
-		//如果加入了爽约限制但是爽约次数少于3条就删除爽约记录
-		if !maptotalRestrict[v.UserId] && mapNomeet[v.UserId] >= 3 {
-			itemRestrict := new(models.CygxActivityRestrictSignup)
-			itemRestrict.UserId = v.UserId
-			itemRestrict.CreateTime = time.Now()
-			itemRestrict.Mobile = v.Mobile
-			itemRestrict.Email = v.Email
-			itemRestrict.CompanyId = v.CompanyId
-			itemRestrict.CompanyName = v.CompanyName
-			itemRestrict.IsRestrict = 1
-			itemsRestrict = append(itemsRestrict, itemRestrict)
-		}
-	}
-
-	err = models.DeleteCygxActivitySignupBreakById(activityId)
-	if err != nil {
-		err = errors.New("DeleteCygxActivitySignupBreakById" + err.Error())
-		return
-	}
-
-	//添加爽约记录
-	if len(items) > 0 {
-		_, e = models.AddCygxActivitySignupBreakList(items)
-		if e != nil {
-			err = errors.New("AddCygxActivitySignupBreakList, Err: " + e.Error())
-			return
-		}
-	}
-
-	//添加报名限制
-	if len(itemsRestrict) > 0 {
-		_, e = models.AddCygxActivityRestrictSignupList(itemsRestrict)
-		if e != nil {
-			err = errors.New("AddCygxActivityRestrictSignupList, Err: " + e.Error())
-			return
-		}
-	}
-
-	return
-}
-
 // 判断预约纪要按钮是否显示
 func IsShowAppointment(activityTypeId int, chartPermissionName string) (isShowAppointment bool) {
 	if activityTypeId == 1 || activityTypeId == 2 || activityTypeId == 3 || activityTypeId == 4 {
@@ -1576,18 +1094,6 @@ func GetActivityVoiceResp(mapActivityId []int) (mapItem map[int]*models.CygxActi
 	return
 }
 
-// AddActivitykeyWordSearch 添加活动搜索记录
-func AddActivitykeyWordSearch(keyWordSearch string, user *models.WxUserItem) {
-	if keyWordSearch != "" {
-		keyWordItem := new(models.CygxUserSearchKeyWord)
-		keyWordItem.UserId = user.UserId
-		keyWordItem.KeyWord = keyWordSearch
-		keyWordItem.PageType = "ActivitSearch"
-		keyWordItem.CreateTime = time.Now()
-		go models.AddUserSearchKeyWord(keyWordItem)
-	}
-}
-
 // GetActivityVideoResp 处理活动视频频回放
 func GetActivityVideoResp(mapActivityId []int) (mapItem map[int]*models.CygxActivityVideoListResp, err error) {
 	var condition string
@@ -1752,41 +1258,6 @@ func GetActivityReportLinkToArticleList(item *models.ActivityDetail) (items []*m
 	return
 }
 
-// GetActivityCityResp 获取活动关联城市，当同一个活动标签对应多个城市的时候，展示最近举办的活动
-func GetActivityCityResp() (mapItem map[string]string, err error) {
-	activityList, err := models.GetActivityLabelListCity()
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		return
-	}
-	mapActivityCity := make(map[string]string)
-	if len(activityList) > 0 {
-		for _, v := range activityList {
-			if v.ActivityTypeId == utils.C_CLASS_ACTIVITY_TYPE_ID {
-				v.ActivityTypeId = utils.ANALYST_TELL_ACTIVITY_TYPE_ID
-			}
-			//如果城市民称长度大于2，那么就不显示
-			if utf8.RuneCountInString(v.City) != 2 || mapActivityCity[fmt.Sprint(v.Label, "{|}", v.ActivityTypeId)] != "" {
-				continue
-			}
-			mapActivityCity[fmt.Sprint(v.Label, "{|}", v.ActivityTypeId)] = v.City
-		}
-	}
-	mapItem = mapActivityCity
-	return
-}
-
-// UpdateIsSendYidongSignUp更改活动是否向易董推送报名名单的状态
-func UpdateIsSendYidongSignUp(activityId int) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println(err)
-			go utils.SendAlarmMsg("更改活动是否向易董推送报名名单的状态，失败,活动ID："+strconv.Itoa(activityId)+err.Error(), 2)
-		}
-	}()
-	err = models.UPdateSendedYiDongSignUp(activityId)
-	return
-}
-
 // 获取活动线上还是线下的类型
 func GetActivityTypeIdMap() (mapResp map[int]int) {
 	var err error
@@ -1807,3 +1278,26 @@ func GetActivityTypeIdMap() (mapResp map[int]int) {
 	}
 	return
 }
+
+// GetYanxuanActivityIds 获取研选活动ID
+func GetYanxuanActivityIds() (activityIds []int) {
+	var err error
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg("获取研选活动ID GetYanxuanActivityIds，失败："+err.Error(), 2)
+		}
+	}()
+	var condition string
+	var pars []interface{}
+	condition = `  chart_permission_id  = ? AND yidong_activity_id = ''  `
+	pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
+	list, e := models.GetCygxActivityIdList(condition, pars)
+	if e != nil {
+		err = errors.New("GetCygxActivityIdList, Err: " + e.Error())
+		return
+	}
+	for _, v := range list {
+		activityIds = append(activityIds, v.ActivityId)
+	}
+	return
+}

services/article.go

@@ -544,3 +544,26 @@ func GetYxArticleIdMap(articleIds []int) (mapResp map[int]bool) {
 	}
 	return
 }
+
+// GetYanxuanArticleIds 获取研选文章ID
+func GetYanxuanArticleIds() (articleIds []int) {
+	var err error
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg("获取研选文章ID GetYanxuanArticleIds，失败："+err.Error(), 2)
+		}
+	}()
+	var condition string
+	var pars []interface{}
+	condition = `  article_type_id > 0   `
+	pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
+	list, e := models.GetCygxCygxArticleIdList(condition, pars)
+	if e != nil {
+		err = errors.New("GetCygxCygxArticleIdList, Err: " + e.Error())
+		return
+	}
+	for _, v := range list {
+		articleIds = append(articleIds, v.ArticleId)
+	}
+	return
+}

services/banner.go

@@ -4,108 +4,9 @@ import (
 	"hongze/hongze_mfyx/models"
 	"hongze/hongze_mfyx/utils"
 	"strconv"
-	"strings"
 	"time"
 )
 
-// GetBannerUrlBody 处理banner的连接并做跳转处理
-func GetBannerUrlBody(url string) (itemResp *models.BannerUrlResp) {
-	//2：文章详情  https://web.hzinsights.com/material/info/8436  小程序路径：/pageMy/reportDetail/reportDetail?id=
-	//3：活动详情  https://web.hzinsights.com/activity/detail/2701  小程序路径：/activityPages/activityDetail/activityDetail?id=
-	//4：产业详情  https://web.hzinsights.com/indepth/info/20/79  小程序路径：/reportPages/IndustryReport/IndustryReport?id=
-	//5：关于我们  https://clpttest.hzinsights.com/about
-	//6：产品内测 https://clpttest.hzinsights.com/internal/article/29  小程序路径：/reportPages/internalDetials/internalDetials?id=
-	//7：本周研究汇总 https://clpttest.hzinsights.com/summary/2/152  小程序路径：/reportPages/reportSecretDetail/reportSecretDetail?type=2&id=
-	//8：上周研究汇总 https://clpttest.hzinsights.com/summary/3/112 小程序路径：/reportPages/reportSecretDetail/reportSecretDetail?type=3&id=
-	//9：专项调研活动 https://clpttest.hzinsights.com/activity/info/70  小程序路径：/activityPages/specialDetail/specialDetail?id=
-	//10： 重点公司 https://clpttest.hzinsights.com/recent/67  小程序路径：/reportPages/keyCompany/keyCompany
-	//11： 主题详情 https://clpttest.hzinsights.com/community/theme/117  小程序路径：/reportPages/researchTheme/researchTheme?id=
-	//12： 作者详情 https://clpttest.hzinsights.com/community/author/78 小程序路径：/reportPages/authorPages/authorPages?id=
-
-	mapPath := make(map[int]string)
-	mapPath[2] = utils.WX_MSG_PATH_ARTICLE_DETAIL          //文章详情
-	mapPath[3] = utils.WX_MSG_PATH_ACTIVITY_DETAIL         //活动详情
-	mapPath[4] = utils.WX_MSG_PATH_INDUSTRY_DETAIL         //产业详情
-	mapPath[5] = utils.WX_MSG_PATH_ABOUT_US                //关于我们视频
-	mapPath[6] = utils.WX_MSG_PATH_PRODUCTINTERIOR_DETAIL  //产品内测
-	mapPath[7] = utils.WX_MSG_PATH_THIS_WEEK_DETAIL        //本周研究汇总
-	mapPath[8] = utils.WX_MSG_PATH_LAST_WEEK_DETAIL        //上周研究汇总
-	mapPath[9] = utils.WX_MSG_PATH_ACTIVITY_SPECIAL_DETAIL //专项调研活动
-	mapPath[10] = utils.WX_MSG_PATH_KEY_COMPANY_DETAIL     //重点公司
-	mapPath[11] = utils.WX_MSG_PATH_RESEARCHTHEME_DETAIL   //主题详情
-	mapPath[12] = utils.WX_MSG_PATH_AUTHOR_DETAIL          //作者详情
-
-	material := "material/info"             //2：文章详情
-	activity := "activity/detail"           //3：活动详情
-	activityVideo := "activity/video"       //3：活动视频页，调活动详情
-	indepth := "indepth/info"               //4：产业详情
-	indepthVideo := "indepth/video"         //4：产业视频页,调详情
-	about := "/about"                       //5：关于我们
-	internal := "internal/article"          //6：产品内测
-	thisWeek := "summary/2/"                //7：本周研究汇总
-	lastWeek := "summary/3/"                //8：上周研究汇总
-	activitySpecial := "activity/info"      //9：专项调研活动
-	recent := "/recent/"                    //10：重点公司
-	communityTheme := "/community/theme/"   //11：主题详情
-	communityAuthor := "/community/author/" //12：作者详情
-	item := new(models.BannerUrlResp)
-	item.Body = url
-	urlSlice := strings.Split(url, "/")
-	lenurlSlice := len(urlSlice)
-	sourceId, _ := strconv.Atoi(urlSlice[lenurlSlice-1])
-
-	if strings.Contains(url, material) {
-		item.Type = 2
-	} else if strings.Contains(url, activity) {
-		item.Type = 3
-	} else if strings.Contains(url, activityVideo) {
-		activityVideo, err := models.GetCygxActivityVideoById(sourceId)
-		if err != nil {
-			go utils.SendAlarmMsg("banner链接解析失败"+err.Error()+url, 2)
-		}
-		if activityVideo != nil {
-			sourceId = activityVideo.ActivityId
-			item.Type = 3
-		}
-	} else if strings.Contains(url, indepth) {
-		if lenurlSlice >= 2 {
-			chartPermissionId, _ := strconv.Atoi(urlSlice[lenurlSlice-2])
-			item.ChartPermissionId = chartPermissionId
-		}
-		item.Type = 4
-	} else if strings.Contains(url, indepthVideo) {
-		if lenurlSlice >= 2 {
-			sourceId, _ = strconv.Atoi(urlSlice[lenurlSlice-2])
-		}
-		item.Type = 4
-	} else if strings.Contains(url, about) {
-		item.Type = 5
-		sourceId = 1 // 强制设置为正数前端跳转使用
-	} else if strings.Contains(url, internal) {
-		item.Type = 6
-	} else if strings.Contains(url, thisWeek) {
-		item.Type = 7
-	} else if strings.Contains(url, lastWeek) {
-		item.Type = 8
-	} else if strings.Contains(url, activitySpecial) {
-		item.Type = 9
-	} else if strings.Contains(url, recent) {
-		item.Type = 10
-	} else if strings.Contains(url, communityTheme) {
-		item.Type = 11
-	} else if strings.Contains(url, communityAuthor) {
-		item.Type = 12
-	} else {
-		item.Type = 1
-	}
-	if mapPath[item.Type] != "" {
-		item.Path = "/" + mapPath[item.Type]
-	}
-	item.SourceId = sourceId
-	itemResp = item
-	return
-}
-
 func AddCygxBannerHistory(user *models.WxUserItem, bannerId int) (err error) {
 	if user.UserId == 0 {
 		return