diff --git a/internal/controller/device/device.go b/internal/controller/device/device.go index 46c1dee..e1d6eb6 100644 --- a/internal/controller/device/device.go +++ b/internal/controller/device/device.go @@ -96,18 +96,13 @@ func (c *Controller) Switch(ctx *gin.Context) { return } - // 使用响应中的状态和消息 + // 解析响应数据 status := "解析失败" message := "消息解析失败" - - // 如果响应中没有明确的状态和消息,则从数据中提取 - if status == "" && message == "" { - // 解析响应数据 - var responseData RelayControlResponseData - if err := response.ParseData(&responseData); err == nil { - status = responseData.Status - message = responseData.Message - } + var responseData RelayControlResponseData + if err := response.ParseData(&responseData); err == nil { + status = responseData.Status + message = responseData.Message } // 创建设备控制记录 diff --git a/internal/controller/remote/remote.go b/internal/controller/remote/remote.go index bab9cf9..2c305b4 100644 --- a/internal/controller/remote/remote.go +++ b/internal/controller/remote/remote.go @@ -13,15 +13,13 @@ import ( type Controller struct { websocketService *service.WebSocketService logger *logs.Logger - service *service.WebSocketService } // NewController 创建远程控制控制器实例 -func NewController(websocketService *service.WebSocketService, service *service.WebSocketService) *Controller { +func NewController(websocketService *service.WebSocketService) *Controller { return &Controller{ websocketService: websocketService, logger: logs.NewLogger(), - service: service, } }