Browse Source

初始化持仓分析

xyxie 10 months ago
parent
commit
ca2e35e57d
3 changed files with 26 additions and 24 deletions
  1. 1 1
      main.go
  2. 18 17
      services/data/trade_position_analysis.go
  3. 7 6
      services/task.go

+ 1 - 1
main.go

@@ -20,7 +20,7 @@ func main() {
 		web.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
 	}
 	go services.Task()
-	//services.TaskTest()
+	//services.TaskInit()
 	web.BConfig.RecoverFunc = Recover
 	web.Run()
 }

+ 18 - 17
services/data/trade_position_analysis.go

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

+ 7 - 6
services/task.go

@@ -17,9 +17,7 @@ func Task() {
 	//如果是生产环境,才需要走这些任务
 	if utils.RunMode == "release" {
 		releaseTask()
-
 	}
-
 	// 定时发布智能研报
 	publishSmartReport := task.NewTask("publishSmartReport", "0 */1 * * * *", PublishSmartReport)
 	task.AddTask("定时发布智能研报", publishSmartReport)
@@ -42,10 +40,6 @@ func releaseTask() {
 	initPositionTask := task.NewTask("initPositionTask", "0 20,40 16-18 * * *", data.InitPositionTask)
 	task.AddTask("initPositionTask", initPositionTask)
 
-	// 定时统计交易所的持仓分析数据
-	initGuangzhouPositionTask := task.NewTask("initPositionTask", "0 30 19 29 4 *", data.InitGuangzhouPositionTask)
-	task.AddTask("initGuangzhouPositionTask", initGuangzhouPositionTask)
-
 	//刷新指标数据
 	refreshData := task.NewTask("refreshData", "0 30 0,19 * * *", RefreshData)
 	task.AddTask("refreshData", refreshData)
@@ -256,3 +250,10 @@ func checkDataServer(cont context.Context) (err error) {
 	go data.CheckPbDataInterface(cont)
 	return
 }
+
+func TaskInit() {
+	fmt.Println("TaskInit start")
+	//data.InitGuangzhouPositionTask()
+	fmt.Println("TaskInit end")
+	return
+}