fix：数据表格获取时，新增排序字段；根据指定日期获取数据时，如果传入的只有年月，那么就返回距离该年月最近的一条数据

controllers/data_manage/edb_info.go

@@ -17,11 +17,12 @@ import (
 	"time"
 )
 
-// 数据管理
+// EdbInfoController 数据管理
 type EdbInfoController struct {
 	controllers.BaseAuthController
 }
 
+// EdbInfoSearch
 // @Title 新增指标-查询指标信息接口
 // @Description 新增指标-查询指标信息接口
 // @Param   Source   query   int  true       "来源:1:同花顺,2:wind,3:彭博"
@@ -1594,6 +1595,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 	br.Data = resp
 }
 
+// EdbInfoList
 // @Title 指标列表接口
 // @Description 指标列表接口
 // @Param   PageSize   query   int  true       "每页数据条数"
@@ -1750,6 +1752,7 @@ func (this *EdbInfoController) EdbInfoList() {
 	br.Data = resp
 }
 
+// EdbInfoAdd
 // @Title 新增指标接口
 // @Description 新增指标接口
 // @Param	request	body data_manage.AddEdbInfoReq true "type json string"
@@ -1886,6 +1889,7 @@ func (this *EdbInfoController) EdbInfoAdd() {
 	br.IsAddLog = true
 }
 
+// EdbInfoEdit
 // @Title 编辑指标接口
 // @Description 编辑指标接口
 // @Success 200 {object} data_manage.EditEdbInfoReq
@@ -2036,6 +2040,7 @@ func (this *EdbInfoController) EdbInfoEdit() {
 	br.IsAddLog = true
 }
 
+// EdbEnInfoEdit
 // @Title 编辑指标英文信息接口
 // @Description 编辑指标英文信息接口
 // @Success 200 {object} data_manage.EditEdbEnInfoReq
@@ -2141,6 +2146,7 @@ func (this *EdbInfoController) EdbEnInfoEdit() {
 	br.IsAddLog = true
 }
 
+// EdbInfoNewest
 // @Title 获取最新指标接口
 // @Description 获取最新指标接口
 // @Success 200 {object} data_manage.EdbInfoList
@@ -2163,6 +2169,7 @@ func (this *EdbInfoController) EdbInfoNewest() {
 	br.Data = item
 }
 
+// EdbInfoRefresh
 // @Title 指标刷新接口
 // @Description 指标刷新接口
 // @Param   EdbInfoId   query   int  true       "指标id"
@@ -2213,6 +2220,7 @@ func (this *EdbInfoController) EdbInfoRefresh() {
 	br.IsAddLog = true
 }
 
+// EdbInfoMove
 // @Title 移动指标接口
 // @Description 移动指标接口
 // @Success 200 {object} data_manage.MoveEdbInfoReq
@@ -2374,6 +2382,7 @@ func (this *EdbInfoController) EdbInfoMove() {
 	br.Msg = "移动成功"
 }
 
+// EdbInfoDetail
 // @Title 获取指标详情
 // @Description 获取指标详情接口
 // @Param   EdbInfoId   query   int  true       "指标id"
@@ -2829,6 +2838,7 @@ func searchEdbInfoFilter(condition string, pars []interface{}, i int, ch chan ma
 	return
 }
 
+// EdbInfoAllRefresh
 // @Title 指标全部刷新接口
 // @Description 指标全部刷新接口
 // @Param   EdbInfoId   query   int  true       "指标id"
@@ -2883,6 +2893,7 @@ func (this *EdbInfoController) EdbInfoAllRefresh() {
 	}
 }
 
+// EdbInfoData
 // @Title 获取指标数据
 // @Description 获取指标数据
 // @Param   EdbInfoId   query   int  true       "指标ID"
@@ -2944,6 +2955,7 @@ func (this *ChartInfoController) EdbInfoData() {
 	br.Data = resp
 }
 
+// EdbInfoReplaceCheck
 // @Title 指标一键刷新接口
 // @Description 指标一键刷新接口
 // @Success Ret=200 更新成功
@@ -3546,7 +3558,7 @@ func (this *EdbInfoController) MoveEdbChartUser() {
 	br.Msg = "修改成功"
 }
 
-// MoveEdbChartList
+// EdbChartClassifyList
 // @Title 获取指标/图表分类列表数据接口
 // @Description 获取指标/图表分类列表数据接口
 // @Param   Source   query   int  false       "来源 ：1：手工数据指标 2：钢联化工数据库 3：ETA指标库 4：ETA预测指标 5：图库"
@@ -3985,7 +3997,7 @@ func (this *EdbInfoController) AllEdbInfoByEs() {
 // @Description 所有指标筛选接口
 // @Param   EdbInfoId   query   int  false       "指标id"
 // @Param   Date   query   string  false       "日期"
-// @Param      query   string  false       "频度"
+// @Param   DateType   query   string  false       "频度"
 // @Success 200 {object} data_manage.EdbInfoList
 // @router /edb_info/date_data [get]
 func (this *EdbInfoController) GetEdbDateData() {
@@ -4013,7 +4025,14 @@ func (this *EdbInfoController) GetEdbDateData() {
 		br.ErrMsg = fmt.Sprint("获取指标信息失败,Err:", err.Error())
 		return
 	}
-	val, err := data.GetDateData(edbInfo, date)
+	startDate := date
+	endDate := date
+	//如果填写的是月度日期
+	if strings.Count(date, "-") == 1 {
+		startDate = date + "-01"
+		endDate = ``
+	}
+	val, err := data.GetDateData(edbInfo, startDate, endDate)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = fmt.Sprint("获取指数据失败,Err:", err.Error())

controllers/data_manage/excel_info.go

@@ -32,14 +32,14 @@ type ExcelInfoController struct {
 // @Param	request	body request.AddExcelInfoReq true "type json string"
 // @Success 200 {object} response.AddExcelInfoResp
 // @router /excel_info/add [post]
-func (this *ExcelInfoController) Add() {
+func (c *ExcelInfoController) Add() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
+		c.Data["json"] = br
+		c.ServeJSON()
 	}()
 
-	sysUser := this.SysUser
+	sysUser := c.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
 		br.ErrMsg = "请登录，SysUser Is Empty"
@@ -56,11 +56,11 @@ func (this *ExcelInfoController) Add() {
 	if !utils.Rc.SetNX(cacheKey, 1, 30*time.Second) {
 		deleteCache = false
 		br.Msg = "系统处理中，请稍后重试！"
-		br.ErrMsg = "系统处理中，请稍后重试！" + sysUser.RealName + ";data:" + string(this.Ctx.Input.RequestBody)
+		br.ErrMsg = "系统处理中，请稍后重试！" + sysUser.RealName + ";data:" + string(c.Ctx.Input.RequestBody)
 		return
 	}
 	var req request.AddExcelInfoReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
@@ -211,9 +211,9 @@ func (this *ExcelInfoController) Add() {
 	//		SysUserRealName: sysUser.RealName,
 	//		UniqueCode:      excelInfo.UniqueCode,
 	//		CreateTime:      time.Now(),
-	//		Content:         string(this.Ctx.Input.RequestBody),
+	//		Content:         string(c.Ctx.Input.RequestBody),
 	//		Status:          "新增表格",
-	//		Method:          this.Ctx.Input.URI(),
+	//		Method:          c.Ctx.Input.URI(),
 	//	}
 	//	go data_manage.AddExcelInfoLog(excelLog)
 	//}
@@ -235,13 +235,13 @@ func (this *ExcelInfoController) Add() {
 // @Param   AdminId   query   int  false       "创建人id"
 // @Success 200 {object} response.ExcelListResp
 // @router /excel_info/list [get]
-func (this *ExcelInfoController) List() {
+func (c *ExcelInfoController) List() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
+		c.Data["json"] = br
+		c.ServeJSON()
 	}()
-	sysUser := this.SysUser
+	sysUser := c.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
 		br.ErrMsg = "请登录，SysUser Is Empty"
@@ -249,12 +249,12 @@ func (this *ExcelInfoController) List() {
 		return
 	}
 
-	excelClassifyId, _ := this.GetInt("ExcelClassifyId")
+	excelClassifyId, _ := c.GetInt("ExcelClassifyId")
 
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	keyword := this.GetString("Keyword")
-	adminId, _ := this.GetInt("AdminId")
+	pageSize, _ := c.GetInt("PageSize")
+	currentIndex, _ := c.GetInt("CurrentIndex")
+	keyword := c.GetString("Keyword")
+	adminId, _ := c.GetInt("AdminId")
 
 	var total int
 	page := paging.GetPaging(currentIndex, pageSize, total)
@@ -327,13 +327,13 @@ func (this *ExcelInfoController) List() {
 // @Param   ExcelInfoId   query   int  true       "表格id"
 // @Success 200 {object} data_manage.ExcelInfo
 // @router /excel_info/detail [get]
-func (this *ExcelInfoController) Detail() {
+func (c *ExcelInfoController) Detail() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
+		c.Data["json"] = br
+		c.ServeJSON()
 	}()
-	sysUser := this.SysUser
+	sysUser := c.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
 		br.ErrMsg = "请登录，SysUser Is Empty"
@@ -341,7 +341,7 @@ func (this *ExcelInfoController) Detail() {
 		return
 	}
 
-	excelInfoId, _ := this.GetInt("ExcelInfoId")
+	excelInfoId, _ := c.GetInt("ExcelInfoId")
 	if excelInfoId <= 0 {
 		br.Msg = "请选择表格"
 		br.ErrMsg = "ExcelInfoId未传"
@@ -372,14 +372,14 @@ func (this *ExcelInfoController) Detail() {
 // @Param	request	body request.EditExcelInfoReq true "type json string"
 // @Success 200 {object} response.AddExcelInfoResp
 // @router /excel_info/edit [post]
-func (this *ExcelInfoController) Edit() {
+func (c *ExcelInfoController) Edit() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
+		c.Data["json"] = br
+		c.ServeJSON()
 	}()
 
-	sysUser := this.SysUser
+	sysUser := c.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
 		br.ErrMsg = "请登录，SysUser Is Empty"
@@ -388,7 +388,7 @@ func (this *ExcelInfoController) Edit() {
 	}
 	deleteCache := true
 	var req request.EditExcelInfoReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
@@ -408,7 +408,7 @@ func (this *ExcelInfoController) Edit() {
 	if !utils.Rc.SetNX(cacheKey, 1, 30*time.Second) {
 		deleteCache = false
 		br.Msg = "系统处理中，请稍后重试！"
-		br.ErrMsg = "系统处理中，请稍后重试！" + sysUser.RealName + ";data:" + string(this.Ctx.Input.RequestBody)
+		br.ErrMsg = "系统处理中，请稍后重试！" + sysUser.RealName + ";data:" + string(c.Ctx.Input.RequestBody)
 		return
 	}
 	req.ExcelName = strings.Trim(req.ExcelName, " ")
@@ -582,14 +582,14 @@ func (this *ExcelInfoController) Edit() {
 // @Param	request	body request.MoveExcelInfoReq true "type json string"
 // @Success Ret=200 移动成功
 // @router /excel_info/move [post]
-func (this *ExcelInfoController) Move() {
+func (c *ExcelInfoController) Move() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
+		c.Data["json"] = br
+		c.ServeJSON()
 	}()
 
-	sysUser := this.SysUser
+	sysUser := c.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
 		br.ErrMsg = "请登录，SysUser Is Empty"
@@ -598,7 +598,7 @@ func (this *ExcelInfoController) Move() {
 	}
 
 	var req request.MoveExcelInfoReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
@@ -752,9 +752,9 @@ func (this *ExcelInfoController) Move() {
 	//	ExcelLog.SysUserRealName = sysUser.RealName
 	//	ExcelLog.UniqueCode = ExcelInfo.UniqueCode
 	//	ExcelLog.CreateTime = time.Now()
-	//	ExcelLog.Content = string(this.Ctx.Input.RequestBody)
+	//	ExcelLog.Content = string(c.Ctx.Input.RequestBody)
 	//	ExcelLog.Status = "移动表格"
-	//	ExcelLog.Method = this.Ctx.Input.URL()
+	//	ExcelLog.Method = c.Ctx.Input.URL()
 	//	go data_manage.AddExcelInfoLog(ExcelLog)
 	//}
 
@@ -770,16 +770,16 @@ func (this *ExcelInfoController) Move() {
 // @Param	request	body request.DeleteExcelInfoReq true "type json string"
 // @Success Ret=200 删除成功
 // @router /excel_info/delete [post]
-func (this *ExcelInfoController) Delete() {
+func (c *ExcelInfoController) Delete() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
+		c.Data["json"] = br
+		c.ServeJSON()
 	}()
 
 	resp := response.AddExcelInfoResp{}
 
-	sysUser := this.SysUser
+	sysUser := c.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
 		br.ErrMsg = "请登录，SysUser Is Empty"
@@ -788,7 +788,7 @@ func (this *ExcelInfoController) Delete() {
 	}
 
 	var req request.DeleteExcelInfoReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
@@ -911,14 +911,14 @@ func (this *ExcelInfoController) Delete() {
 // @Param	request	body request.AddExcelDraftReq true "type json string"
 // @Success Ret=200 添加成功
 // @router /excel_info/draft/add [post]
-func (this *ExcelInfoController) AddDraft() {
+func (c *ExcelInfoController) AddDraft() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
+		c.Data["json"] = br
+		c.ServeJSON()
 	}()
 
-	sysUser := this.SysUser
+	sysUser := c.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
 		br.ErrMsg = "请登录，SysUser Is Empty"
@@ -928,7 +928,7 @@ func (this *ExcelInfoController) AddDraft() {
 
 	var req request.AddExcelDraftReq
 
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
@@ -1010,20 +1010,20 @@ func (this *ExcelInfoController) AddDraft() {
 // @Param   UniqueCode   query   string  true       "表格code"
 // @Success 200 {object} response.ExcelTableDetailResp
 // @router /excel_info/table_data [get]
-func (this *ExcelInfoController) GetExcelTableData() {
+func (c *ExcelInfoController) GetExcelTableData() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
+		c.Data["json"] = br
+		c.ServeJSON()
 	}()
-	sysUser := this.SysUser
+	sysUser := c.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
 		br.ErrMsg = "请登录，SysUser Is Empty"
 		br.Ret = 408
 		return
 	}
-	uniqueCode := this.GetString("UniqueCode")
+	uniqueCode := c.GetString("UniqueCode")
 
 	var err error
 	if uniqueCode == `` {
@@ -1134,7 +1134,7 @@ func UpdateExcelInfoFileUrl(excelInfo *data_manage.ExcelInfo) {
 	//_, err = luckySheetData.GetTableDataByLuckySheetDataStr()
 	downloadFilePath, err := luckySheetData.ToExcel()
 	defer func() {
-		os.Remove(downloadFilePath)
+		_ = os.Remove(downloadFilePath)
 	}()
 	if err != nil {
 		fmt.Println("err:", err)
@@ -1178,14 +1178,14 @@ func UpdateExcelInfoFileUrl(excelInfo *data_manage.ExcelInfo) {
 // @Description 公式计算接口
 // @Param	request	body request.CalculateReq true "type json string"
 // @router /excel_info/table/calculate [post]
-func (this *ExcelInfoController) Calculate() {
+func (c *ExcelInfoController) Calculate() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
+		c.Data["json"] = br
+		c.ServeJSON()
 	}()
 
-	sysUser := this.SysUser
+	sysUser := c.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
 		br.ErrMsg = "请登录，SysUser Is Empty"
@@ -1194,7 +1194,7 @@ func (this *ExcelInfoController) Calculate() {
 	}
 
 	var req request.CalculateReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
@@ -1260,15 +1260,16 @@ func (this *ExcelInfoController) Calculate() {
 // @Description 获取未来日期数据接口
 // @Param   EdbInfoId   query   int  true       "指标id"
 // @Param   Num   query   int  true       "默认期数"
+// @Param   SortType   query   string  true       "如何排序，是正序还是倒序，枚举值：`asc 正序`,`desc 倒序`，不传默认倒序"
 // @router /excel_info/table/first_edb_data_list [get]
-func (this *ExcelInfoController) GetFirstEdbData() {
+func (c *ExcelInfoController) GetFirstEdbData() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
+		c.Data["json"] = br
+		c.ServeJSON()
 	}()
 
-	sysUser := this.SysUser
+	sysUser := c.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
 		br.ErrMsg = "请登录，SysUser Is Empty"
@@ -1276,8 +1277,9 @@ func (this *ExcelInfoController) GetFirstEdbData() {
 		return
 	}
 
-	edbInfoId, _ := this.GetInt("EdbInfoId")
-	num, _ := this.GetInt("Num")
+	edbInfoId, _ := c.GetInt("EdbInfoId")
+	num, _ := c.GetInt("Num")
+	sortType := c.GetString("SortType")
 
 	if edbInfoId <= 0 {
 		br.Msg = "请选择指标"
@@ -1304,6 +1306,13 @@ func (this *ExcelInfoController) GetFirstEdbData() {
 		return
 	}
 
+	// 默认是倒序返回的数据，如果要正序的话，那么翻转下就好了
+	if sortType == "asc" {
+		for i, j := 0, len(dataList)-1; i < j; i, j = i+1, j-1 {
+			dataList[i], dataList[j] = dataList[j], dataList[i]
+		}
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
@@ -1318,14 +1327,14 @@ func (this *ExcelInfoController) GetFirstEdbData() {
 // @Description 获取未来日期数据接口
 // @Param	request	body request.GetOtherEdbDateDataReq true "type json string"
 // @router /excel_info/table/other_edb_data_list [post]
-func (this *ExcelInfoController) GetOtherEdbData() {
+func (c *ExcelInfoController) GetOtherEdbData() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
+		c.Data["json"] = br
+		c.ServeJSON()
 	}()
 
-	sysUser := this.SysUser
+	sysUser := c.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
 		br.ErrMsg = "请登录，SysUser Is Empty"
@@ -1334,7 +1343,7 @@ func (this *ExcelInfoController) GetOtherEdbData() {
 	}
 
 	var req request.GetOtherEdbDateDataReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
@@ -1365,6 +1374,13 @@ func (this *ExcelInfoController) GetOtherEdbData() {
 		return
 	}
 
+	// 默认是倒序返回的数据，如果要正序的话，那么翻转下就好了
+	if req.SortType == "asc" {
+		for i, j := 0, len(dataList)-1; i < j; i, j = i+1, j-1 {
+			dataList[i], dataList[j] = dataList[j], dataList[i]
+		}
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
@@ -1379,14 +1395,14 @@ func (this *ExcelInfoController) GetOtherEdbData() {
 // @Description 获取未来日期数据接口
 // @Param	request	body request.GetFutureDateDataReq true "type json string"
 // @router /excel_info/table/future_date_list [post]
-func (this *ExcelInfoController) GetFutureDateData() {
+func (c *ExcelInfoController) GetFutureDateData() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
+		c.Data["json"] = br
+		c.ServeJSON()
 	}()
 
-	sysUser := this.SysUser
+	sysUser := c.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
 		br.ErrMsg = "请登录，SysUser Is Empty"
@@ -1395,7 +1411,7 @@ func (this *ExcelInfoController) GetFutureDateData() {
 	}
 
 	var req request.GetFutureDateDataReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
@@ -1549,14 +1565,14 @@ func (this *ExcelInfoController) GetFutureDateData() {
 // @Description 获取历史日期数据接口
 // @Param	request	body request.GetFutureDateDataReq true "type json string"
 // @router /excel_info/table/history_date_list [post]
-func (this *ExcelInfoController) GetHistoryDateData() {
+func (c *ExcelInfoController) GetHistoryDateData() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
+		c.Data["json"] = br
+		c.ServeJSON()
 	}()
 
-	sysUser := this.SysUser
+	sysUser := c.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
 		br.ErrMsg = "请登录，SysUser Is Empty"
@@ -1565,7 +1581,7 @@ func (this *ExcelInfoController) GetHistoryDateData() {
 	}
 
 	var req request.GetHistoryDateDataReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
@@ -1661,14 +1677,14 @@ func (this *ExcelInfoController) GetHistoryDateData() {
 // @Description 刷新接口
 // @Param   ExcelInfoId   query   int  true       "表格id"
 // @router /excel_info/table/refresh [get]
-func (this *ExcelInfoController) Refresh() {
+func (c *ExcelInfoController) Refresh() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
+		c.Data["json"] = br
+		c.ServeJSON()
 	}()
 
-	sysUser := this.SysUser
+	sysUser := c.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
 		br.ErrMsg = "请登录，SysUser Is Empty"
@@ -1676,7 +1692,7 @@ func (this *ExcelInfoController) Refresh() {
 		return
 	}
 
-	excelInfoId, _ := this.GetInt("ExcelInfoId")
+	excelInfoId, _ := c.GetInt("ExcelInfoId")
 	if excelInfoId <= 0 {
 		br.Msg = "请选择表格"
 		br.ErrMsg = "ExcelInfoId未传"
@@ -1741,13 +1757,13 @@ func (this *ExcelInfoController) Refresh() {
 // @Param   ExcelInfoId   query   int  true       "表格id"
 // @Success 200 {object} data_manage.ExcelInfo
 // @router /excel_info/table/download [get]
-func (this *ExcelInfoController) Download() {
+func (c *ExcelInfoController) Download() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
+		c.Data["json"] = br
+		c.ServeJSON()
 	}()
-	sysUser := this.SysUser
+	sysUser := c.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
 		br.ErrMsg = "请登录，SysUser Is Empty"
@@ -1755,8 +1771,8 @@ func (this *ExcelInfoController) Download() {
 		return
 	}
 
-	excelInfoId, _ := this.GetInt("ExcelInfoId")
-	uniqueCode := this.GetString("UniqueCode")
+	excelInfoId, _ := c.GetInt("ExcelInfoId")
+	uniqueCode := c.GetString("UniqueCode")
 	if excelInfoId <= 0 && uniqueCode == `` {
 		br.Msg = "请选择表格"
 		br.ErrMsg = "ExcelInfoId和UniqueCode都未传"
@@ -1840,11 +1856,11 @@ func (this *ExcelInfoController) Download() {
 		return
 	}
 	defer func() {
-		os.Remove(downloadFilePath)
+		_ = os.Remove(downloadFilePath)
 	}()
 
 	downloadFileName := excelInfo.ExcelName + ".xlsx"
-	this.Ctx.Output.Download(downloadFilePath, downloadFileName)
+	c.Ctx.Output.Download(downloadFilePath, downloadFileName)
 
 	br.Ret = 200
 	br.Success = true
@@ -1858,13 +1874,13 @@ func (this *ExcelInfoController) Download() {
 // @Param	request	body request.EditExcelInfoReq true "type json string"
 // @Success 200 {object} response.AddExcelInfoResp
 // @router /excel_info/copy [post]
-func (this *ExcelInfoController) Copy() {
+func (c *ExcelInfoController) Copy() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
+		c.Data["json"] = br
+		c.ServeJSON()
 	}()
-	sysUser := this.SysUser
+	sysUser := c.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
 		br.ErrMsg = "请登录，SysUser Is Empty"
@@ -1874,7 +1890,7 @@ func (this *ExcelInfoController) Copy() {
 
 	deleteCache := true
 	var req request.CopyExcelInfoReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
@@ -1894,7 +1910,7 @@ func (this *ExcelInfoController) Copy() {
 	if !utils.Rc.SetNX(cacheKey, 1, 30*time.Second) {
 		deleteCache = false
 		br.Msg = "系统处理中，请稍后重试！"
-		br.ErrMsg = "系统处理中，请稍后重试！" + sysUser.RealName + ";data:" + string(this.Ctx.Input.RequestBody)
+		br.ErrMsg = "系统处理中，请稍后重试！" + sysUser.RealName + ";data:" + string(c.Ctx.Input.RequestBody)
 		return
 	}
 	req.ExcelName = strings.Trim(req.ExcelName, " ")

controllers/data_manage/supply_analysis/variety_plant.go

@@ -14,8 +14,8 @@ import (
 )
 
 // PlantList
-// @Title 商品价格图表分类列表
-// @Description 商品价格图表分类列表接口
+// @Title 装置列表
+// @Description 装置列表
 // @Param   VarietyId   query   int  true       "品种id"
 // @Success 200 {object} response.VarietyListResp
 // @router /variety/plant/list [get]

models/data_manage/request/excel_info.go

@@ -58,6 +58,7 @@ type CalculateReq struct {
 // GetOtherEdbDateDataReq 获取其他指标的指定日期的数据
 type GetOtherEdbDateDataReq struct {
 	EdbInfoId int      `description:"指标id"`
+	SortType  string   `description:"如何排序，是正序还是倒序，枚举值：asc 正序,desc 倒序，不传默认倒序"`
 	DateList  []string `description:"日期列表，从小到大"`
 }
 

services/data/edb_data.go

@@ -334,13 +334,13 @@ func TbzDiv(a, b float64) float64 {
 }
 
 // GetDateData 获取指标的单个日期的值
-func GetDateData(edbInfo *data_manage.EdbInfo, date string) (val string, err error) {
+func GetDateData(edbInfo *data_manage.EdbInfo, startDate, endDate string) (val string, err error) {
 	var dataList []*data_manage.EdbDataList
 	switch edbInfo.EdbInfoType {
 	case 0:
-		dataList, err = data_manage.GetEdbDataList(edbInfo.Source, edbInfo.EdbInfoId, date, date)
+		dataList, err = data_manage.GetEdbDataList(edbInfo.Source, edbInfo.EdbInfoId, startDate, endDate)
 	case 1:
-		_, dataList, _, _, err, _ = GetPredictDataListByPredictEdbInfoId(edbInfo.EdbInfoId, date, date, false)
+		_, dataList, _, _, err, _ = GetPredictDataListByPredictEdbInfoId(edbInfo.EdbInfoId, startDate, endDate, false)
 	default:
 		err = errors.New(fmt.Sprint("获取失败,指标类型异常", edbInfo.EdbInfoType))