Browse Source

Merge branch 'ths_ds_fix' into debug

# Conflicts:
#	utils/constants.go
zwxi 9 months ago
parent
commit
6bf09b0c8f
2 changed files with 6 additions and 5 deletions
  1. 3 0
      logic/base_edb_info.go
  2. 3 5
      services/base_from_ths_ds_http.go

+ 3 - 0
logic/base_edb_info.go

@@ -31,6 +31,9 @@ func RefreshBaseEdbInfo(edbInfo *models.EdbInfo, startDate string) (isHandling b
 		err = models.RefreshEdbDataFromSmm(edbInfo.EdbInfoId, edbInfo.EdbCode, startDate)
 	case utils.DATA_SOURCE_BLOOMBERG:
 		err = models.RefreshEdbDataFromBloomberg(edbInfo.EdbInfoId, edbInfo.EdbCode, startDate)
+	case utils.DATA_SOURCE_CCF:
+		ccfOb := new(models.BaseFromCCF)
+		err = ccfOb.Refresh(edbInfo.EdbInfoId, edbInfo.EdbCode, startDate)
 	default:
 		return
 	}

+ 3 - 5
services/base_from_ths_ds_http.go

@@ -80,17 +80,15 @@ func getEdbDataFromThsDsHttp(stockCode, edbCode, startDate, endDate, thsRefreshT
 					value := reflect.ValueOf(sliceValue.Index(i).Interface())
 					if value.Kind() == reflect.Float64 {
 						tableValue = value.Float()
-						if tableValue != 0 {
-							tableTimeList = append(tableTimeList, tmpItems.Tables[0].Time[i])
-							tableValueList = append(tableValueList, tableValue)
-						}
+						tableTimeList = append(tableTimeList, tmpItems.Tables[0].Time[i])
+						tableValueList = append(tableValueList, tableValue)
 					}
 				}
 			} else {
 				fmt.Printf("Field '%s' not found\n", field)
 			}
 			tmpTable := models.Tables{
-				ID:  []string{},
+				ID:    []string{},
 				Time:  tableTimeList,
 				Value: tableValueList,
 			}