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

[优化] 将部分在services中抛出异常使用error返回

Browse Source
This commit is contained in:
PandaX
2023-12-29 11:19:17 +08:00
parent 7669cc208a
commit 7abc0a6840
24 changed files with 534 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
apps/device/services/device_alarm.go
View File

@@ -1,7 +1,6 @@
package services
import (
"github.com/PandaXGO/PandaKit/biz"
"pandax/apps/device/entity"
"pandax/pkg/global"
"pandax/pkg/global/model"
@@ -10,13 +9,13 @@ import (
type (
DeviceAlarmModel interface {
Insert(data entity.DeviceAlarm) error
FindOne(id string) *entity.DeviceAlarm
FindOne(id string) (*entity.DeviceAlarm, error)
FindOneByType(deviceId, ty, state string) (*entity.DeviceAlarm, error)
FindListPage(page, pageSize int, data entity.DeviceAlarmForm) (*[]entity.DeviceAlarm, int64)
FindListPage(page, pageSize int, data entity.DeviceAlarmForm) (*[]entity.DeviceAlarm, int64, error)
Update(data entity.DeviceAlarm) error
Delete(ids []string)
FindAlarmCount() entity.DeviceCount
FindAlarmPanel() []entity.DeviceAlarmCount
Delete(ids []string) error
FindAlarmCount() (entity.DeviceCount, error)
FindAlarmPanel() ([]entity.DeviceAlarmCount, error)
}
alarmModelImpl struct {
@@ -33,12 +32,11 @@ func (m *alarmModelImpl) Insert(data entity.DeviceAlarm) error {
return err
}
func (m *alarmModelImpl) FindOne(id string) *entity.DeviceAlarm {
func (m *alarmModelImpl) FindOne(id string) (*entity.DeviceAlarm, error) {
resData := new(entity.DeviceAlarm)
db := global.Db.Table(m.table).Where("id = ?", id)
err := db.First(resData).Error
biz.ErrIsNil(err, "查询设备告警失败")
return resData
return resData, err
}
func (m *alarmModelImpl) FindOneByType(deviceId, ty, state string) (*entity.DeviceAlarm, error) {
@@ -51,7 +49,7 @@ func (m *alarmModelImpl) FindOneByType(deviceId, ty, state string) (*entity.Devi
return resData, nil
}
func (m *alarmModelImpl) FindListPage(page, pageSize int, data entity.DeviceAlarmForm) (*[]entity.DeviceAlarm, int64) {
func (m *alarmModelImpl) FindListPage(page, pageSize int, data entity.DeviceAlarmForm) (*[]entity.DeviceAlarm, int64, error) {
list := make([]entity.DeviceAlarm, 0)
var total int64 = 0
offset := pageSize * (page - 1)
@@ -78,12 +76,14 @@ func (m *alarmModelImpl) FindListPage(page, pageSize int, data entity.DeviceAlar
db = db.Where("time < ?", data.EndTime)
}
// 组织数据访问权限
model.OrgAuthSet(db, data.RoleId, data.Owner)
err := db.Count(&total).Error
err = db.Order("time").Limit(pageSize).Offset(offset).Find(&list).Error
biz.ErrIsNil(err, "查询设备告警分页列表失败")
return &list, total
if err := model.OrgAuthSet(db, data.RoleId, data.Owner); err != nil {
return nil, 0, err
}
if err := db.Count(&total).Error; err != nil {
return nil, 0, err
}
err := db.Order("time").Limit(pageSize).Offset(offset).Find(&list).Error
return &list, total, err
}
func (m *alarmModelImpl) Update(data entity.DeviceAlarm) error {
@@ -94,26 +94,24 @@ func (m *alarmModelImpl) Update(data entity.DeviceAlarm) error {
return err
}
func (m *alarmModelImpl) Delete(id []string) {
biz.ErrIsNil(global.Db.Table(m.table).Delete(&entity.DeviceAlarm{}, "id in (?)", id).Error, "删除设备告警失败")
func (m *alarmModelImpl) Delete(id []string) error {
return global.Db.Table(m.table).Delete(&entity.DeviceAlarm{}, "id in (?)", id).Error
}
// 获取告警数量统计
func (m *alarmModelImpl) FindAlarmCount() (count entity.DeviceCount) {
func (m *alarmModelImpl) FindAlarmCount() (count entity.DeviceCount, err error) {
sql := `SELECT COUNT(*) AS total, (SELECT COUNT(*) FROM device_alarms WHERE DATE(time) = CURDATE()) AS today FROM device_alarms`
if global.Conf.Server.DbType == "postgresql" {
sql = `SELECT COUNT(*) AS total, (SELECT COUNT(*) FROM device_alarms WHERE DATE(time) = current_date) AS today FROM device_alarms`
}
err := global.Db.Raw(sql).Scan(&count).Error
biz.ErrIsNil(err, "获取告警统计总数失败")
err = global.Db.Raw(sql).Scan(&count).Error
return
}
func (m *alarmModelImpl) FindAlarmPanel() (count []entity.DeviceAlarmCount) {
func (m *alarmModelImpl) FindAlarmPanel() (count []entity.DeviceAlarmCount, err error) {
sql := `SELECT CAST(time AS DATE) AS date, COUNT(*) AS count FROM device_alarms WHERE time >= DATE_SUB(CURDATE(), INTERVAL 30 DAY) GROUP BY CAST(time AS DATE)`
if global.Conf.Server.DbType == "postgresql" {
sql = `SELECT CAST(time AS DATE) AS date, COUNT(*) AS count FROM device_alarms WHERE time >= CURRENT_DATE - INTERVAL '30 day' GROUP BY CAST(time AS DATE);`
}
err := global.Db.Raw(sql).Scan(&count).Error
biz.ErrIsNil(err, "获取告警统计列表失败")
err = global.Db.Raw(sql).Scan(&count).Error
return
}