From 24991928e6b6123751c05f166678883a89e4bf0a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 03 十一月 2023 16:19:41 +0800
Subject: [PATCH] fix
---
api/v1/device.go | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/api/v1/device.go b/api/v1/device.go
index ab7f965..5c08540 100644
--- a/api/v1/device.go
+++ b/api/v1/device.go
@@ -16,14 +16,14 @@
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, ¶ms)
if !ok {
@@ -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