LingxinMeng преди 6 месеца
родител
ревизия
8d1076f71d
променени са 2 файла, в които са добавени 5 реда и са изтрити 4 реда
  1. 2 1
      amd64/web_server/src/infrastructure/http/router.go
  2. 3 3
      amd64/web_server/src/infrastructure/scheduler/exam_ticker.go

+ 2 - 1
amd64/web_server/src/infrastructure/http/router.go

@@ -2,6 +2,7 @@ package http
 
 import (
 	"cicv-data-closedloop/amd64/web_server/src/infrastructure/config"
+	"cicv-data-closedloop/amd64/web_server/src/infrastructure/scheduler"
 	"cicv-data-closedloop/amd64/web_server/src/interfaces/api"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/gin/middleware"
@@ -22,7 +23,7 @@ func CreateServer() {
 		examPrefix := webPrefix.Group("/exam")
 		{
 			examPrefix.POST("/tick", api.Tick)       // 考试开始
-			go api.ExamEndTicker()                   // 考试结束
+			go scheduler.ExamEndTicker()             // 考试结束
 			examPrefix.POST("/display", api.Display) // 云控展示线上评分
 			examPrefix.POST("/page", api.Page)       // 分页查询
 			examPrefix.POST("/report", api.Report)   // pdf下载

+ 3 - 3
amd64/web_server/src/infrastructure/scheduler/exam_ticker.go

@@ -49,15 +49,15 @@ func ExamEndTicker() {
 					c_log.GlobalLogger.Error("数据库查询报错:", err)
 					return
 				}
-				if !result[0].EndTime.Equal(defaultTime) {
+				if !result[0].EndTime.Equal(global.DefaultTime) {
 					c_log.GlobalLogger.Error("赛队", teamName, "考试已结束!")
 					return
 				}
 				// 更新到数据库(只更新最新一条)
 				stage := ""
-				if time.Now().Before(trialBegin) {
+				if time.Now().Before(global.TrialBegin) {
 					stage = "表演赛"
-				} else if time.Now().After(trialBegin) && time.Now().Before(trialEnd) {
+				} else if time.Now().After(global.TrialBegin) && time.Now().Before(global.TrialEnd) {
 					stage = "预赛"
 				} else {
 					stage = "决赛"