|
@@ -282,7 +282,7 @@ func ModifyEdbMonitorState(edbMonitorInfo *edbmonitor.EdbMonitorInfo, edbCode st
|
|
|
edbMonitorInfo.MonitorTriggerTime = time.Now()
|
|
|
updateCols = append(updateCols, []string{"edb_trigger_date", "monitor_trigger_time"}...)
|
|
|
}
|
|
|
- if edbMonitorInfo.State == EDB_MONITOR_STATE_NO_TRIGGER {
|
|
|
+ if edbMonitorInfo.State == EDB_MONITOR_STATE_NO_TRIGGER || edbMonitorInfo.State == EDB_MONITOR_STATE_CLOSE {
|
|
|
edbMonitorInfo.State = triggerState
|
|
|
updateCols = append(updateCols, "state")
|
|
|
}
|
|
@@ -398,6 +398,9 @@ func RestartEdbMonitorInfo(req request.EdbMonitorInfoRestartReq, adminId int) (m
|
|
|
err = fmt.Errorf("预警未关闭,无需重启")
|
|
|
return
|
|
|
}
|
|
|
+ edbMonitor.EdbTriggerDate = time.Time{}
|
|
|
+ edbMonitor.MonitorTriggerTime = time.Time{}
|
|
|
+ edbMonitor.ModifyTime = time.Now()
|
|
|
err = ModifyEdbMonitorState(edbMonitor, edbMonitor.EdbCode, edbMonitor.Source, edbMonitor.SubSource)
|
|
|
if err != nil {
|
|
|
msg = "重启失败"
|