From 6bb34712c4d661916f91c807385e2756a964035c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 04 十一月 2023 14:28:09 +0800
Subject: [PATCH] 修改字段名

---
 api/v1/device.go |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/api/v1/device.go b/api/v1/device.go
index ab7f965..c107808 100644
--- a/api/v1/device.go
+++ b/api/v1/device.go
@@ -16,20 +16,20 @@
 
 type DeviceApi struct{}
 
-// Set
+// SetCurrentDeviceId
 // @Tags      璁惧
 // @Summary   璁剧疆褰撳墠璁惧id
 // @Produce   application/json
 // @Param     object  body    request.SetCurrentDevice true  "鏌ヨ鍙傛暟"
 // @Success   200   {object}  contextx.Response{}  "鎴愬姛"
-// @Router    /v1/device/set [post]
-func (slf *DeviceApi) Set(c *gin.Context) {
+// @Router    /v1/device/setCurrentDeviceId [post]
+func (slf *DeviceApi) SetCurrentDeviceId(c *gin.Context) {
 	var params request.SetCurrentDevice
 	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
-	if params.CurrentDeviceID != "" {
+	if params.CurrentDeviceID == "" {
 		ctx.Fail(ecode.ParamsErr)
 		return
 	}
@@ -45,7 +45,7 @@
 		return
 	}
 	service.SetDeviceIDToFile(params.CurrentDeviceID)
-	conf.Conf.SerfClusterStatus = params.CurrentDeviceID
+	conf.Conf.CurrentDeviceID = params.CurrentDeviceID
 	err = crontask.RestartTask(conf.Conf.SerfClusterStatus != constvar.SerfClusterStatusSlave)
 	if err != nil {
 		logx.Errorf("restart task failed:%v", err)
@@ -57,11 +57,11 @@
 }
 
 // DeviceList
-// @Tags      Device
+// @Tags      璁惧
 // @Summary   鑾峰彇褰撳墠闈㈡澘缁戝畾鐨勮澶囧垪琛�
 // @Produce   application/json
 // @Success   200   {object}  contextx.Response{data=response.DeviceListResponse}  "鎴愬姛"
-// @Router    /v1/device/list [post]
+// @Router    /v1/device/list [get]
 func (slf *DeviceApi) DeviceList(c *gin.Context) {
 	ctx, ok := contextx.NewContext(c, nil)
 	if !ok {
@@ -73,9 +73,13 @@
 		return
 	}
 	resp := response.DeviceListResponse{
-		SystemDeviceID:  conf.Conf.System.DeviceId,
-		CurrentDeviceID: conf.Conf.CurrentDeviceID,
-		DeviceIDList:    list,
+		SystemDeviceID:       conf.Conf.System.DeviceId,
+		CurrentDeviceID:      conf.Conf.CurrentDeviceID,
+		DeviceIDList:         list,
+		SystemDeviceStatus:   response.SystemDeviceStatusNormal,
+		ClusterStatus:        conf.Conf.SerfClusterStatus,
+		ClusterNodeQuantity:  conf.Conf.ClusterNodeQuantity,
+		SystemDeviceRunSince: conf.Conf.SystemDeviceRunSince,
 	}
 	ctx.OkWithDetailed(resp)
 }

--
Gitblit v1.8.0