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

[优化]

Browse Source
This commit is contained in:
PandaX
2024-03-15 15:22:35 +08:00
parent 7a25d49846
commit 00577ba627
5 changed files with 55 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apps/device/services/device.go
View File

@@ -193,20 +193,6 @@ func (m *deviceModelImpl) Delete(ids []string) error {
if err := global.Db.Table(m.table).Delete(&entity.Device{}, "id in (?)", ids).Error; err != nil {
return err
}
for _, id := range ids {
device, err := m.FindOne(id)
if err != nil {
continue
}
// 删除表
err = deleteDeviceTable(device.Name)
// 删除所有缓存
if device.DeviceType == global.GATEWAYS {
cache.DelDeviceEtoken(device.Name)
} else {
cache.DelDeviceEtoken(device.Token)
}
}
return nil
}
@@ -223,19 +209,6 @@ func createDeviceTable(productId, device string) error {
return nil
}
// 删除Tdengine时序数据
func deleteDeviceTable(device string) error {
err := global.TdDb.DropTable(device + "_" + entity.ATTRIBUTES_TSL)
if err != nil {
return err
}
err = global.TdDb.DropTable(device + "_" + entity.TELEMETRY_TSL)
if err != nil {
return err
}
return nil
}
func GetDeviceToken(data *entity.Device) *model.DeviceAuth {
now := time.Now()
etoken := &model.DeviceAuth{

19
apps/device/services/product.go
View File

@@ -2,7 +2,6 @@ package services
import (
"pandax/apps/device/entity"
"pandax/pkg/cache"
"pandax/pkg/global"
)
@@ -118,12 +117,6 @@ func (m *productModelImpl) Delete(ids []string) error {
if err := global.Db.Table(m.table).Delete(&entity.Product{}, "id in (?)", ids).Error; err != nil {
return err
}
for _, id := range ids {
// 删除超级表
deleteDeviceStable(id)
// 删除所有缓存
cache.DelProductRule(id)
}
return nil
}
@@ -139,18 +132,6 @@ func createDeviceStable(productId string) error {
return nil
}
func deleteDeviceStable(productId string) error {
err := global.TdDb.DropStable(productId + "_" + entity.ATTRIBUTES_TSL)
if err != nil {
return err
}
err = global.TdDb.DropStable(productId + "_" + entity.TELEMETRY_TSL)
if err != nil {
return err
}
return nil
}
// 获取产品数量统计
func (m *productModelImpl) FindProductCount() (count entity.DeviceCount, err error) {
sql := `SELECT COUNT(*) AS total, (SELECT COUNT(*) FROM products WHERE DATE(create_time) = CURDATE()) AS today FROM products`