add field

pkg/rpcs/devicemanager.go

@@ -73,12 +73,13 @@ type ReplayAlarm struct {
 }
 
 type ArgsScene struct {
-	Key     string
-	SceneId string
-	Name    string
-	Desc    string
-	Config  string
-	Time    time.Time
+	Key           string
+	SceneId       string
+	Name          string
+	ConditionDesc string
+	ActionDesc    string
+	Config        string
+	Time          time.Time
 }
 
 type ArgsGetAllScene struct {

pkg/rpcs/task.go

@@ -17,14 +17,15 @@ 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"`
-	Time       time.Time `json:"time"`
+	Id            string    `json:"id"`
+	Name          string    `json:"name"`
+	ConditionDesc string    `json:"condition_desc"`
+	ActionDesc    string    `json:"action_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

@@ -33,12 +33,13 @@ 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"`
-	Time    time.Time `json:"time"`
+	Key           string    `json:"key"`
+	Name          string    `json:"name"`
+	ActionDesc    string    `json:"action_desc"`
+	ConditionDesc string    `json:"condition_desc"`
+	SceneId       string    `json:"scene_id"`
+	Config        string    `json:"config"`
+	Time          time.Time `json:"time"`
 }
 
 type Manager struct {

services/devicemanager/manager.go

@@ -234,12 +234,13 @@ func (dm *DeviceManager) GetAllScenes(args rpcs.ArgsGetAllScene, reply *rpcs.Rep
 
 func (dm *DeviceManager) SaveScene(args rpcs.ArgsScene, reply *rpcs.ReplyScene) error {
 	return dm.sceneManager.SaveScene(&scene.Info{
-		Key:     args.Key,
-		SceneId: args.SceneId,
-		Desc:    args.Desc,
-		Name:    args.Name,
-		Config:  args.Config,
-		Time:    args.Time,
+		Key:           args.Key,
+		SceneId:       args.SceneId,
+		ConditionDesc: args.ConditionDesc,
+		ActionDesc:    args.ActionDesc,
+		Name:          args.Name,
+		Config:        args.Config,
+		Time:          args.Time,
 	})
 }
 

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

@@ -13,14 +13,15 @@ import (
 )
 
 type SceneInfo struct {
-	Id        string    `json:"id"`
-	Name      string    `json:"name"`
-	Desc      string    `json:"desc"`
-	Status    int       `json:"status"`
-	SceneType string    `json:"scene_type"`
-	Config    string    `json:"config"`
-	Action    string    `json:"action"`
-	Time      time.Time `json:"time"`
+	Id            string    `json:"id"`
+	Name          string    `json:"name"`
+	ConditionDesc string    `json:"condition_desc"`
+	ActionDesc    string    `json:"action_desc"`
+	Status        int       `json:"status"`
+	SceneType     string    `json:"scene_type"`
+	Config        string    `json:"config"`
+	Action        string    `json:"action"`
+	Time          time.Time `json:"time"`
 }
 
 type SceneService struct {
@@ -65,14 +66,15 @@ func (m *SceneService) getServiceByType(sceneType string) (TaskManager, error) {
 
 func (m *SceneService) SubmitAction(args rpcs.ArgsSubmitSceneAction, reply *rpcs.ReplySubmitSceneAction) error {
 	scene := SceneInfo{
-		Id:        args.Id,
-		Name:      args.Name,
-		Status:    args.Status,
-		Desc:      args.Desc,
-		SceneType: args.SceneType,
-		Config:    args.Config,
-		Action:    args.Action,
-		Time:      args.Time,
+		Id:            args.Id,
+		Name:          args.Name,
+		Status:        args.Status,
+		ConditionDesc: args.ConditionDesc,
+		ActionDesc:    args.ActionDesc,
+		SceneType:     args.SceneType,
+		Config:        args.Config,
+		Action:        args.Action,
+		Time:          args.Time,
 	}
 	srv, err := m.getServiceByType(scene.SceneType)
 	if err != nil {
@@ -139,12 +141,13 @@ func (m *SceneService) doAction(action string) error {
 
 func (m *SceneService) saveSceneRedis(scene SceneInfo) error {
 	sceneArgs := rpcs.ArgsScene{
-		Key:     fmt.Sprintf("scene:%s:%s", scene.SceneType, scene.Id),
-		Name:    scene.Name,
-		Desc:    scene.Desc,
-		SceneId: scene.Id,
-		Config:  scene.Config,
-		Time:    scene.Time,
+		Key:           fmt.Sprintf("scene:%s:%s", scene.SceneType, scene.Id),
+		Name:          scene.Name,
+		ConditionDesc: scene.ConditionDesc,
+		ActionDesc:    scene.ActionDesc,
+		SceneId:       scene.Id,
+		Config:        scene.Config,
+		Time:          scene.Time,
 	}
 	sceneReply := rpcs.ReplyEmptyResult{}
 	err := server.RPCCallByName(nil, rpcs.DeviceManagerName, "DeviceManager.SaveScene", sceneArgs, &sceneReply)