update

pkg/rpcs/devicemanager.go

@@ -4,6 +4,7 @@ import (
 	"sparrow/pkg/deviceAlarm"
 	"sparrow/pkg/online"
 	"sparrow/pkg/scene"
+	"time"
 )
 
 type ArgsGenerateDeviceAccessToken ArgsDeviceId
@@ -77,6 +78,7 @@ type ArgsScene struct {
 	Name    string
 	Desc    string
 	Config  string
+	Time    time.Time
 }
 
 type ArgsGetAllScene struct {

pkg/rpcs/task.go

@@ -1,5 +1,7 @@
 package rpcs
 
+import "time"
+
 // ArgsSubmitTask 任务提交参数
 type ArgsSubmitTask struct {
 	Type string // 任务类型，（timer|以后扩展)
@@ -15,13 +17,14 @@ type ArgsSubmitTaskLifecycle struct {
 type ReplySubmitTask ReplyEmptyResult
 
 type ArgsSubmitSceneAction struct {
-	Id         string `json:"id"`
-	Name       string `json:"name"`
-	Desc       string `json:"desc"`
-	Status     int    `json:"status"`
-	Action     string `json:"action"`
-	SceneType  string `json:"scene_type"`
-	DeviceType string `json:"device_type"`
-	Config     string `json:"config"`
+	Id         string    `json:"id"`
+	Name       string    `json:"name"`
+	Desc       string    `json:"desc"`
+	Status     int       `json:"status"`
+	Action     string    `json:"action"`
+	SceneType  string    `json:"scene_type"`
+	DeviceType string    `json:"device_type"`
+	Config     string    `json:"config"`
+	Time       time.Time `json:"time"`
 }
 type ReplySubmitSceneAction ReplyEmptyResult

pkg/scene/scene.go

@@ -3,6 +3,7 @@ package scene
 import (
 	"context"
 	"github.com/gogf/gf/database/gredis"
+	"time"
 )
 
 const (
@@ -32,11 +33,12 @@ type AllSceneResult struct {
 	Data  []*InfoScene `json:"data"`
 }
 type Info struct {
-	Key     string `json:"key"`
-	Name    string `json:"name"`
-	Desc    string `json:"desc"`
-	SceneId string `json:"scene_id"`
-	Config  string `json:"config"`
+	Key     string    `json:"key"`
+	Name    string    `json:"name"`
+	Desc    string    `json:"desc"`
+	SceneId string    `json:"scene_id"`
+	Config  string    `json:"config"`
+	Time    time.Time `json:"time"`
 }
 
 type Manager struct {
@@ -93,7 +95,7 @@ func (a *Manager) DeleteScene(key string) error {
 func (a *Manager) GetAllScenesPage(code string, pi, ps int) (AllSceneResult, error) {
 	var key string
 	switch code {
-	case "time":
+	case "timer":
 		key = timerScenePrefix
 	case "device":
 		key = deviceScenePrefix

services/devicemanager/manager.go

@@ -239,6 +239,7 @@ func (dm *DeviceManager) SaveScene(args rpcs.ArgsScene, reply *rpcs.ReplyScene)
 		Desc:    args.Desc,
 		Name:    args.Name,
 		Config:  args.Config,
+		Time:    args.Time,
 	})
 }
 

services/scene-service/internal/service/scene.go

@@ -72,6 +72,7 @@ func (m *SceneService) SubmitAction(args rpcs.ArgsSubmitSceneAction, reply *rpcs
 		SceneType: args.SceneType,
 		Config:    args.Config,
 		Action:    args.Action,
+		Time:      args.Time,
 	}
 	srv, err := m.getServiceByType(scene.SceneType)
 	if err != nil {
@@ -143,6 +144,7 @@ func (m *SceneService) saveSceneRedis(scene SceneInfo) error {
 		Desc:    scene.Desc,
 		SceneId: scene.Id,
 		Config:  scene.Config,
+		Time:    scene.Time,
 	}
 	sceneReply := rpcs.ReplyEmptyResult{}
 	err := server.RPCCallByName(nil, rpcs.DeviceManagerName, "DeviceManager.SaveScene", sceneArgs, &sceneReply)