bug:修改报警日志参数
This commit is contained in:
parent
4e6ae9ae3c
commit
c4ba4a34f9
@ -46,6 +46,10 @@ func (a *EnvMonitorDeviceWarningLog) QueryAll(ctx context.Context, params schema
|
||||
db = db.Where("id in (?)", strings.Split(params.Ids, ","))
|
||||
}
|
||||
|
||||
if params.Type != "" {
|
||||
db = db.Where("type = ?", params.Type)
|
||||
}
|
||||
|
||||
var list []*schema.EnvMonitorDeviceWarningLog
|
||||
err := db.Find(&list).Error
|
||||
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, ","))
|
||||
}
|
||||
|
||||
if params.Type != "" {
|
||||
db = db.Where("type = ?", params.Type)
|
||||
}
|
||||
|
||||
var list schema.EnvMonitorDeviceWarningLogs
|
||||
pageResult, err := util.WrapPageQuery(ctx, db, params.PaginationParam, opt.QueryOptions, &list)
|
||||
if err != nil {
|
||||
|
@ -46,14 +46,14 @@ func (a *EnvMonitor) RegisterV1Routers(ctx context.Context, v1 *gin.RouterGroup)
|
||||
}
|
||||
envMonitorDevice := v1.Group("env-monitor-devices")
|
||||
{
|
||||
// 统计设备数量以及状态
|
||||
envMonitorDevice.GET("statistics", a.EnvMonitorDeviceAPI.Statistics)
|
||||
envMonitorDevice.GET("", a.EnvMonitorDeviceAPI.Query)
|
||||
envMonitorDevice.GET(":id", a.EnvMonitorDeviceAPI.Get)
|
||||
envMonitorDevice.POST("", a.EnvMonitorDeviceAPI.Create)
|
||||
envMonitorDevice.PUT(":id", a.EnvMonitorDeviceAPI.Update)
|
||||
// envMonitorDevice.DELETE(":id", a.EnvMonitorDeviceAPI.Delete)
|
||||
|
||||
// 统计设备数量以及状态
|
||||
envMonitorDevice.GET("statistics", a.EnvMonitorDeviceAPI.Statistics)
|
||||
}
|
||||
envMonitorDeviceWarningConfig :=
|
||||
// envMonitorDeviceFishPond := v1.Group("env-monitor-device-fish-ponds")
|
||||
|
@ -33,6 +33,7 @@ type EnvMonitorDeviceWarningLogQueryParam struct {
|
||||
EndTime string `form:"end_time"` // 结束时间
|
||||
IsOK *bool `form:"is_ok"` // 是否正常
|
||||
Ids string `form:"ids"` // 设备ID
|
||||
Type string `form:"type"` // 报警指标
|
||||
}
|
||||
|
||||
// Defining the query options for the `EnvMonitorDeviceWarningLog` struct.
|
||||
|
Loading…
x
Reference in New Issue
Block a user