From ba6decbbd8349e41660de1e1d6ff955c59d6ca9a Mon Sep 17 00:00:00 2001
From: yangduo <yangduo@kingsome.cn>
Date: Wed, 14 Aug 2024 12:06:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/adminserver/api/v1/system/gameswitch.go | 17 +++++++----------
 server/adminserver/model/system/gameswitch.go  |  1 -
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/server/adminserver/api/v1/system/gameswitch.go b/server/adminserver/api/v1/system/gameswitch.go
index dfbc5780..87083fe2 100644
--- a/server/adminserver/api/v1/system/gameswitch.go
+++ b/server/adminserver/api/v1/system/gameswitch.go
@@ -51,7 +51,10 @@ func (gs *GameSwitchApi) Init() {
 func (this *GameSwitchApi) List(c *gin.Context) {
 	pagesize := c.DefaultQuery("pagesize", "10")
 	page := c.DefaultQuery("page", "")
-	result := []*system.GameSwitch{}
+	result := []struct {
+		system.GameSwitch
+		Remark string `json:"remark"`
+	}{}
 	f5.GetGoStyleDb().PageQuery(
 		constant.CONF_DB,
 		q5.ToInt32(pagesize),
@@ -70,7 +73,7 @@ func (this *GameSwitchApi) List(c *gin.Context) {
 			}
 
 			for pg.Rows.Next() {
-				p := new(system.GameSwitch)
+				p := q5.NewSliceElement(&result)
 				p.Idx = q5.SafeToInt64(pg.Rows.GetByName("idx"))
 				p.Name = pg.Rows.GetByName("switch_name")
 				p.Opened = q5.SafeToInt32(pg.Rows.GetByName("is_open"))
@@ -80,7 +83,6 @@ func (this *GameSwitchApi) List(c *gin.Context) {
 				}
 				p.CreateTime = q5.SafeToInt32(pg.Rows.GetByName("createtime"))
 				p.ModifyTime = q5.SafeToInt32(pg.Rows.GetByName("modifytime"))
-				q5.AppendSlice(&result, p)
 			}
 			c.JSON(http.StatusOK, gin.H{
 				"code":       0,
@@ -95,9 +97,8 @@ func (this *GameSwitchApi) List(c *gin.Context) {
 
 func (this *GameSwitchApi) Add(c *gin.Context) {
 	req := struct {
-		Name   string `binding:"required" json:"switch_name"`
-		Open   *int32 `binding:"required" json:"is_open"`
-		Remark string `binding:"required" json:"remark"`
+		Name string `binding:"required" json:"switch_name"`
+		Open *int32 `binding:"required" json:"is_open"`
 	}{}
 	if err := c.ShouldBindJSON(&req); err != nil {
 		c.JSON(http.StatusOK, gin.H{
@@ -118,7 +119,6 @@ func (this *GameSwitchApi) Add(c *gin.Context) {
 	gswitch := new(system.GameSwitch)
 	gswitch.Name = req.Name
 	gswitch.Opened = *req.Open
-	gswitch.Remark = req.Remark
 	gswitch.CreateTime = nowDaySeconds
 	gswitch.ModifyTime = nowDaySeconds
 	if err := f5.GetApp().GetOrmDb(constant.CONF_DB).Create(gswitch).Error; err != nil {
@@ -168,9 +168,6 @@ func (this *GameSwitchApi) Edit(c *gin.Context) {
 
 	nowDaySeconds := int32(f5.GetApp().GetRealSeconds())
 	gswitch.Opened = *req.Open
-	if req.Remark != "" {
-		gswitch.Remark = req.Remark
-	}
 	gswitch.ModifyTime = nowDaySeconds
 	if err := db.Where("switch_name = ?", req.Name).Save(gswitch).Error; err != nil {
 		c.JSON(http.StatusOK, gin.H{
diff --git a/server/adminserver/model/system/gameswitch.go b/server/adminserver/model/system/gameswitch.go
index 7b26f2ab..eb84f178 100644
--- a/server/adminserver/model/system/gameswitch.go
+++ b/server/adminserver/model/system/gameswitch.go
@@ -4,7 +4,6 @@ type GameSwitch struct {
 	Idx        int64  `gorm:"uniqueIndex;comment:idx" json:"idx"`
 	Name       string `gorm:"column:switch_name" json:"switch_name"`
 	Opened     int32  `gorm:"column:is_open" json:"is_open"`
-	Remark     string `gorm:"column:remark" json:"remark"`
 	CreateTime int32  `gorm:"column:createtime" json:"createtime"`
 	ModifyTime int32  `gorm:"column:modifytime" json:"modifytime"`
 }