fix bug

services/knowoapi/controllers/device.go

@@ -267,11 +267,7 @@ func (a *DeviceController) GetOtaProgress() {
 // GET /device/status?device_id=
 func (a *DeviceController) GetStatus() {
 	deviceId := a.Ctx.URLParam("device_id")
-	deviceType, _ := a.Ctx.URLParamInt("device_type")
-	if deviceType == 0 {
-		deviceType = 1
-	}
-	data, err := a.Service.GetDeviceStatus(deviceId, deviceType)
+	data, err := a.Service.GetDeviceStatus(deviceId)
 	if err != nil {
 		responseError(a.Ctx, ErrNormal, err.Error())
 		return

services/knowoapi/services/device.go

@@ -1,7 +1,6 @@
 package services
 
 import (
-	"encoding/json"
 	"github.com/gogf/gf/encoding/gjson"
 	"sparrow/pkg/models"
 	"sparrow/pkg/rpcs"
@@ -30,7 +29,7 @@ type DeviceService interface {
 	// GetUpgradeProgress 获取ota升级进度
 	GetUpgradeProgress(deviceId string) (rpcs.ReplyOtaProgress, error)
 	// GetDeviceStatus 获取设备状态数据
-	GetDeviceStatus(deviceId string, deviceType int) (*gjson.Json, error)
+	GetDeviceStatus(deviceId string) (*gjson.Json, error)
 	// SetReport 获取设备状态
 	SetReport(params models.SendCommandParams) error
 	// Restart 重启设备
@@ -194,7 +193,7 @@ func (a deviceservice) GetUpgradeProgress(deviceId string) (rpcs.ReplyOtaProgres
 	return reply, nil
 }
 
-func (a deviceservice) GetDeviceStatus(deviceId string, deviceType int) (*gjson.Json, error) {
+func (a deviceservice) GetDeviceStatus(deviceId string) (*gjson.Json, error) {
 	var args rpcs.ArgsGetStatus
 	args.Id = deviceId
 
@@ -204,38 +203,7 @@ func (a deviceservice) GetDeviceStatus(deviceId string, deviceType int) (*gjson.
 		server.Log.Errorf("设备状态数据获取失败：%v", err)
 		return nil, err
 	}
-	result := new(gjson.Json)
-	switch deviceType {
-	case 1:
-		status := new(models.SplitDeviceStatus)
-		err = json.Unmarshal([]byte(reply.Status), &status)
-		status.StatusCodeMap["nj1"] = 1
-		status.StatusCodeMap["nj2"] = 1
-		status.StatusCodeMap["nj3"] = 1
-		status.StatusCodeMap["nj4"] = 1
-		status.StatusCodeMap["nj5"] = 1
-		status.StatusCodeMap["air_quality_sensor"] = 1
-
-		if status.StatusCode&0x01 == 0 {
-			status.StatusCodeMap["nj1"] = 0
-		}
-		if status.StatusCode&0x02 == 0 {
-			status.StatusCodeMap["nj2"] = 0
-		}
-		if status.StatusCode&0x04 == 0 {
-			status.StatusCodeMap["nj1"] = 0
-		}
-		if status.StatusCode&0x08 == 0 {
-			status.StatusCodeMap["nj1"] = 0
-		}
-		if status.StatusCode&0x10 == 0 {
-			status.StatusCodeMap["nj1"] = 0
-		}
-
-		result = gjson.New(status)
-	}
-
-	return result, nil
+	return gjson.New(reply.Status), nil
 }
 
 // SetReport 获取设备状态