public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-04-23 10:58:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
tfl
2024-08-20 17:46:15 +08:00
parent 1467b349a2
commit 8b167d8c02
16 changed files with 182 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,6 @@ import (
"pandax/kit/utils"
"pandax/pkg/cache"
"pandax/pkg/global"
"pandax/pkg/shadow"
"strings"
"time"
@@ -97,14 +96,7 @@ 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 = getDevice.AttributesPoints
}
if classify == global.TslTelemetryType {
rs = getDevice.TelemetryPoints
}
for _, tel := range *template {
sdv := entity.DeviceStatusVo{
Name: tel.Name,
@@ -112,32 +104,25 @@ func (p *DeviceApi) GetDeviceStatus(rc *restfulx.ReqCtx) {
Type: tel.Type,
Define: tel.Define,
}
// 有直接从设备影子中查询，没有查询时序数据库最后一条记录
if point, ok := rs[tel.Key]; ok {
value := point.Value
sdv.Time = point.UpdatedAt
sdv.Value = value
var table string
if classify == global.TslTelemetryType {
table = fmt.Sprintf("%s_telemetry", strings.ToLower(device.Name))
}
if classify == global.TslAttributesType {
table = fmt.Sprintf("%s_attributes", strings.ToLower(device.Name))
}
sql := `select ts,? from ? order by ts desc`
one, err := global.TdDb.GetOne(sql, strings.ToLower(tel.Key), table)
if err == nil {
sdv.Value = one[strings.ToLower(tel.Key)]
sdv.Time = time.Now()
} else {
var table string
if classify == global.TslTelemetryType {
table = fmt.Sprintf("%s_telemetry", strings.ToLower(device.Name))
}
if classify == global.TslAttributesType {
table = fmt.Sprintf("%s_attributes", strings.ToLower(device.Name))
}
sql := `select ts,? from ? order by ts desc`
one, err := global.TdDb.GetOne(sql, strings.ToLower(tel.Key), table)
if err == nil {
sdv.Value = one[strings.ToLower(tel.Key)]
if value, ok := tel.Define["default_value"]; ok {
sdv.Value = value
sdv.Time = time.Now()
} else {
if value, ok := tel.Define["default_value"]; ok {
sdv.Value = value
sdv.Time = time.Now()
} else {
sdv.Value = "未知"
sdv.Time = time.Now()
}
sdv.Value = "未知"
sdv.Time = time.Now()
}
}
res = append(res, sdv)