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

修复一些小问题

Browse Source 
Signed-off-by: lixxxww <941403820@qq.com>
This commit is contained in:
lixxxww
2024-01-22 09:59:15 +00:00
committed by Gitee
parent ae7cf745e4
commit 032b14d8ba
3 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/device/api/device.go
View File

@@ -1,11 +1,16 @@
package api
// ==========================================================================
// 生成日期：2023-06-30 09:19:43 +0800 CST
// 生成路径: apps/device/api/devices.go
// 生成人：panda
// ==========================================================================
import (
"fmt"
"pandax/apps/device/util"
"github.com/PandaXGO/PandaKit/biz"
"github.com/PandaXGO/PandaKit/model"
"github.com/PandaXGO/PandaKit/restfulx"
"pandax/kit/biz"
"pandax/kit/model"
"pandax/kit/restfulx"
"pandax/pkg/global"
model2 "pandax/pkg/global/model"
"pandax/pkg/shadow"
@@ -21,7 +26,6 @@ type DeviceApi struct {
DeviceAlarmApp services.DeviceAlarmModel
ProductApp services.ProductModel
ProductTemplateApp services.ProductTemplateModel
DeviceShadow shadow.DeviceShadow // 添加设备影子
}
func (p *DeviceApi) GetDevicePanel(rc *restfulx.ReqCtx) {
@@ -92,12 +96,13 @@ func (p *DeviceApi) GetDeviceStatus(rc *restfulx.ReqCtx) {
biz.ErrIsNil(err, "查询设备模板失败")
// 从设备影子中读取
res := make([]entity.DeviceStatusVo, 0)
getDevice := shadow.InitDeviceShadow(device.Name, device.Pid)
rs := make(map[string]shadow.DevicePoint)
if classify == global.TslAttributesType {
rs, _ = p.DeviceShadow.GetDevicePoints(device.Name, global.TslAttributesType) // 使用GetDevicePoints()函数
rs = getDevice.AttributesPoints
}
if classify == global.TslTelemetryType {
rs, _ = p.DeviceShadow.GetDevicePoints(device.Name, global.TslTelemetryType) // 使用GetDevicePoints()函数
rs = getDevice.TelemetryPoints
}
for _, tel := range *template {
sdv := entity.DeviceStatusVo{