public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-05-06 12:01:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

[优化]优化目录

Browse Source
This commit is contained in:
PandaX
2023-11-07 16:45:23 +08:00
parent 3a4cea5b26
commit 6bdc4b1dd6
37 changed files with 97 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/global_model/device_auth_model.go → pkg/global/model/device_auth_model.go
View File

@@ -1,4 +1,4 @@
package global_model
package model
import (
"bytes"

2
pkg/global_model/global_model.go → pkg/global/model/global_model.go
View File

@@ -1,4 +1,4 @@
package global_model
package model
import (
"time"

2
pkg/global_model/rpc_model.go → pkg/global/model/rpc_model.go
View File

@@ -1,4 +1,4 @@
package global_model
package model
import (
"errors"

4
pkg/rule_engine/nodes/action_create_alarm_node.go
View File

@@ -5,7 +5,7 @@ import (
"pandax/apps/device/entity"
"pandax/apps/device/services"
"pandax/pkg/global"
"pandax/pkg/global_model"
"pandax/pkg/global/model"
"pandax/pkg/rule_engine/message"
"time"
)
@@ -48,7 +48,7 @@ func (n *createAlarmNode) Handle(msg *message.Message) error {
}
} else {
alarm = &entity.DeviceAlarm{}
alarm.Id = global_model.GenerateID()
alarm.Id = model.GenerateID()
alarm.DeviceId = msg.Metadata.GetValue("deviceId").(string)
alarm.ProductId = msg.Metadata.GetValue("productId").(string)
alarm.Name = msg.Metadata.GetValue("deviceName").(string)

4
pkg/rule_engine/nodes/action_rpc_request_from_device_node.go
View File

@@ -5,7 +5,7 @@ import (
"pandax/iothub/client/mqttclient"
"pandax/iothub/client/tcpclient"
"pandax/pkg/global"
"pandax/pkg/global_model"
"pandax/pkg/global/model"
"pandax/pkg/rule_engine/message"
)
@@ -34,7 +34,7 @@ func (n *rpcRequestFromDeviceNode) Handle(msg *message.Message) error {
if msg.Msg.GetValue("method") == nil || msg.Msg.GetValue("params") == nil {
return errors.New("指令请求格式错误")
}
var rpcp = global_model.RpcPayload{
var rpcp = model.RpcPayload{
Method: msg.Msg.GetValue("method").(string),
Params: msg.Msg.GetValue("params"),
}

4
pkg/rule_engine/nodes/action_rpc_request_to_device_node.go
View File

@@ -6,7 +6,7 @@ import (
"pandax/iothub/client/mqttclient"
"pandax/iothub/client/tcpclient"
"pandax/pkg/global"
"pandax/pkg/global_model"
"pandax/pkg/global/model"
"pandax/pkg/rule_engine/message"
)
@@ -34,7 +34,7 @@ func (n *rpcRequestToDeviceNode) Handle(msg *message.Message) error {
if msg.Msg.GetValue("method") == nil || msg.Msg.GetValue("params") == nil {
return errors.New("指令下发格式错误")
}
var datas = global_model.RpcPayload{
var datas = model.RpcPayload{
Method: msg.Msg.GetValue("method").(string),
Params: msg.Msg.GetValue("params"),
}

4
pkg/tool/base_test.go
View File

@@ -1,7 +1,7 @@
package tool
import (
"pandax/pkg/global_model"
"pandax/pkg/global/model"
"testing"
)
@@ -11,7 +11,7 @@ func TestToCamelCase(t *testing.T) {
}
func TestGenerateID(t *testing.T) {
id := global_model.GenerateID()
id := model.GenerateID()
t.Log(id)
}