commit

.idea/sqldialects.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="SqlDialectMappings">
-    <file url="file://$PROJECT_DIR$/amd64/web_server/sql/exam-select-latest-by-team_name.sql" dialect="GenericSQL" />
+    <file url="file://$PROJECT_DIR$/amd64/score_server/sql/exam-select-details-by-id.sql" dialect="MySQL" />
+    <file url="file://$PROJECT_DIR$/amd64/score_server/sql/exam-select-latest-by-team_name.sql" dialect="GenericSQL" />
     <file url="PROJECT" dialect="MySQL" />
   </component>
 </project>

amd64/web_server/handler/h_exam.go → amd64/score_server/handler/h_exam.go

@@ -1,8 +1,8 @@
 package handler
 
 import (
-	webServerEntity "cicv-data-closedloop/amd64/web_server/entity"
-	"cicv-data-closedloop/amd64/web_server/infra"
+	webServerEntity "cicv-data-closedloop/amd64/score_server/entity"
+	"cicv-data-closedloop/amd64/score_server/infra"
 	"cicv-data-closedloop/common/config/c_db"
 	"cicv-data-closedloop/common/config/c_log"
 	commonEntity "cicv-data-closedloop/common/entity"
@@ -207,100 +207,7 @@ func ExamEndTicker() {
 	}
 }
 
-//// 考试开始时间
-//func Begin(c *gin.Context) {
-//	param := new(webServerEntity.ExamPao)
-//	// 映射到结构体
-//	if err := c.ShouldBindJSON(&param); err != nil {
-//		c_log.GlobalLogger.Error("项目启动接收请求参数报错：", err)
-//		c.JSON(http.StatusBadRequest, commonEntity.Response{
-//			Code: 500,
-//			Msg:  "请求体解析失败。",
-//		})
-//		return
-//	}
-//	// 插入到数据库
-//	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(),
-//	}); err != nil {
-//		c_log.GlobalLogger.Error("插入数据报错：", err)
-//		c.JSON(http.StatusBadRequest, commonEntity.Response{
-//			Code: 500,
-//			Msg:  "插入数据报错。",
-//		})
-//		return
-//	}
-//	c.JSON(http.StatusOK, commonEntity.Response{
-//		Code: 200,
-//		Msg:  "插入数据成功。",
-//	})
-//}
-//
-//// 考试结束时间
-//func End(c *gin.Context) {
-//	param := new(webServerEntity.ExamPao)
-//	// 映射到结构体
-//	if err := c.ShouldBindJSON(&param); err != nil {
-//		c_log.GlobalLogger.Error("接收请求参数报错：", err)
-//		c.JSON(http.StatusBadRequest, commonEntity.Response{
-//			Code: 500,
-//			Msg:  "请求体解析失败。",
-//		})
-//		return
-//	}
-//	// 1 查询指定队伍的开始时间最新的考试是否有结束时间，如果有则不在处理，如果没有则更新
-//	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)
-//		c.JSON(http.StatusBadRequest, commonEntity.Response{
-//			Code: 500,
-//			Msg:  "读取sql文件报错。",
-//		})
-//		return
-//	}
-//	// 可以传参数
-//	if err = c_db.MysqlDb.Select(&result, selectSql, param.TeamName); err != nil {
-//		c_log.GlobalLogger.Error("数据库查询报错：", err)
-//		c.JSON(http.StatusBadRequest, commonEntity.Response{
-//			Code: 500,
-//			Msg:  "数据库查询报错。",
-//		})
-//		return
-//	}
-//	c_log.GlobalLogger.Info("数据库查询成功：", result)
-//	if !result[0].EndTime.Equal(defaultTime) {
-//		c_log.GlobalLogger.Error("赛队", param.TeamName, "重复请求考试结束接口！")
-//		c.JSON(http.StatusBadRequest, commonEntity.Response{
-//			Code: 500,
-//			Msg:  "重复请求。",
-//		})
-//		return
-//	}
-//	// 更新到数据库
-//	sqlTemplate, _ := util.ReadFile(c_db.SqlFilesMap["exam-update-end_time-by-team_name.sql"])
-//	if err := c_db.DoTx(sqlTemplate, []any{
-//		time.Now(),
-//		param.TeamName,
-//	}); err != nil {
-//		c_log.GlobalLogger.Error("插入数据报错：", err)
-//		c.JSON(http.StatusBadRequest, commonEntity.Response{
-//			Code: 500,
-//			Msg:  "插入数据报错。",
-//		})
-//		return
-//	}
-//	c.JSON(http.StatusOK, commonEntity.Response{
-//		Code: 200,
-//		Msg:  "插入数据成功。",
-//	})
-//}
-
-// 分页查询
-// 如果日期为默认值，则返回空""
+// 分页查询，如果日期为默认值，则返回空""
 func Page(c *gin.Context) {
 	param := new(webServerEntity.ExamPagePao)
 	_ = c.ShouldBindJSON(&param)
@@ -756,3 +663,8 @@ func Report(c *gin.Context) {
 		return
 	}
 }
+
+// 云控展示线上评分
+func Display(c *gin.Context) {
+
+}

amd64/web_server/infra/application.yaml → amd64/score_server/infra/application.yaml

@@ -22,4 +22,6 @@ mysql:
 pdf:
   ttf: D:\code\cicv-data-closedloop\amd64\web_server\simfang.ttf
   background-png: D:\code\cicv-data-closedloop\amd64\web_server\background.png
-  logo-png: D:\code\cicv-data-closedloop\amd64\web_server\logo.png
+  logo-png: D:\code\cicv-data-closedloop\amd64\web_server\logo.png
+
+custom

amd64/web_server/main.go → amd64/score_server/main.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"cicv-data-closedloop/amd64/web_server/handler"
-	"cicv-data-closedloop/amd64/web_server/infra"
+	"cicv-data-closedloop/amd64/score_server/handler"
+	"cicv-data-closedloop/amd64/score_server/infra"
 	"cicv-data-closedloop/common/config/c_db"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/gin/middleware"
@@ -39,15 +39,23 @@ func main() {
 	router.Use(middleware.ValidateHeaders(infra.ApplicationYaml.Web.WhiteList, infra.ApplicationYaml.Web.Token)) // 全局请求头校验
 	// 通过路由组设置全局前缀
 	projectPrefix := router.Group(infra.ApplicationYaml.Web.RoutePrefix)
-	examPrefix := projectPrefix.Group("/exam")
-	examPrefix.POST("/tick", handler.Tick) // 考试开始
-	go handler.ExamEndTicker()             // 考试结束
-	//examPrefix.POST("/begin", handler.Begin)   // 考试开始2
-	//examPrefix.POST("/end", handler.End)       // 考试结束2
-	examPrefix.POST("/page", handler.Page)     // 分页查询
-	examPrefix.POST("/report", handler.Report) // pdf下载
-	monitorPrefix := projectPrefix.Group("/monitor")
-	monitorPrefix.POST("/insert", handler.SaveDeviceMonitor)
+	{
+		examPrefix := projectPrefix.Group("/exam")
+		{
+			examPrefix.POST("/tick", handler.Tick)       // 考试开始
+			go handler.ExamEndTicker()                   // 考试结束
+			examPrefix.POST("/display", handler.Display) // 考试开始2
+			//examPrefix.POST("/end", handler.End)       // 考试结束2
+			examPrefix.POST("/page", handler.Page)     // 分页查询
+			examPrefix.POST("/report", handler.Report) // pdf下载
+		}
+	}
+	{
+		monitorPrefix := projectPrefix.Group("/monitor")
+		{
+			monitorPrefix.POST("/insert", handler.SaveDeviceMonitor)
+		}
+	}
 	// 端口
 	err := router.Run(":" + infra.ApplicationYaml.Web.Port)
 	if err != nil {

build-score_server.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# 监控接口
+go build -o ./exe/score_server.exe ./amd64/score_server/main.go

build-web_server.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# 监控接口
-go build -o ./exe/web_server.exe ./amd64/web_server/main.go

kill-score_server.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+pkill -9 -f score_server.exe

kill-web_server.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-pkill -9 -f web_server.exe

run-score_server.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# 监控接口
+mkdir -p ./log
+rm -rf ./log/score_server*
+nohup ./exe/score_server.exe > ./log/score_server.out 2>&1 &

run-web_server.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# 监控接口
-mkdir -p ./log
-rm -rf ./log/web_server*
-nohup ./exe/web_server.exe > ./log/web_server.out 2>&1 &