add log

services/knowoapi/controllers/device.go

@@ -6,7 +6,6 @@ import (
 	"io"
 	"sparrow/pkg/models"
 	"sparrow/pkg/rpcs"
-	"sparrow/pkg/scene"
 	"sparrow/pkg/server"
 	"sparrow/services/knowoapi/services"
 	"strconv"
@@ -533,20 +532,16 @@ func (a *DeviceController) PostSendcommand() {
 	done(a.Ctx, params.DeviceId)
 }
 
-// GetAllScenes 获取所有的场景
-// GET /device/allscenes
-func (a *DeviceController) GetAllScenes() {
-	// proid, err := a.Ctx.URLParamInt("proid")
-	// if err != nil {
-	// 	proid = 0
-	// }
-	params := new(scene.GetSceneParams)
-	datas, err := a.Service.GetScenes(*params)
+// GetScene 获取场景
+// GET /device/scene?code=
+func (a *DeviceController) GetScene() {
+	code := a.Ctx.URLParam("code")
+	data, err := a.Service.GetScenes(code)
 	if err != nil {
-		responseError(a.Ctx, ErrDatabase, err.Error())
+		responseError(a.Ctx, ErrNormal, err.Error())
 		return
 	}
 	done(a.Ctx, map[string]interface{}{
-		"chart": datas,
+		"data": data.MustToJsonString(),
 	})
 }

services/knowoapi/services/device.go

@@ -6,7 +6,6 @@ import (
 	"math/rand"
 	"sparrow/pkg/models"
 	"sparrow/pkg/rpcs"
-	"sparrow/pkg/scene"
 	"sparrow/pkg/server"
 	"sparrow/services/knowoapi/model"
 )
@@ -64,7 +63,7 @@ type DeviceService interface {
 	// SendCommand 下发指令
 	SendCommand(args rpcs.ArgsSendCommand) error
 	// GetScenes 获取场景
-	GetScenes(params scene.GetSceneParams) (*gjson.Json, error)
+	GetScenes(code string) (*gjson.Json, error)
 }
 
 type deviceservice struct {
@@ -409,7 +408,7 @@ func (a deviceservice) SendCommand(args rpcs.ArgsSendCommand) error {
 }
 
 // GetScenes 获取场景
-func (a deviceservice) GetScenes(params scene.GetSceneParams) (*gjson.Json, error) {
+func (a deviceservice) GetScenes(code string) (*gjson.Json, error) {
 	fmt.Println("1111111111111111")
 	var newArgs rpcs.ArgsScene
 	var reply rpcs.ReplyScenes