no message

controllers/cygx/tag_management.go

@@ -12,6 +12,8 @@ import (
 	"hongze/hz_crm_api/utils"
 	"os"
 	"path/filepath"
+	"strconv"
+	"strings"
 	"time"
 )
 
@@ -88,6 +90,7 @@ func (this *TagManagementController) TagList() {
 
 // @Title 获取标签列表-自定义顺序
 // @Description 获取标签列表-自定义顺序接口
+// @Param   SearchType   query   string  false       "搜索类型 1:自定义标签 、 2：固定标签 ，-1查询所有 默认-1"
 // @Success 200 {object} cygx.ChartPermissionResp
 // @router /tag/list/custom [get]
 func (this *TagManagementController) TagCustomizeList() {
@@ -104,8 +107,14 @@ func (this *TagManagementController) TagCustomizeList() {
 		br.Ret = 408
 		return
 	}
-
+	searchType, _ := this.GetInt("SearchType", 1)
 	var condition string
+	if searchType == 1 {
+		condition = " AND  tag_type = 0 "
+	}
+	if searchType == 2 {
+		condition = " AND  tag_type > 0 "
+	}
 	list, err := cygx.GetCygxTagList(condition)
 	if err != nil {
 		br.Msg = "获取标签失败"
@@ -331,7 +340,7 @@ func (this *TagManagementController) TagSave() {
 			ModifyTime:    time.Now(),
 		}
 
-		err = item.Update([]string{"TagName","ArticleTypes","ActivityTypes","Industries","SubjectNames","ModifyTime"})
+		err = item.Update([]string{"TagName", "ArticleTypes", "ActivityTypes", "Industries", "SubjectNames", "ModifyTime"})
 		if err != nil {
 			br.Msg = "编辑标签失败！"
 			br.ErrMsg = "编辑标签失败，Err:" + err.Error()
@@ -509,3 +518,99 @@ func (this *TagManagementController) PvExport() {
 	br.Msg = "获取成功"
 }
 
+// @Title 热门活动
+// @Description 热门活动接口
+// @Param   KeyWord   query   string  false       "搜索关键词"
+// @Success 200 {object} cygx.GetCygxActivityListRep
+// @router /tag/hot_activity/list [get]
+func (this *TagManagementController) TagHotActivityList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	keyWord := this.GetString("KeyWord")
+	resp := new(cygx.GetCygxActivityListRep)
+	var condition string
+	var pars []interface{}
+	if keyWord == "" {
+		conf, err := cygx.GetCygxConfigDetailByCode(utils.CYGX_TAG_HOT_ACTIVITY_ID)
+		if err != nil {
+			br.Msg = "获取数据失败"
+			br.ErrMsg = "买方研选产品介绍信息失败，Err:" + err.Error()
+			return
+		}
+		if conf.ConfigValue == "" {
+			conf.ConfigValue = "0"
+		}
+		condition += " AND art.activity_id IN  (" + conf.ConfigValue + ") "
+	} else {
+		condition += ` AND art.activity_name LIKE '%` + keyWord + `%'   `
+		condition += ` AND art.publish_status = 1  AND art.active_state  = 1 `
+	}
+	list, err := cygx.GetActivityListAll(condition, pars, 0, 1000)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	if len(list) == 0 {
+		list = make([]*cygx.CygxActivityList, 0)
+	}
+	resp.List = list
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}
+
+// @Title 更新热门活动
+// @Description 更新热门活动接口
+// @router /tag/hot_activity/update [post]
+func (this *TagManagementController) TagHotActivityUpdate() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	var req cygx.ActivityIdsResp
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	activityIdList := req.ActivityIds
+	var activityIds []string
+	for _, v := range activityIdList {
+		activityIds = append(activityIds, strconv.Itoa(v))
+	}
+	err = cygx.CygxConfigUpdateByCode(strings.Join(activityIds, ","), utils.CYGX_TAG_HOT_ACTIVITY_ID)
+	if err != nil {
+		br.Msg = "保存失败"
+		br.ErrMsg = "保存失败，Err:" + err.Error()
+		return
+	}
+	br.Ret = 200
+	br.Success = true
+	br.IsAddLog = true
+	br.Msg = "保存成功"
+}

models/cygx/activity.go

@@ -19,6 +19,10 @@ type ActivityIdRep struct {
 	ActivityId int `description:"活动id"`
 }
 
+type ActivityIdsResp struct {
+	ActivityIds []int `description:"活动ID"`
+}
+
 type ActivityList struct {
 	List []*ActivityType
 }

models/cygx/config.go

@@ -41,3 +41,11 @@ func GetCygxConfigDetailByCode(code string) (item *CygxConfig, err error) {
 	err = o.Raw(sql, code).QueryRow(&item)
 	return
 }
+
+// 修改
+func CygxConfigUpdateByCode(configValue, newValue string) (err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `UPDATE cygx_config SET  config_value=?   WHERE config_code= ? `
+	_, err = o.Raw(sql, configValue, newValue).Exec()
+	return
+}

models/data_manage/request/cygx_tag.go

@@ -9,7 +9,7 @@ import (
 type MoveTagReq struct {
 	TagId     int `description:"指标id"`
 	PrevTagId int `description:"上一个节点标签id"`
-	NextTagId  int `description:"下一个节点标签id"`
+	NextTagId int `description:"下一个节点标签id"`
 }
 
 // SaveTagReq 保存标签请求参数

routers/commentsRouter.go

@@ -2788,6 +2788,24 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:TagManagementController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:TagManagementController"],
+        beego.ControllerComments{
+            Method: "TagHotActivityList",
+            Router: `/tag/hot_activity/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:TagManagementController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:TagManagementController"],
+        beego.ControllerComments{
+            Method: "TagHotActivityUpdate",
+            Router: `/tag/hot_activity/update`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:TagManagementController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:TagManagementController"],
         beego.ControllerComments{
             Method: "IndustrialManagementlistByName",

utils/constants.go

@@ -394,6 +394,7 @@ const (
 	CYGX_LYJH                               string = "路演精华"
 	PERMISSION_ID_UPGRADE                   int    = 100000 //行业权限升级的时候所添加的起步值
 	CYGX_TACTICS_TIME_LINE_STATUS           string = "cygx_tactics_time_line_status"
+	CYGX_TAG_HOT_ACTIVITY_ID                string = "cygx_tag_hot_activity_id"         //标签管理自定义的热门活动ID
 	TEMPLATE_MSG_CYGX_ACTIVITY_LIMIT_PEOPLE int    = 1001                               //查研观向修改活动人数限制之后，对于因为人数已满而失败的用户，推送模板消息 1001
 	YI_DONG_ZHENG_TONG_YUN_TOKEN_KEY        string = "YI_DONG_ZHENG_TONG_YUN_TOKEN_KEY" //易董证通云的token，存Redis使用
 	CYGX_USER_KEY_LABEL                            = "CYGX_USER_KEY_LABEL"              //查研观向用户标签