LingxinMeng 1 年之前
父节点
当前提交
e9c3466a3d

+ 4 - 4
amd64/web_server/application.yaml

@@ -9,10 +9,10 @@ log:
   dir: ./log/
   prefix: web_server
 mysql:
-#  ip: 36.110.106.156 # 公网IP
-#  sqlfile-dir: D:\code\cicv-data-closedloop\amd64\web_server\sql
-  ip: 10.14.85.241 # 内网IP
-  sqlfile-dir: /root/cicv-data-closedloop/amd64/web_server/sql
+  ip: 36.110.106.156 # 公网IP
+  sqlfile-dir: D:\code\cicv-data-closedloop\amd64\web_server\sql
+#  ip: 10.14.85.241 # 内网IP
+#  sqlfile-dir: /root/cicv-data-closedloop/amd64/web_server/sql
   port: 3306
   username: root
   password: 1qaz2wsx!

+ 3 - 2
amd64/web_server/handler/h_exam.go

@@ -31,6 +31,7 @@ func Begin(c *gin.Context) {
 	}
 	// 插入到数据库
 	sqlTemplate, _ := util.ReadFile(c_db.SqlFilesMap["exam-insert-begin_time-by-team_name.sql"])
+	c_log.GlobalLogger.Info("插入比赛开始时间", sqlTemplate)
 	if err := c_db.DoTx(sqlTemplate, []any{
 		param.TeamName,
 		time.Now(),
@@ -61,7 +62,7 @@ func End(c *gin.Context) {
 		return
 	}
 	// 1 查询指定队伍的开始时间最新的考试是否有结束时间,如果有则不在处理,如果没有则更新
-	var result webServerEntity.ExamPo
+	var result []webServerEntity.ExamPo
 	selectSql, err := util.ReadFile(c_db.SqlFilesMap["exam-select-latest-by-team_name.sql"])
 	if err != nil {
 		c_log.GlobalLogger.Error("读取sql文件报错:", err)
@@ -81,7 +82,7 @@ func End(c *gin.Context) {
 		return
 	}
 	c_log.GlobalLogger.Info("数据库查询成功:", result)
-	if !result.EndTime.IsZero() {
+	if !result[0].EndTime.IsZero() {
 		c_log.GlobalLogger.Error("赛队", param.TeamName, "重复请求考试结束接口!")
 		c.JSON(http.StatusBadRequest, commonEntity.Response{
 			Code: 500,

+ 0 - 0
amd64/web_server/sql/exam-insert-begin_time-by-team_name.sql.sql → amd64/web_server/sql/exam-insert-begin_time-by-team_name.sql


+ 1 - 1
amd64/web_server/sql/exam-select-latest-by-team_name.sql

@@ -1,4 +1,4 @@
-select id, begin_time, end_time, score_report_path_team, team_name
+select id, begin_time, end_time, score_report_path, team_name
 from exam
 where team_name = ?
 order by begin_time desc limit 1