Bladeren bron

no message

xingzai 2 jaren geleden
bovenliggende
commit
413775df09
3 gewijzigde bestanden met toevoegingen van 71 en 4 verwijderingen
  1. 40 1
      controllers/research.go
  2. 22 3
      models/article_type.go
  3. 9 0
      routers/commentsRouter.go

+ 40 - 1
controllers/research.go

@@ -9,7 +9,7 @@ import (
 	"time"
 )
 
-//研选
+// 研选
 type ResearchController struct {
 	BaseAuthController
 }
@@ -548,3 +548,42 @@ func (this *ResearchController) HotKeyWord() {
 	br.Msg = "获取成功"
 	br.Data = resp
 }
+
+// @Title 研选文章类型列表
+// @Description 研选文章类型列表接口
+// @Success 200 {object} models.IndustrialManagementNewList
+// @router /article/typeList [get]
+func (this *ResearchController) ArticleType() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	user := this.User
+	if user == nil {
+		br.Msg = "请重新登录"
+		br.Ret = 408
+		return
+	}
+	var condition string
+	condition = " AND is_show_yanx  = 1 "
+	list, err := models.GetCygxArticleTypeListCondition(condition)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+		return
+	}
+	resp := new(models.CygxArticleTypeListResp)
+	for _, v := range list {
+		item := models.CygxArticleTypeResp{
+			ArticleTypeId:   v.ArticleTypeId,
+			ArticleTypeName: v.ArticleTypeName,
+			ButtonStyle:     v.ButtonStyle,
+		}
+		resp.List = append(resp.List, item)
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

+ 22 - 3
models/article_type.go

@@ -17,9 +17,20 @@ type CygxArticleType struct {
 	IcoLink            string    `description:"图标链接地址"`
 	IcoLinkM           string    `description:"移动端图标链接地址"`
 	IsShowLinkButton   int       `description:"这种报告类型是否展示查看报告链接"`
+	ButtonStyle        string    `description:"按钮展示样式"`
 }
 
-//详情
+type CygxArticleTypeResp struct {
+	ArticleTypeId   int    `description:"文章类型ID"`
+	ArticleTypeName string `description:"类型名称"`
+	ButtonStyle     string `description:"按钮展示样式"`
+}
+
+type CygxArticleTypeListResp struct {
+	List []CygxArticleTypeResp
+}
+
+// 详情
 func GetCygxArticleTypeDetailById(activityTypeId int) (item *CygxArticleType, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_article_type WHERE article_type_id = ? `
@@ -27,7 +38,7 @@ func GetCygxArticleTypeDetailById(activityTypeId int) (item *CygxArticleType, er
 	return
 }
 
-//获取数量
+// 获取数量
 func GetCygxArticleTypeCount(condition string) (count int, err error) {
 	o := orm.NewOrm()
 	sqlCount := `SELECT COUNT(1) AS count  FROM cygx_article_type WHERE  1=1 ` + condition
@@ -35,7 +46,7 @@ func GetCygxArticleTypeCount(condition string) (count int, err error) {
 	return
 }
 
-//报告类型列表
+// 报告类型列表
 func GetCygxArticleTypeList() (items []*CygxArticleType, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_article_type ORDER BY sort DESC`
@@ -43,6 +54,14 @@ func GetCygxArticleTypeList() (items []*CygxArticleType, err error) {
 	return
 }
 
+// 报告类型列表
+func GetCygxArticleTypeListCondition(condition string) (items []*CygxArticleType, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM cygx_article_type   WHERE  1=1 ` + condition + ` ORDER BY sort DESC`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
 func GetArticleTypeInfo(activityTypeId int) (item *CygxArticleType, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_article_type   WHERE  article_type_id=? `

+ 9 - 0
routers/commentsRouter.go

@@ -1015,6 +1015,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"],
+        beego.ControllerComments{
+            Method: "ArticleType",
+            Router: `/article/typeList`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ResearchController"],
         beego.ControllerComments{
             Method: "CollectionList",