Merge remote-tracking branch 'origin/dm'

services/base_from_mysteel_chemical.go

@@ -161,7 +161,7 @@ func HandleApiIndex(indexCodes []string) (errMsg string, err error) {
 				v.BaseFromMysteelChemicalIndexId = index.BaseFromMysteelChemicalIndexId
 				addItems = append(addItems, v)
 			} else {
-				if findData != nil && findData.Value != v.Value {
+				if findData != nil && findData.BaseFromMysteelChemicalDataId > 0 && findData.Value != v.Value {
 					dataObj.BaseFromMysteelChemicalDataId = findData.BaseFromMysteelChemicalDataId
 					dataObj.Value = v.Value
 					dataObj.ModifyTime = time.Now()
@@ -184,7 +184,7 @@ func HandleApiIndex(indexCodes []string) (errMsg string, err error) {
 			continue
 		}
 		mysteelIndexMaxItem, er := dataObj.GetMysteelIndexInfoMaxAndMinInfo(items[0].IndexCode)
-		if er == nil && mysteelIndexMaxItem != nil {
+		if er == nil && mysteelIndexMaxItem != nil && mysteelIndexMaxItem.IndexCode != "" {
 			e := dataObj.ModifyMysteelIndexMaxAndMinInfo(items[0].IndexCode, mysteelIndexMaxItem)
 			if e != nil {
 				fmt.Println("ModifyMysteelIndexMaxAndMinInfo Err:" + e.Error())
@@ -198,7 +198,7 @@ func HandleApiIndex(indexCodes []string) (errMsg string, err error) {
 			return
 		}
 
-		if edbInfo != nil {
+		if edbInfo != nil && edbInfo.EdbInfoId > 0 {
 			dataUpdateResult := 2
 			dataUpdateFailedReason := "服务异常"
 			_, logErrMsg, logErr := logic.RefreshBaseEdbInfo(edbInfo, ``)
@@ -435,7 +435,7 @@ func handleIndex(indexItem *models.HandleMysteelIndex) (err error) {
 				addDataList = append(addDataList, *dataItem)
 			}
 		} else {
-			if findData != nil && findData.Value != value && !strings.Contains(value, "#N/A") { //修改数据
+			if findData != nil && findData.BaseFromMysteelChemicalDataId > 0 && findData.Value != value && !strings.Contains(value, "#N/A") { //修改数据
 				dataObj.BaseFromMysteelChemicalDataId = findData.BaseFromMysteelChemicalDataId
 				dataObj.Value = value
 				dataObj.ModifyTime = time.Now()
@@ -460,7 +460,7 @@ func handleIndex(indexItem *models.HandleMysteelIndex) (err error) {
 
 	//修改最大最小日期
 	mysteelIndexMaxItem, err := dataObj.GetMysteelIndexInfoMaxAndMinInfo(indexItem.IndexCode)
-	if err == nil && mysteelIndexMaxItem != nil {
+	if err == nil && mysteelIndexMaxItem != nil && mysteelIndexMaxItem.IndexCode != `` {
 		e := dataObj.ModifyMysteelIndexMaxAndMinInfo(indexItem.IndexCode, mysteelIndexMaxItem)
 		if e != nil {
 			fmt.Println("ModifyMysteelIndexMaxAndMinInfo Err:" + e.Error())
@@ -488,7 +488,7 @@ func handleIndex(indexItem *models.HandleMysteelIndex) (err error) {
 		return
 	}
 
-	if edbInfo != nil {
+	if edbInfo != nil && edbInfo.EdbInfoId > 0 {
 		dataUpdateResult := 2
 		dataUpdateFailedReason := "服务异常"
 		_, logErrMsg, logErr := logic.RefreshBaseEdbInfo(edbInfo, ``)
@@ -724,7 +724,7 @@ func RefreshDataFromMysteelChemical(edbCode, startDate, endDate string) (err err
 				v.BaseFromMysteelChemicalIndexId = existIndex.BaseFromMysteelChemicalIndexId
 				addItems = append(addItems, v)
 			} else {
-				if findData != nil && findData.Value != v.Value {
+				if findData != nil && findData.BaseFromMysteelChemicalDataId > 0 && findData.Value != v.Value {
 					dataObj.BaseFromMysteelChemicalDataId = findData.BaseFromMysteelChemicalDataId
 					dataObj.Value = v.Value
 					dataObj.ModifyTime = time.Now()