粮油商务网-联调

controllers/data_manage/base_from_ly_index_controller.go

@@ -36,18 +36,29 @@ const (
 // @Param   searchParam	 query   string     false        "搜索参数"
 // @Param   PageSize    query   int     true        "每页数据条数"
 // @Param   CurrentIndex    query   int     true        "当前页页码，从1开始"
-// @Success 200 {object} data_manage.BaseFromLyIndexPage
+// @Success 200 {object} []data_manage.BaseFromLyIndexPage
 // @router /ly/index/list [get]
 func (this *BaseFromLyIndexController) LyIndexList() {
-	br := this.InitResponse()
-	_, err := this.CheckSysUser(br)
-	if err != nil {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
 		return
 	}
 
 	pageSize, _ := this.GetInt("PageSize")
 	currentIndex, _ := this.GetInt("CurrentIndex")
 	searchParam := this.GetString("SearchParam")
+	classifyId := this.GetString("ClassifyId")
 
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
@@ -57,7 +68,7 @@ func (this *BaseFromLyIndexController) LyIndexList() {
 	}
 
 	// 获取指标列表
-	indexList, err := data.GetIndexPage(searchParam, currentIndex, pageSize)
+	indexList, err := data.GetIndexPage(classifyId, searchParam, currentIndex, pageSize)
 	if err != nil {
 		br.Msg = "获取指标列表失败"
 		br.ErrMsg = "获取指标列表失败，Err:" + err.Error()
@@ -79,9 +90,19 @@ func (this *BaseFromLyIndexController) LyIndexList() {
 // @Success 200 {object} data_manage.BaseFromLyDataPage
 // @router /ly/index/data/list [get]
 func (this *BaseFromLyIndexController) LyIndexDataList() {
-	br := this.InitResponse()
-	_, err := this.CheckSysUser(br)
-	if err != nil {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
 		return
 	}
 
@@ -122,9 +143,19 @@ func (this *BaseFromLyIndexController) LyIndexDataList() {
 // @Success 200 string "操作成功"
 // @router /ly/index/add/validate [post]
 func (this *BaseFromLyIndexController) LyIndexAddValidate() {
-	br := this.InitResponse()
-	_, err := this.CheckSysUser(br)
-	if err != nil {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
 		return
 	}
 
@@ -160,9 +191,19 @@ func (this *BaseFromLyIndexController) LyIndexAddValidate() {
 // @Success 200 string "操作成功"
 // @router /ly/index/add [post]
 func (this *BaseFromLyIndexController) LyIndexAdd() {
-	br := this.InitResponse()
-	sysUser, err := this.CheckSysUser(br)
-	if err != nil {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
 		return
 	}
 
@@ -322,9 +363,19 @@ func (this *BaseFromLyIndexController) LyIndexAdd() {
 // @Success 200 string "操作成功"
 // @router /ly/index/data/export [get]
 func (this *BaseFromLyIndexController) LyIndexDataExport() {
-	br := this.InitResponse()
-	_, err := this.CheckSysUser(br)
-	if err != nil {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
 		return
 	}
 
@@ -505,26 +556,3 @@ func (this *BaseFromLyIndexController) LyIndexDataExport() {
 	br.Success = true
 	br.Msg = "success"
 }
-
-func (this *BaseFromLyIndexController) InitResponse() *models.BaseResponse {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	return br
-}
-
-func (this *BaseFromLyIndexController) CheckSysUser(br *models.BaseResponse) (*system.Admin, error) {
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return nil, fmt.Errorf("请登录")
-	}
-	return sysUser, nil
-}

models/data_manage/base_from_ly_index.go

@@ -76,22 +76,28 @@ func GetLyIndexCount(searchParam string) (count int, err error) {
 }
 
 // GetLyIndexPage 获取指标列表
-func GetLyIndexPage(searchParam string, currentIndex, pageSize int) (items []*BaseFromLyIndex, err error) {
+func GetLyIndexPage(classifyId string, searchParam string, currentIndex, pageSize int) (items []*BaseFromLyIndex, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_ly_index WHERE 1=1`
+	qs := o.QueryTable("base_from_ly_index")
 
-	var params []interface{}
+	// 精确匹配 classifyId
+	if classifyId != "" {
+		qs = qs.Filter("base_from_ly_classify_id", classifyId)
+	}
 
+	// 添加搜索条件
 	if searchParam != "" {
-		sql += ` AND (index_name LIKE ? OR index_code = ?)`
-		params = append(params, "%"+searchParam+"%", searchParam)
+		cond := orm.NewCondition()
+		cond = cond.Or("index_name__icontains", searchParam).Or("index_code", searchParam)
+		qs = qs.SetCond(cond)
 	}
 
-	sql += ` ORDER BY base_from_ly_index_id DESC LIMIT ?,?`
-
-	params = append(params, currentIndex, pageSize)
+	// id降序排序与分页
+	qs = qs.OrderBy("-base_from_ly_index_id")
+	qs = qs.Limit(pageSize, (currentIndex-1)*pageSize)
 
-	_, err = o.Raw(sql, params...).QueryRows(&items)
+	// 执行查询
+	_, err = qs.All(&items)
 	return
 }
 

services/data/base_from_ly_index_service.go

@@ -11,7 +11,7 @@ import (
 )
 
 // GetIndexPage 获取指标分页列表
-func GetIndexPage(searchParam string, currentIndex, pageSize int) (*data_manage.BaseFromLyIndexPage, error) {
+func GetIndexPage(classifyId string, searchParam string, currentIndex, pageSize int) (*data_manage.BaseFromLyIndexPage, error) {
 	count, err := data_manage.GetLyIndexCount(searchParam)
 	if err != nil {
 		return nil, err
@@ -24,11 +24,12 @@ func GetIndexPage(searchParam string, currentIndex, pageSize int) (*data_manage.
 		return &lyIndexPage, nil
 	}
 
-	lyIndexList, err := data_manage.GetLyIndexPage(searchParam, currentIndex, pageSize)
+	lyIndexList, err := data_manage.GetLyIndexPage(classifyId, searchParam, currentIndex, pageSize)
 	if err != nil {
 		return nil, err
 	}
 	lyIndexPage.List = lyIndexList
+	lyIndexPage.Paging = page
 
 	return &lyIndexPage, nil
 }