Merge branch 'dm' into debug

services/data/edb_info.go

@@ -747,7 +747,7 @@ func AddEdbInfo(secName, unit, frequency, noticeTime, mobile string, classifyId,
 		err = errors.New("获取信息失败，Err:" + err.Error())
 		return
 	}
-	if item != nil {
+	if item != nil && item.TradeCode != "" {
 		err = errors.New("指标名称已存在")
 		return
 	}

services/data/manual.go

@@ -8,11 +8,12 @@ import (
 	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/shopspring/decimal"
-	"github.com/tealeg/xlsx"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/shopspring/decimal"
+	"github.com/tealeg/xlsx"
 )
 
 func GetManualSysUser(keyWord string) (list []*data_manage.ManualSysUser, err error) {
@@ -501,7 +502,7 @@ func ImportManualData(path string, sysUser *system.Admin) (successCount, failCou
 			}
 			tmpErr := AddEdbInfo(v.IndexName, v.Unit, v.Frequency, "", sysUser.Mobile, classify.ClassifyId, sysUser.AdminId, sysUser.RealName)
 			if tmpErr != nil {
-				fmt.Println("line 158")
+				utils.FileLog.Info("新增指标失败"+tmpErr.Error())
 
 				failItem := &models.EdbdataImportFail{
 					ClassifyName: v.ClassName,