Merge branch 'ETA_1.4.5' into debug

controllers/base_from_smm.go

@@ -316,6 +316,7 @@ func (this *SmmController) List() {
 	}
 	var addList []*models.BaseFromSmmIndex
 	for i := 1; i <= int(math.Ceil(float64(total)/float64(params.PageSize))); i++ {
+		time.Sleep(time.Second * 2)
 		params.Page = i
 		indexList, err := services.GetSmmNewIndexListFromBridge(params)
 		if err!= nil {
@@ -334,26 +335,20 @@ func (this *SmmController) List() {
 						br.ErrMsg = "更新指标失败,Err:" + err.Error()
 						return
 					}
+					fmt.Println("更新数据：",item.IndexCode)
 				}
 			}
 		}
 
-		if len(addList) > 900 {
+		if len(addList) > 0 {
 			_,err = models.AddBaseFromSmmIndex(addList)
 			if err!= nil {
 				br.Msg = "新增指标失败"
 				br.ErrMsg = "新增指标失败,Err:" + err.Error()
 				return
 			}
-		}
-	}
-
-	if len(addList) > 0 {
-		_,err = models.AddBaseFromSmmIndex(addList)
-		if err!= nil {
-			br.Msg = "新增指标失败"
-			br.ErrMsg = "新增指标失败,Err:" + err.Error()
-			return
+			//fmt.Println("新增数据：",len(addList))
+			addList = []*models.BaseFromSmmIndex{}
 		}
 	}
 

services/base_from_smm_http.go

@@ -333,7 +333,7 @@ func GetSmmIndexLatestFromBridge(edbInfoId int, edbCode, startDate string) (err
 		err = fmt.Errorf("startDateTime parse err: %s", err.Error())
 		return
 	}
-	timeStamp := startDateTime.UnixNano() / 1e6
+	timeStamp := startDateTime.Unix()
 
 	param := models.BridgeZhongJiIndexLatestDataParams{
 		EdbCode:  edbCode,