|
@@ -319,15 +319,17 @@ func WatchIndexFile(filePath string) {
|
|
|
fmt.Println("time.ParseInLocation Err:" + err.Error())
|
|
|
return
|
|
|
}
|
|
|
- dataItem := new(index.BaseFromMysteelChemicalData)
|
|
|
- dataItem.BaseFromMysteelChemicalIndexId = indexId
|
|
|
- dataItem.IndexCode = indexCode
|
|
|
- dataItem.DataTime = dateTime
|
|
|
- dataItem.Value = value
|
|
|
- dataItem.UpdateDate = updateDate
|
|
|
- dataItem.CreateTime = time.Now()
|
|
|
- dataItem.ModifyTime = time.Now()
|
|
|
- dataList = append(dataList, *dataItem)
|
|
|
+ if !strings.Contains(value, "#N/A") {
|
|
|
+ dataItem := new(index.BaseFromMysteelChemicalData)
|
|
|
+ dataItem.BaseFromMysteelChemicalIndexId = indexId
|
|
|
+ dataItem.IndexCode = indexCode
|
|
|
+ dataItem.DataTime = dateTime
|
|
|
+ dataItem.Value = value
|
|
|
+ dataItem.UpdateDate = updateDate
|
|
|
+ dataItem.CreateTime = time.Now()
|
|
|
+ dataItem.ModifyTime = time.Now()
|
|
|
+ dataList = append(dataList, *dataItem)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -577,17 +579,19 @@ func mysteelIndexHandle(runMode, indexName, indexCode, unit, source, frequency,
|
|
|
fmt.Println("time.ParseInLocation Err:" + err.Error())
|
|
|
return
|
|
|
}
|
|
|
- dataItem := new(index.BaseFromMysteelChemicalData)
|
|
|
- dataItem.BaseFromMysteelChemicalIndexId = indexId
|
|
|
- dataItem.IndexCode = indexCode
|
|
|
- dataItem.DataTime = dateTime
|
|
|
- dataItem.Value = value
|
|
|
- dataItem.UpdateDate = updateDate
|
|
|
- dataItem.CreateTime = time.Now()
|
|
|
- dataItem.ModifyTime = time.Now()
|
|
|
- addDataList = append(addDataList, *dataItem)
|
|
|
+ if !strings.Contains(value, "#N/A") {
|
|
|
+ dataItem := new(index.BaseFromMysteelChemicalData)
|
|
|
+ dataItem.BaseFromMysteelChemicalIndexId = indexId
|
|
|
+ dataItem.IndexCode = indexCode
|
|
|
+ dataItem.DataTime = dateTime
|
|
|
+ dataItem.Value = value
|
|
|
+ dataItem.UpdateDate = updateDate
|
|
|
+ dataItem.CreateTime = time.Now()
|
|
|
+ dataItem.ModifyTime = time.Now()
|
|
|
+ addDataList = append(addDataList, *dataItem)
|
|
|
+ }
|
|
|
} else {
|
|
|
- if findData != nil && findData.Value != value { //修改数据
|
|
|
+ if findData != nil && findData.Value != value && !strings.Contains(value, "#N/A") { //修改数据
|
|
|
dataObj.Value = value
|
|
|
dataObj.ModifyTime = time.Now()
|
|
|
dataObj.BaseFromMysteelChemicalDataId = findData.BaseFromMysteelChemicalDataId
|