Browse Source

fix:时间序列异常数据处理

zqbao 7 months ago
parent
commit
a230433091
2 changed files with 34 additions and 25 deletions
  1. 32 24
      controllers/data_manage/excel/excel_info.go
  2. 2 1
      static/ErrMsgConfig.json

+ 32 - 24
controllers/data_manage/excel/excel_info.go

@@ -160,22 +160,22 @@ func (c *ExcelInfoController) Add() {
 	if req.Source == utils.TIME_TABLE {
 		jsonStrByte, err := json.Marshal(req.TableData)
 		if err != nil {
-			br.Msg = "自定义表格数据获取失败"
-			br.ErrMsg = "自定义表格数据获取失败,转json失败,Err:" + err.Error()
+			br.Msg = "时间序列表格数据获取失败"
+			br.ErrMsg = "时间序列表格数据获取失败,Err:" + err.Error()
 			return
 		}
 		var tableData request.TableDataReq
 		err = json.Unmarshal(jsonStrByte, &tableData)
 		if err != nil {
-			br.Msg = "自定义表格数据获取失败"
-			br.ErrMsg = "自定义表格数据获取失败,json转结构体失败,Err:" + err.Error()
+			br.Msg = "时间序列表格数据获取失败"
+			br.ErrMsg = "时间序列表格数据获取失败,Err:" + err.Error()
 			return
 		}
 
 		tableDataConfig, err := excel2.GetTableDataConfig(tableData)
 		if err != nil {
-			br.Msg = "自定义表格数据获取失败"
-			br.ErrMsg = "自定义表格数据获取失败,Err:" + err.Error()
+			br.Msg = "时间序列表格数据获取失败"
+			br.ErrMsg = "时间序列表格数据获取失败,Err:" + err.Error()
 			return
 		}
 		edbInfoIdList = tableDataConfig.EdbInfoIdList
@@ -183,8 +183,8 @@ func (c *ExcelInfoController) Add() {
 		tableDataConfig.DecimalConfig = tableData.DecimalConfig
 		contentByte, err := json.Marshal(tableDataConfig)
 		if err != nil {
-			br.Msg = "自定义表格数据获取失败"
-			br.ErrMsg = "自定义表格数据获取后,转json失败,Err:" + err.Error()
+			br.Msg = "时间序列表格数据获取失败"
+			br.ErrMsg = "时间序列表格数据获取失败,Err:" + err.Error()
 			return
 		}
 		content = string(contentByte)
@@ -677,21 +677,21 @@ func (c *ExcelInfoController) Detail() {
 	if excelDetail.Source == utils.TIME_TABLE {
 		jsonStrByte, err := json.Marshal(excelDetail.TableData)
 		if err != nil {
-			br.Msg = "自定义表格数据获取失败"
-			br.ErrMsg = "自定义表格数据获取失败,转json失败,Err:" + err.Error()
+			br.Msg = "时间序列表格数据获取失败"
+			br.ErrMsg = "时间序列表格数据获取失败,Err:" + err.Error()
 			return
 		}
 		var tableData request.TableDataReq
 		err = json.Unmarshal(jsonStrByte, &tableData)
 		if err != nil {
-			br.Msg = "自定义表格数据获取失败"
-			br.ErrMsg = "自定义表格数据获取失败,json转结构体失败,Err:" + err.Error()
+			br.Msg = "时间序列表格数据获取失败"
+			br.ErrMsg = "时间序列表格数据获取失败,Err:" + err.Error()
 			return
 		}
 		sourceNameList, sourceNameEnList, err := excel2.GetEdbSourceByEdbInfoIdList(tableData.EdbInfoIdList)
 		if err != nil {
-			br.Msg = "自定义表格数据获取失败"
-			br.ErrMsg = "自定义表格数据获取失败,Err:" + err.Error()
+			br.Msg = "时间序列表格数据获取失败"
+			br.ErrMsg = "时间序列表格数据获取失败,Err:" + err.Error()
 			return
 		}
 		excelDetail.ExcelSource = strings.Join(sourceNameList, ",")
@@ -938,29 +938,29 @@ func (c *ExcelInfoController) Edit() {
 	case utils.TIME_TABLE: // 自定义表格
 		jsonStrByte, err := json.Marshal(req.TableData)
 		if err != nil {
-			br.Msg = "自定义表格数据获取失败"
-			br.ErrMsg = "自定义表格数据获取失败,转json失败,Err:" + err.Error()
+			br.Msg = "时间序列表格数据获取失败"
+			br.ErrMsg = "时间序列表格数据获取失败,Err:" + err.Error()
 			return
 		}
 		var tableData request.TableDataReq
 		err = json.Unmarshal(jsonStrByte, &tableData)
 		if err != nil {
-			br.Msg = "自定义表格数据获取失败"
-			br.ErrMsg = "自定义表格数据获取失败,json转结构体失败,Err:" + err.Error()
+			br.Msg = "时间序列表格数据获取失败"
+			br.ErrMsg = "时间序列表格数据获取失败,Err:" + err.Error()
 			return
 		}
 		edbInfoIdList = tableData.EdbInfoIdList
 		tableDataConfig, err := excel2.GetTableDataConfig(tableData)
 		if err != nil {
-			br.Msg = "自定义表格数据获取失败"
-			br.ErrMsg = "自定义表格数据获取失败,Err:" + err.Error()
+			br.Msg = "时间序列表格数据获取失败"
+			br.ErrMsg = "时间序列表格数据获取失败,Err:" + err.Error()
 			return
 		}
 		tableDataConfig.DecimalConfig = tableData.DecimalConfig
 		contentByte, err := json.Marshal(tableDataConfig)
 		if err != nil {
-			br.Msg = "自定义表格数据获取失败"
-			br.ErrMsg = "自定义表格数据获取后,转json失败,Err:" + err.Error()
+			br.Msg = "时间序列表格数据获取失败"
+			br.ErrMsg = "时间序列表格数据获取失败,Err:" + err.Error()
 			return
 		}
 		content = string(contentByte)
@@ -1863,6 +1863,10 @@ func (c *ExcelInfoController) GetFirstEdbData() {
 	}
 	excelSource := strings.Join(sourceNameList, ",")
 	excelSourceEn := strings.Join(sourceNameEnList, ",")
+	if len(dataList) == 0 {
+		br.Msg = "指标数据异常,请检查"
+		return
+	}
 
 	br.Ret = 200
 	br.Success = true
@@ -2029,12 +2033,16 @@ func (c *ExcelInfoController) GetBatchEdbData() {
 
 			sourceNameList, sourceNameEnList, err := excel2.GetEdbSourceByEdbInfoIdList([]int{v})
 			if err != nil {
-				br.Msg = "自定义表格数据获取失败"
-				br.ErrMsg = "自定义表格数据获取失败,Err:" + err.Error()
+				br.Msg = "时间序列表格数据获取失败"
+				br.ErrMsg = "时间序列表格数据获取失败,Err:" + err.Error()
 				return
 			}
 			excelSource := strings.Join(sourceNameList, ",")
 			excelSourceEn := strings.Join(sourceNameEnList, ",")
+			if len(dataList) == 0 {
+				br.Msg = "指标数据异常,请检查"
+				return
+			}
 			tableList = append(tableList, &response.TableDataItem{
 				EdbInfoId:     v,
 				Data:          dataList,

+ 2 - 1
static/ErrMsgConfig.json

@@ -57,5 +57,6 @@
   "当前指标已用作预测指标,不可删除": "The current metric is used as a forecasting indicator and cannot be deleted.",
   "当前指标已添加到跨品种分析,不可删除": "The current metric has been added to cross-commodity analysis and cannot be deleted.",
   "指标已删除,请刷新页面": "Metric deleted, please refresh the page.",
-  "删除失败": "Deletion failed."
+  "删除失败": "Deletion failed.",
+  "指标数据异常,请检查": "The metric data is abnormal, please check."
 }