|
@@ -107,17 +107,16 @@ func InitPositionTask(cont context.Context) (err error) {
|
|
|
}
|
|
|
|
|
|
// InitGuangzhouPositionTask 初始化广期所持仓分析排名情况
|
|
|
-func InitGuangzhouPositionTask(cont context.Context) (err error) {
|
|
|
- //exchanges := []string{"zhengzhou", "dalian", "shanghai", "cffex", "ine", "guangzhou"} //郑商所,大商所,上期所,中金所,上期能源
|
|
|
+func InitGuangzhouPositionTask() (err error) {
|
|
|
exchanges := []string{"guangzhou"} //郑商所,大商所,上期所,中金所,上期能源
|
|
|
- for i := 15; i >= 0; i-- {
|
|
|
+ for i := 7; i >= 0; i-- {
|
|
|
startDate := time.Now().AddDate(0, 0, -i).Format(utils.FormatDate)
|
|
|
endDate := startDate
|
|
|
for _, v := range exchanges {
|
|
|
exchange := v
|
|
|
err = nil
|
|
|
- fmt.Println("InitPositionTask: 启动:" + exchange)
|
|
|
- utils.FileLog.Info("InitPositionTask: 启动:" + exchange)
|
|
|
+ fmt.Println("InitGuangzhouPositionTask: 启动:" + exchange)
|
|
|
+ utils.FileLog.Info("InitGuangzhouPositionTask: 启动:" + exchange)
|
|
|
|
|
|
fmt.Println("开始" + startDate + "结束" + endDate)
|
|
|
utils.FileLog.Info(fmt.Sprintf("InitTradePosition:开始:%s; 结束:%s", startDate, endDate))
|
|
@@ -130,13 +129,13 @@ func InitGuangzhouPositionTask(cont context.Context) (err error) {
|
|
|
tErr, errMsg := InitTradePosition(exchange, startDate, endDate, tradePosition)
|
|
|
if tErr != nil {
|
|
|
err = tErr
|
|
|
- fmt.Println("InitTradePosition: 操作失败:" + errMsg + tErr.Error())
|
|
|
+ fmt.Println("InitGuangzhouPositionTask: 操作失败:" + errMsg + tErr.Error())
|
|
|
utils.FileLog.Info(fmt.Sprintf("InitTradePosition: 操作失败:%s:%s", errMsg, tErr.Error()))
|
|
|
continue
|
|
|
}
|
|
|
|
|
|
- fmt.Println("InitTradePosition:" + exchange + "已完成")
|
|
|
- utils.FileLog.Info("InitTradePosition:" + exchange + "已完成")
|
|
|
+ fmt.Println("InitGuangzhouPositionTask:" + exchange + "已完成")
|
|
|
+ utils.FileLog.Info("InitGuangzhouPositionTask:" + exchange + "已完成")
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -165,15 +164,17 @@ func InitGuangzhouPositionTask(cont context.Context) (err error) {
|
|
|
key := fmt.Sprintf("%s_%s_%s", v, classify.ClassifyName, classify.ClassifyType)
|
|
|
|
|
|
if tradeClassify, ok := tradeClassifyMap[key]; !ok {
|
|
|
- baseFromTradeClassifyList = append(baseFromTradeClassifyList, &data_manage.BaseFromTradeClassify{
|
|
|
- Id: 0,
|
|
|
- ClassifyName: classify.ClassifyName,
|
|
|
- ClassifyType: classify.ClassifyType,
|
|
|
- Exchange: v,
|
|
|
- LatestDate: classify.DataTime,
|
|
|
- CreateTime: time.Now(),
|
|
|
- ModifyTime: classify.ModifyTime,
|
|
|
- })
|
|
|
+ if classify.ClassifyName != "" && classify.ClassifyType != "" {
|
|
|
+ baseFromTradeClassifyList = append(baseFromTradeClassifyList, &data_manage.BaseFromTradeClassify{
|
|
|
+ Id: 0,
|
|
|
+ ClassifyName: classify.ClassifyName,
|
|
|
+ ClassifyType: classify.ClassifyType,
|
|
|
+ Exchange: v,
|
|
|
+ LatestDate: classify.DataTime,
|
|
|
+ CreateTime: time.Now(),
|
|
|
+ ModifyTime: classify.ModifyTime,
|
|
|
+ })
|
|
|
+ }
|
|
|
} else {
|
|
|
if tradeClassify.LatestDate.Before(classify.DataTime) {
|
|
|
tradeClassify.LatestDate = classify.DataTime
|