qikun/ifms_go
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug:修改报警日志参数

Browse Source
This commit is contained in:
qi.zhou 2025-06-15 23:34:03 +08:00
parent 4e6ae9ae3c
commit c4ba4a34f9
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/mods/envmonitor/dal/env_monitor_device_warning_log.dal.go
View File

@ -46,6 +46,10 @@ func (a *EnvMonitorDeviceWarningLog) QueryAll(ctx context.Context, params schema
db = db.Where("id in (?)", strings.Split(params.Ids, ",")) db = db.Where("id in (?)", strings.Split(params.Ids, ","))
} }
if params.Type != "" {
db = db.Where("type = ?", params.Type)
}
var list []*schema.EnvMonitorDeviceWarningLog var list []*schema.EnvMonitorDeviceWarningLog
err := db.Find(&list).Error err := db.Find(&list).Error
if err != nil { if err != nil {
@ -80,6 +84,10 @@ func (a *EnvMonitorDeviceWarningLog) Query(ctx context.Context, params schema.En
db = db.Where("id in (?)", strings.Split(params.Ids, ",")) db = db.Where("id in (?)", strings.Split(params.Ids, ","))
} }
if params.Type != "" {
db = db.Where("type = ?", params.Type)
}
var list schema.EnvMonitorDeviceWarningLogs var list schema.EnvMonitorDeviceWarningLogs
pageResult, err := util.WrapPageQuery(ctx, db, params.PaginationParam, opt.QueryOptions, &list) pageResult, err := util.WrapPageQuery(ctx, db, params.PaginationParam, opt.QueryOptions, &list)
if err != nil { if err != nil {

4
internal/mods/envmonitor/main.go
View File

@ -46,14 +46,14 @@ func (a *EnvMonitor) RegisterV1Routers(ctx context.Context, v1 *gin.RouterGroup)
} }
envMonitorDevice := v1.Group("env-monitor-devices") envMonitorDevice := v1.Group("env-monitor-devices")
{ {
// 统计设备数量以及状态
envMonitorDevice.GET("statistics", a.EnvMonitorDeviceAPI.Statistics)
envMonitorDevice.GET("", a.EnvMonitorDeviceAPI.Query) envMonitorDevice.GET("", a.EnvMonitorDeviceAPI.Query)
envMonitorDevice.GET(":id", a.EnvMonitorDeviceAPI.Get) envMonitorDevice.GET(":id", a.EnvMonitorDeviceAPI.Get)
envMonitorDevice.POST("", a.EnvMonitorDeviceAPI.Create) envMonitorDevice.POST("", a.EnvMonitorDeviceAPI.Create)
envMonitorDevice.PUT(":id", a.EnvMonitorDeviceAPI.Update) envMonitorDevice.PUT(":id", a.EnvMonitorDeviceAPI.Update)
// envMonitorDevice.DELETE(":id", a.EnvMonitorDeviceAPI.Delete) // envMonitorDevice.DELETE(":id", a.EnvMonitorDeviceAPI.Delete)
// 统计设备数量以及状态
envMonitorDevice.GET("statistics", a.EnvMonitorDeviceAPI.Statistics)
} }
envMonitorDeviceWarningConfig := envMonitorDeviceWarningConfig :=
// envMonitorDeviceFishPond := v1.Group("env-monitor-device-fish-ponds") // envMonitorDeviceFishPond := v1.Group("env-monitor-device-fish-ponds")

1
internal/mods/envmonitor/schema/env_monitor_device_warning_log.go
View File

@ -33,6 +33,7 @@ type EnvMonitorDeviceWarningLogQueryParam struct {
EndTime string `form:"end_time"` // 结束时间 EndTime string `form:"end_time"` // 结束时间
IsOK *bool `form:"is_ok"` // 是否正常 IsOK *bool `form:"is_ok"` // 是否正常
Ids string `form:"ids"` // 设备ID Ids string `form:"ids"` // 设备ID
Type string `form:"type"` // 报警指标
} }
// Defining the query options for the `EnvMonitorDeviceWarningLog` struct. // Defining the query options for the `EnvMonitorDeviceWarningLog` struct.