commit

amd64/score_server/dao/mapper/mapper_exam.go

@@ -0,0 +1,23 @@
+package mapper
+
+import (
+	webServerEntity "cicv-data-closedloop/amd64/score_server/entity"
+	"cicv-data-closedloop/common/config/c_db"
+	"cicv-data-closedloop/common/config/c_log"
+	"cicv-data-closedloop/common/util"
+)
+
+func SelectAllFromExam() []webServerEntity.ExamPo {
+	var result []webServerEntity.ExamPo
+	selectSql, err := util.ReadFile(c_db.SqlFilesMap["exam-select-all.sql"])
+	if err != nil {
+		c_log.GlobalLogger.Error("读取sql文件报错：", err)
+		return nil
+	}
+	// 可以传参数
+	if err = c_db.MysqlDb.Select(&result, selectSql); err != nil {
+		c_log.GlobalLogger.Error("数据库查询报错：", err)
+		return nil
+	}
+	return nil
+}

amd64/score_server/handler/h_exam.go

@@ -1,6 +1,7 @@
 package handler
 
 import (
+	"cicv-data-closedloop/amd64/score_server/dao/mapper"
 	webServerEntity "cicv-data-closedloop/amd64/score_server/entity"
 	"cicv-data-closedloop/amd64/score_server/infra"
 	"cicv-data-closedloop/common/config/c_db"
@@ -666,5 +667,16 @@ func Report(c *gin.Context) {
 
 // 云控展示线上评分
 func Display(c *gin.Context) {
-
+	exam := mapper.SelectAllFromExam()
+	if exam == nil || len(exam) == 0 {
+		c.JSON(http.StatusOK, commonEntity.Response{
+			Code: 500,
+			Msg:  "未查询到成绩，比赛尚未开始。",
+		})
+	}
+	c.JSON(http.StatusOK, commonEntity.Response{
+		Code: 200,
+		Msg:  "查询成功。",
+		Data: exam,
+	})
 }

amd64/score_server/main.go

@@ -44,14 +44,13 @@ func main() {
 		{
 			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下载
+			examPrefix.POST("/display", handler.Display) // 云控展示线上评分
+			examPrefix.POST("/page", handler.Page)       // 分页查询
+			examPrefix.POST("/report", handler.Report)   // pdf下载
 		}
 	}
 	{
-		monitorPrefix := router.Group("/web_server/monitor") // todo web_server已经改成score_server，后续修改
+		monitorPrefix := router.Group("/web_server/monitor") // todo web_server会改成score_server，后续修改
 		{
 			monitorPrefix.POST("/insert", handler.SaveDeviceMonitor)
 		}

amd64/score_server/sql/exam-select-all.sql

@@ -0,0 +1,12 @@
+SELECT id,
+       team_name,
+       topic,
+       begin_time,
+       end_time,
+       score_online,
+       score_offline,
+       score_final,
+       details,
+       score_report_path,
+       equipment_no
+FROM exam