调整err报错

services/base_from_yongyi.go

@@ -14,12 +14,22 @@ import (
 
 // HandleYongyiIndex 处理涌益咨询的excel数据
 func HandleYongyiIndex(req *models.HandleYongyiExcelDataReq) (err error) {
+	errMsgList := make([]string, 0)
+	defer func() {
+		if len(errMsgList) > 0 {
+			msg := fmt.Sprint("数据源-涌益咨询数据处理失败,err:", strings.Join(errMsgList, "\n"))
+			utils.FileLog.Info(msg)
+			go alarm_msg.SendAlarmMsg(msg, 3)
+		}
+	}()
 	for _, v := range req.List {
 		if v.IndexName == "" || v.IndexCode == "" {
+			errMsgList = append(errMsgList, fmt.Sprintf("新增指标异常，指标编码%s或者指标ID%s为空：", v.IndexCode, v.IndexName))
 			continue
 		}
 		err = handleYongyiIndex(v)
 		if err != nil {
+			errMsgList = append(errMsgList, fmt.Sprintf("新增指标异常，指标编码：%s, Err: %s", v.IndexCode, err))
 			return
 		}
 	}
@@ -34,10 +44,11 @@ func handleYongyiIndex(req *models.HandleYongyiExcelData) (err error) {
 	errMsgList := make([]string, 0)
 	defer func() {
 		if len(errMsgList) > 0 {
-			go alarm_msg.SendAlarmMsg(fmt.Sprint("数据源-涌益咨询数据处理失败,err:", strings.Join(errMsgList, "\n")), 3)
+			msg := fmt.Sprint("数据源-涌益咨询数据处理失败,err:", strings.Join(errMsgList, "\n"))
+			utils.FileLog.Info(msg)
+			go alarm_msg.SendAlarmMsg(msg, 3)
 		}
 	}()
-
 	indexObj := new(models.BaseFromYongyiIndex)
 	dataObj := new(models.BaseFromYongyiData)
 	classifyObj := new(models.BaseFromYongyiClassify)
@@ -60,7 +71,6 @@ func handleYongyiIndex(req *models.HandleYongyiExcelData) (err error) {
 		classifyObj, err = classifyObj.GetByClassifyName(req.ClassifyName)
 		if err != nil {
 			if err.Error() == utils.ErrNoRow() {
-				err = nil
 				//新增分类
 				classifyObj = &models.BaseFromYongyiClassify{
 					ClassifyName:    req.ClassifyName,
@@ -75,7 +85,7 @@ func handleYongyiIndex(req *models.HandleYongyiExcelData) (err error) {
 
 				classifyId, err = classifyObj.Add()
 				if err != nil {
-					fmt.Println("add err:" + err.Error())
+					err = fmt.Errorf("新增分类失败 Err：%s", err)
 					return
 				}
 				classifyObj.ClassifyId = classifyId
@@ -83,10 +93,12 @@ func handleYongyiIndex(req *models.HandleYongyiExcelData) (err error) {
 				classifyObj.Sort = int(classifyId)
 				err = classifyObj.Update([]string{"Sort"})
 				if err != nil {
+					err = fmt.Errorf("修改分类排序失败 Err：%s", err)
 					return
 				}
+			} else {
+				return
 			}
-			return
 		} else {
 			classifyId = classifyObj.ClassifyId
 		}
@@ -101,7 +113,7 @@ func handleYongyiIndex(req *models.HandleYongyiExcelData) (err error) {
 			err = nil
 		} else {
 			isAdd = -1
-			fmt.Println("GetByIndexCode Err:" + err.Error())
+			err = fmt.Errorf("查询数据源指标库失败 GetByIndexCode Err：%s", err)
 			return
 		}
 	}
@@ -124,7 +136,7 @@ func handleYongyiIndex(req *models.HandleYongyiExcelData) (err error) {
 		indexObj.TerminalCode = terminalCode
 		indexId, err = indexObj.Add()
 		if err != nil {
-			fmt.Println("add err:" + err.Error())
+			err = fmt.Errorf("数据源新增涌溢指标失败 Err：%s", err)
 			return
 		}
 		indexObj.YongyiIndexId = indexId
@@ -133,6 +145,7 @@ func handleYongyiIndex(req *models.HandleYongyiExcelData) (err error) {
 			item.TerminalCode = terminalCode
 			err = item.Update([]string{"TerminalCode"})
 			if err != nil {
+				err = fmt.Errorf("数据源更新涌溢指标失败 Err：%s", err)
 				return
 			}
 		}
@@ -141,7 +154,7 @@ func handleYongyiIndex(req *models.HandleYongyiExcelData) (err error) {
 		var exitDataList []*models.BaseFromYongyiData
 		exitDataList, err = dataObj.GetByIndexCode(indexCode)
 		if err != nil {
-			fmt.Println("GetIndexDataList Err:" + err.Error())
+			err = fmt.Errorf("数据源查询涌溢指标数据失败 Err：%s", err)
 			return
 		}
 		fmt.Println("exitDataListLen:", len(exitDataList))
@@ -157,7 +170,7 @@ func handleYongyiIndex(req *models.HandleYongyiExcelData) (err error) {
 		if findData, ok := exitDataMap[date]; !ok {
 			_, err = time.ParseInLocation(utils.FormatDate, date, time.Local)
 			if err != nil {
-				fmt.Println("time.ParseInLocation Err:" + err.Error())
+				err = fmt.Errorf("%s 转换日期格式失败 Err：%s", date, err)
 				return
 			}
 			if !strings.Contains(value, "#N/A") {
@@ -168,8 +181,7 @@ func handleYongyiIndex(req *models.HandleYongyiExcelData) (err error) {
 					saveDataTime, err = time.Parse(utils.FormatDate, date)
 				}
 				if err != nil {
-					errMsg := "saveDataTime parse err:" + err.Error() + " dataTime:" + date
-					fmt.Println(errMsg)
+					err = fmt.Errorf("%s 转换日期格式失败 Err：%s", date, err)
 					continue
 				}
 				timestamp := saveDataTime.UnixNano() / 1e6
@@ -194,13 +206,14 @@ func handleYongyiIndex(req *models.HandleYongyiExcelData) (err error) {
 	if len(addDataList) > 0 {
 		err = dataObj.AddMulti(addDataList)
 		if err != nil {
-			fmt.Println("dataObj.Add() Err:" + err.Error())
+			err = fmt.Errorf("批量新增指标失败 Err：%s", err)
 			return
 		}
 
 		var dateItem *models.EdbInfoMaxAndMinInfo
 		dateItem, err = dataObj.GetMaxAndMinDateByIndexCode(indexCode)
 		if err != nil {
+			err = fmt.Errorf("查询指标最新日期失败 Err：%s", err)
 			return
 		}