Merge remote-tracking branch 'origin/master' into debug

models/base_from_wind.go

@@ -22,10 +22,14 @@ func AddEdbDataFromWind(edbCode string, item *EdbDataFromWind) (err error) {
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_wind(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	for k, v := range item.Dt {
-		timeStr := fmt.Sprintf("%d", v)
-		v = v / 1000
+		//timeStr := fmt.Sprintf("%d", v)
+		//v = v / 1000
 		t := time.Unix(v, 0)
 		dateTime := t.Format(utils.FormatDate)
+		t, _ = time.ParseInLocation(utils.FormatDate, dateTime, time.Local) // 这里的目的是为了处理成北京时间，所以多转一遍
+		timestamp := t.UnixNano() / 1e6
+		timeStr := fmt.Sprintf("%d", timestamp)
+
 		val := item.Close[k]
 		saveVal := utils.SubFloatToString(val, 20)
 		addSql += GetAddSql("0", edbCode, dateTime, timeStr, saveVal)
@@ -86,11 +90,13 @@ func RefreshEdbDataFromWind(edbInfoId int, edbCode, startDate string, item *EdbD
 	addMap := make(map[string]string)
 	edbInfoIdStr := strconv.Itoa(edbInfoId)
 	for k, v := range item.Dt {
-		timeStr := fmt.Sprintf("%d", v)
-		v = v / 1000
+		//timeStr := fmt.Sprintf("%d", v)
+		//v = v / 1000
 		t := time.Unix(v, 0)
 		dateTime := t.Format(utils.FormatDate)
 		t, _ = time.ParseInLocation(utils.FormatDate, dateTime, time.Local) // 这里的目的是为了处理成北京时间，所以多转一遍
+		timestamp := t.UnixNano() / 1e6
+		timeStr := fmt.Sprintf("%d", timestamp)
 
 		val := item.Close[k]
 		saveVal := utils.SubFloatToString(val, 30)

services/base_from_jiayue.go

@@ -333,14 +333,21 @@ func SyncJiaYueNewIndex(item models.BridgeJiaYueIndexAndData, menus []models.Bri
 // TransJiaYueFrequency 频度转换
 func TransJiaYueFrequency(origin string) string {
 	mapping := map[string]string{
-		"日":  "日度",
-		"周":  "周度",
-		"旬":  "旬度",
-		"半月": "旬度",
-		"月":  "月度",
-		"季":  "季度",
-		"半年": "半年度",
-		"年":  "年度",
+		"日":   "日度",
+		"周":   "周度",
+		"旬":   "旬度",
+		"半月":  "旬度",
+		"月":   "月度",
+		"季":   "季度",
+		"半年":  "半年度",
+		"年":   "年度",
+		"日度":  "日度",
+		"周度":  "周度",
+		"旬度":  "旬度",
+		"月度":  "月度",
+		"季度":  "季度",
+		"半年度": "半年度",
+		"年度":  "年度",
 	}
 	return mapping[origin]
 }

services/base_from_smm.go

@@ -98,6 +98,13 @@ func SmmIndexHandle(baseFilePath, renameFilePath, indexName, indexCode, unit, fr
 		updateParams["interface"] = source
 		updateParams["modify_time"] = time.Now()
 
+		if baseFilePath != `` && item.BaseFileName != baseFilePath {
+			updateParams["base_file_name"] = baseFilePath
+		}
+		if renameFilePath != `` && item.RenameFileName != renameFilePath {
+			updateParams["rename_file_name"] = renameFilePath
+		}
+
 		whereParam := make(map[string]interface{})
 		whereParam["index_code"] = indexCode