|
@@ -5,6 +5,7 @@ import (
|
|
|
"eta/eta_forum_hub/models"
|
|
|
"eta/eta_forum_hub/models/mgodb"
|
|
|
"eta/eta_forum_hub/utils"
|
|
|
+ "fmt"
|
|
|
"strconv"
|
|
|
"time"
|
|
|
)
|
|
@@ -16,8 +17,8 @@ func BatchAddOrUpdateEdbInfo(edbList []*models.EdbInfo, edbMapping []*models.Edb
|
|
|
for _, v := range edbList {
|
|
|
tmp, e, msg, _ := AddOrUpdateEdbInfo(v, sysUserId, sysUserRealName)
|
|
|
if e != nil {
|
|
|
- err = e
|
|
|
- errMsg = msg
|
|
|
+ err = fmt.Errorf("添加指标失败:%s,%s", e.Error(), msg)
|
|
|
+ errMsg = "添加指标失败"
|
|
|
return
|
|
|
}
|
|
|
newList = append(newList, tmp)
|
|
@@ -52,11 +53,15 @@ func BatchAddOrUpdateEdbInfo(edbList []*models.EdbInfo, edbMapping []*models.Edb
|
|
|
calculateMappingItem.FromSubSource = edbInfo.SubSource
|
|
|
calculateMappingItemList = append(calculateMappingItemList, calculateMappingItem)
|
|
|
}
|
|
|
- err = models.AddEdbInfoCalculateMappingMulti(calculateMappingItemList)
|
|
|
- if err != nil {
|
|
|
- errMsg = "指标映射关系添加失败"
|
|
|
- return
|
|
|
+ if len(calculateMappingItemList) > 0 {
|
|
|
+ err = models.AddEdbInfoCalculateMappingMulti(calculateMappingItemList)
|
|
|
+ if err != nil {
|
|
|
+ errMsg = "指标映射关系添加失败"
|
|
|
+ err = fmt.Errorf("指标映射关系添加失败, %s", err.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
return
|
|
|
}
|
|
|
|