From 54e44ae36cd578b8ecb6bbde430b0d67d366e91c Mon Sep 17 00:00:00 2001
From: wyhwyhwyh <573805736@qq.com>
Date: Thu, 19 Aug 2021 10:12:07 +0800
Subject: [PATCH] =?UTF-8?q?LoopActivity=20=E6=9C=8D=E5=8A=A1=E7=AB=AF?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handler/loop-handler.go   | 37 +++++++++++++++++++++++++++++++++++--
 model/activities-model.go | 19 +++++++++++++++++++
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 model/activities-model.go

diff --git a/handler/loop-handler.go b/handler/loop-handler.go
index 29fce29..783e0b1 100644
--- a/handler/loop-handler.go
+++ b/handler/loop-handler.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
+	"myschools.me/wyh/srv-ijustjump.git/model"
 )
 
 // LoopVerify 验证服务
@@ -39,9 +40,41 @@ func LoopActivity(c *gin.Context) {
 	log.WithFields(log.Fields{
 		"func": "LoopVerify",
 	}).Infof("%s", string(bodystring))
+
+	var k = 12
+	var activities []*model.Activities
+	for i := 0; i < 3; i++ {
+		var candidates [][]*model.Candidates
+		var d []*model.Candidates
+		for i := 0; i < 4; i++ {
+
+			var c = &model.Candidates{
+				ID:        k,
+				Name:      "zsk",
+				StudentID: "19103055",
+				Score:     0,
+			}
+			k++
+			d = append(d, c)
+		}
+		candidates = append(candidates, d)
+		var s = &model.Activities{
+			ID:            i,
+			ActivityName:  "定时30秒",
+			ActivityType:  i,
+			ActivityValue: 30,
+			RelayNumber:   0,
+			Candidates:    candidates,
+		}
+		activities = append(activities, s)
+
+	}
+	// log.Println(s)
+
 	c.JSON(200, gin.H{
-		"code": 200,
-		"msg":  "success",
+		"code":       200,
+		"msg":        "success",
+		"activities": activities,
 	})
 }
 
diff --git a/model/activities-model.go b/model/activities-model.go
new file mode 100644
index 0000000..420eeef
--- /dev/null
+++ b/model/activities-model.go
@@ -0,0 +1,19 @@
+package model
+
+// Activities 活动记录
+type Activities struct {
+	ID            int
+	ActivityName  string
+	ActivityType  int
+	ActivityValue int
+	RelayNumber   int
+	Candidates    [][]*Candidates
+}
+
+// Candidates 用户记录
+type Candidates struct {
+	ID        int
+	Name      string
+	StudentID string
+	Score     int
+}