接口修改时间调整

controllers/edb.go

@@ -444,18 +444,17 @@ func (this *EdbController) EdbInfoDataTb() {
 	}
 
 	// 计算同比值
-	dataList, minValue, maxValue, err := data.GetEdbDataTbz(edbInfo, tmpDataList, startDateTime)
+	dataList, _, _, err := data.GetEdbDataTbz(edbInfo, tmpDataList, startDateTime)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.Msg = "计算同比值失败,Err:" + err.Error()
 		return
 	}
 
-	edbInfo.MaxValue = maxValue
-	edbInfo.MinValue = minValue
-
+	//edbInfo.MaxValue = maxValue
+	//edbInfo.MinValue = minValue
 	resp := new(data_manage.EdbInfoDataResp)
-	resp.EdbInfo = edbInfo
+	//resp.EdbInfo = edbInfo
 	resp.DataList = dataList
 	br.Ret = 200
 	br.Msg = "获取成功"
@@ -529,7 +528,7 @@ func (this *EdbController) EdbInfoDataSeasonal() {
 		return
 	}
 	resp := new(data_manage.EdbInfoDataSeasonalResp)
-	resp.EdbInfo = edbInfo
+	//resp.EdbInfo = edbInfo
 	resp.DataList = dataList
 	br.Ret = 200
 	br.Msg = "获取成功"

models/data_manage/edb_data.go

@@ -341,12 +341,12 @@ func (m *EdbData) getThsHfEdbDataListByMongo(source, subSource int, edbCode, sta
 
 // EdbInfoDataSeasonalResp 指标季节性数据返回
 type EdbInfoDataSeasonalResp struct {
-	EdbInfo  *EdbInfo
+	//EdbInfo  *EdbInfo
 	DataList interface{}
 }
 
 type EdbInfoDataResp struct {
-	EdbInfo  *EdbInfo
+	//EdbInfo  *EdbInfo
 	DataList []*EdbDataList
 }
 
@@ -355,6 +355,7 @@ type EdbDataList struct {
 	//	EdbInfoId     int     `description:"指标ID"`
 	DataTime      string  //`json:"-" description:"数据日期"`
 	DataTimestamp int64   `description:"数据日期"`
+	UpdateTime    string  `description:"修改时间"`
 	Value         float64 `description:"数据值"`
 }
 
@@ -368,5 +369,6 @@ func FormatEdbData2List(origin *EdbData) (item *EdbDataList) {
 	item.DataTime = utils.TimeTransferString(utils.FormatDate, origin.DataTime)
 	item.Value = origin.Value
 	item.DataTimestamp = origin.DataTimestamp
+	item.UpdateTime = utils.TimeTransferString(utils.FormatDateTime, origin.ModifyTime)
 	return
 }

models/sandbox/sandbox.go

@@ -23,6 +23,12 @@ type Sandbox struct {
 	Style             int       `description:"风格"`
 }
 
+type SandboxItem struct {
+	Sandbox
+	ModifyTime string `description:"修改时间"`
+	CreateTime string `description:"创建时间"`
+}
+
 // Update 沙盘字段变更
 func (sandbox *Sandbox) Update(cols []string) (err error) {
 	o := orm.NewOrmUsingDB("data")
@@ -31,7 +37,7 @@ func (sandbox *Sandbox) Update(cols []string) (err error) {
 }
 
 // GetSandboxById 根据沙盘id获取沙盘详情
-func GetSandboxById(sandboxId int) (sandboxInfo *Sandbox, err error) {
+func GetSandboxById(sandboxId int) (sandboxInfo *SandboxItem, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := `select * from sandbox where sandbox_id = ? and is_delete = 0`
 	err = o.Raw(sql, sandboxId).QueryRow(&sandboxInfo)
@@ -55,8 +61,8 @@ type SandboxListItem struct {
 	//	CanEdit      bool      `description:"是否可编辑"`
 	//	Editor       string    `description:"编辑人"`
 	//	VersionTotal int       `description:"历史版本数量"`
-	ModifyTime time.Time `description:"修改时间"`
-	CreateTime time.Time `description:"创建时间"`
+	ModifyTime string `description:"修改时间"`
+	CreateTime string `description:"创建时间"`
 
 	SysUserId         int    `description:"作者id"`
 	SysUserName       string `description:"作者名称"`