LingxinMeng 1 jaar geleden
bovenliggende
commit
e824aa8b72
1 gewijzigde bestanden met toevoegingen van 6 en 12 verwijderingen
  1. 6 12
      amd64/web_server/handler/h_exam.go

+ 6 - 12
amd64/web_server/handler/h_exam.go

@@ -22,8 +22,8 @@ var (
 	cacheMutex             sync.Mutex
 	cacheTeamName          = make(map[string]time.Time)
 	heartBeatTimeThreshold = 5 * time.Second // 心跳时间
-	InitialPositionX       = 0.00            // todo 需要比赛确认起点
-	InitialPositionY       = 0.00            // todo 需要比赛确认起点
+	InitialPositionX       = 456193.00       // todo 需要比赛确认起点
+	InitialPositionY       = 4397731.00      // todo 需要比赛确认起点
 	// todo 比赛阶段
 	trialBegin = time.Date(2024, time.June, 16, 13, 00, 00, 0, time.Local)
 	trialEnd   = time.Date(2024, time.June, 19, 23, 59, 59, 0, time.Local)
@@ -46,23 +46,17 @@ func Tick(c *gin.Context) {
 	positionY := param.PositionY
 	if !util.ContainsKey(cacheTeamName, teamName) && math.Abs(positionX-InitialPositionX) < 5.00 && math.Abs(positionY-InitialPositionY) < 5.00 { // (在起点开始)
 		sqlTemplate, _ := util.ReadFile(c_db.SqlFilesMap["exam-insert-begin_time-and-topic-by-team_name.sql"])
-		c_log.GlobalLogger.Info("保存比赛开始时间和比赛阶段", sqlTemplate)
 		stage := "表演赛"
 		if time.Now().After(trialBegin) && time.Now().Before(trialEnd) {
 			stage = "预赛"
 		} else {
 			stage = "决赛"
 		}
-		if err := c_db.DoTx(sqlTemplate, []any{
-			param.TeamName,
-			stage,
-			time.Now(),
-		}); err != nil {
+		competitionBegin := time.Now()
+		c_log.GlobalLogger.Infof("当前比赛阶段为 %v ,队伍 %v 在起始点范围内第一次启动,保存新一条比赛记录的开始时间 %v", stage, teamName, competitionBegin)
+		if err := c_db.DoTx(sqlTemplate, []any{param.TeamName, stage, competitionBegin}); err != nil {
 			c_log.GlobalLogger.Error("保存比赛开始时间报错:", err)
-			c.JSON(http.StatusBadRequest, commonEntity.Response{
-				Code: 500,
-				Msg:  "保存比赛开始时间报错。",
-			})
+			c.JSON(http.StatusBadRequest, commonEntity.Response{Code: 500, Msg: "保存比赛开始时间报错。"})
 			return
 		}
 	} else if !util.ContainsKey(cacheTeamName, teamName) && math.Abs(positionX-InitialPositionX) < 5.00 && math.Abs(positionY-InitialPositionY) < 5.00 { // 不在起点(开始)