longyu 2 years ago
parent
commit
fb36da6925
3 changed files with 28 additions and 21 deletions
  1. 1 1
      services/api_tool.go
  2. 4 1
      services/index.go
  3. 23 19
      watch/watch.go

+ 1 - 1
services/api_tool.go

@@ -6,7 +6,7 @@ import (
 )
 
 const (
-	RefreshUrl = "http://127.0.0.1:7005/mysteel_chemical/refresh"
+	RefreshUrl = "http://127.0.0.1:7007/mysteel_chemical/refresh"
 )
 
 func MysteelChemicalRefresh(filePath string) {

+ 4 - 1
services/index.go

@@ -190,7 +190,8 @@ func IndexRefreshAll() {
 	week := int(now.Weekday())
 
 	for _, v := range list {
-		time.Sleep(3 * time.Second)
+		rn := utils.GetRandInt(1, 10)
+		time.Sleep(time.Duration(rn) * time.Second)
 		if v.Frequency == "年度" {
 			if month == 1 && day == 1 {
 				MysteelChemicalRefresh(v.MergeFilePath)
@@ -233,6 +234,8 @@ func IndexRefreshMethanol() {
 	day := now.Day()
 	week := int(now.Weekday())
 	for _, v := range list {
+		rn := utils.GetRandInt(1, 10)
+		time.Sleep(time.Duration(rn) * time.Second)
 		time.Sleep(3 * time.Second)
 		if v.Frequency == "年度" {
 			if month == 1 && day == 1 {

+ 23 - 19
watch/watch.go

@@ -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