add:添加研报搜索和分类列表

controllers/chart_permission.go

@@ -10,6 +10,10 @@ type ChartPermissionController struct {
 	BaseAuthController
 }
 
+type ChartPermissionNoAuthController struct {
+	BaseCommonController
+}
+
 // List
 // @Title 系统品种列表
 // @Description 系统品种列表
@@ -105,3 +109,39 @@ func (this *ChartPermissionController) ClassifyTree() {
 	br.Success = true
 	br.Ret = 200
 }
+
+// ClassifyTree
+// @Title 获取品种下的分类权限列表
+// @Description 获取研报的品种权限列表
+// @Param   ChartPermissionId   query   int  true       "品种权限id"
+// @Success 200 {object} []models.ChartPermission
+// @router /classify/tree [get]
+func (this *ChartPermissionNoAuthController) ClassifyTree() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	chartPermissionId, _ := this.GetInt("ChartPermissionId")
+	if chartPermissionId <= 0 {
+		br.Msg = "品种权限不能为空"
+		return
+	}
+	resp, err := services.GetClassifyTreeByChartPermission(chartPermissionId)
+	if err != nil {
+		br.Msg = "获取分类失败"
+		br.ErrMsg = "品种权限获取失败，系统错误，Err:" + err.Error()
+		return
+	}
+	if resp.Ret != 200 {
+		br.Msg = resp.Msg
+		br.ErrMsg = resp.ErrMsg
+		return
+	}
+	classifyList := resp.Data
+
+	br.Data = classifyList
+	br.Msg = "获取成功"
+	br.Success = true
+	br.Ret = 200
+}

controllers/report.go

@@ -6,6 +6,7 @@ import (
 	"eta/eta_mini_api/services"
 	"eta/eta_mini_api/utils"
 	"sort"
+	"strconv"
 	"time"
 
 	"github.com/rdlucklib/rdluck_tools/paging"
@@ -837,3 +838,69 @@ func (this *ReportNoAuthController) Detail() {
 	br.Ret = 200
 	br.Data = result.Data
 }
+
+// @Title 研报搜索
+// @Description 研报搜索
+// @Param   KeyWord   query   string  true       "每页数据条数"
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
+// @Success 200 {object} models.ReportDetailResp
+// @router /search [get]
+func (this *ReportNoAuthController) Search() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	keyWord := this.GetString("KeyWord")
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+	if pageSize <= 0 {
+		pageSize = utils.PageSize30
+	}
+
+	if keyWord == "" {
+		br.Msg = "请输入关键字"
+		return
+	}
+
+	reports, total, err := services.SearchReportPush(keyWord, currentIndex, pageSize)
+	if err != nil {
+		br.Msg = "研报列表查询失败"
+		br.ErrMsg = "研报列表查询失败，系统异常，Err:" + err.Error()
+		return
+	}
+	resp := new(response.ReportSearchViewResp)
+	list := make([]*response.ReportSearchListView, 0)
+	for _, v := range reports {
+		tmpReport := &response.ReportSearchListView{
+			ReportId:           v.ReportId,
+			ClassifyIdFirst:    v.ClassifyIdFirst,
+			ClassifyNameFirst:  v.ClassifyNameFirst,
+			ClassifyIdSecond:   v.ClassifyIdSecond,
+			ClassifyNameSecond: v.ClassifyNameSecond,
+			ClassifyIdThird:    v.ClassifyIdThird,
+			ClassifyNameThird:  v.ClassifyNameThird,
+			PublishTime:        v.PublishTime.Format(utils.FormatDate),
+			Title:              v.Title,
+			Abstract:           v.Abstract,
+			Stage:              strconv.Itoa(v.Stage),
+			Author:             v.Author,
+			ReportType:         v.ReportType,
+		}
+		if v.PublishTime.IsZero() {
+			tmpReport.PublishTime = ""
+		}
+		list = append(list, tmpReport)
+	}
+
+	page := paging.GetPaging(currentIndex, pageSize, total)
+	resp.List = list
+	resp.Paging = page
+
+	br.Data = resp
+	br.Msg = "查询成功"
+	br.Ret = 200
+	br.Success = true
+}

models/report_push_status.go

@@ -34,6 +34,27 @@ func GetReportPushStatusByReportId(reportId int, reportType int) (item *ReportPu
 	return
 }
 
+func GetReportPushStatusCountByCondition(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT COUNT(*) AS count FROM report_push_status WHERE 1=1 AND state=1 `
+	if condition != "" {
+		sql += condition
+	}
+	err = o.Raw(sql, pars...).QueryRow(&count)
+	return
+}
+
+func GetReportPushStatusByCondition(condition string, pars []interface{}, startSize int, pageSize int) (items []*ReportPushStatus, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM report_push_status WHERE 1=1 AND state=1 `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` ORDER BY publish_time DESC LIMIT ?,?`
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	return
+}
+
 func DeleteReportPushStatusByReportId(reportId int, reportType int) (err error) {
 	o := orm.NewOrm()
 	sql := `DELETE FROM report_push_status WHERE report_id = ? AND report_type = ?`

routers/commentsRouter.go

@@ -61,6 +61,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_mini_api/controllers:ChartPermissionNoAuthController"] = append(beego.GlobalControllerRouter["eta/eta_mini_api/controllers:ChartPermissionNoAuthController"],
+        beego.ControllerComments{
+            Method: "ClassifyTree",
+            Router: `/classify/tree`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_mini_api/controllers:MiniConfigController"] = append(beego.GlobalControllerRouter["eta/eta_mini_api/controllers:MiniConfigController"],
         beego.ControllerComments{
             Method: "MiniConfig",
@@ -268,6 +277,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_mini_api/controllers:ReportNoAuthController"] = append(beego.GlobalControllerRouter["eta/eta_mini_api/controllers:ReportNoAuthController"],
+        beego.ControllerComments{
+            Method: "Search",
+            Router: `/search`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_mini_api/controllers:UserAuthController"] = append(beego.GlobalControllerRouter["eta/eta_mini_api/controllers:UserAuthController"],
         beego.ControllerComments{
             Method: "AddReportRecord",

routers/router.go

@@ -70,6 +70,11 @@ func init() {
 				&controllers.ReportNoAuthController{},
 			),
 		),
+		beego.NSNamespace("/chart_perimission",
+			beego.NSInclude(
+				&controllers.ChartPermissionNoAuthController{},
+			),
+		),
 	)
 	beego.AddNamespace(ns, h5ns)
 }

services/report.go

@@ -144,3 +144,23 @@ func SearchReport(keyWord string, currentIndex, pageSize int) (resp *resp2.Repor
 	return
 
 }
+
+func SearchReportPush(keyWord string, startSize, pageSize int) (items []*models.ReportPushStatus, total int, err error) {
+	if keyWord == "" {
+		return
+	}
+
+	var pars []interface{}
+	condition := `AND title LIKE ?`
+	pars = append(pars, utils.GetLikeKeywordPars(pars, keyWord, 1))
+	total, err = models.GetReportPushStatusCountByCondition(condition, pars)
+	if err != nil {
+		return
+	}
+
+	items, err = models.GetReportPushStatusByCondition(condition, pars, startSize, pageSize)
+	if err != nil {
+		return
+	}
+	return
+}