From 72944aba78e562309a53f1bc2bd4f3e413bddafc Mon Sep 17 00:00:00 2001
From: WX <wx036@qq.com>
Date: 星期六, 10 六月 2023 23:37:01 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.245.94:8000/r/RiskControl_RR_Fast
---
GasolineBlend/Controllers/EventKgController.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/GasolineBlend/Controllers/EventKgController.cs b/GasolineBlend/Controllers/EventKgController.cs
index c4325a7..ce50c5f 100644
--- a/GasolineBlend/Controllers/EventKgController.cs
+++ b/GasolineBlend/Controllers/EventKgController.cs
@@ -102,13 +102,20 @@
/// <param name="groupId1"></param>
/// <param name="groupId2"></param>
/// <returns></returns>
- public ActionResult GetRiskMonitorWarnCountResult2(DateTime? startTime, DateTime? endTime, int groupId1, int groupId2)
+ public ActionResult GetRiskMonitorWarnCountResult2(DateTime? startTime, DateTime? endTime, int groupId1=0, int groupId2=0)
{
- var res1 = _alarmService.GetRiskMonitorWarnCountResult(startTime, endTime, groupId1);
- var res2 = _alarmService.GetRiskMonitorWarnCountResult(startTime, endTime, groupId2);
List<RiskMonitorWarnCountResult> listRiskMonitorWarnCountResults = new List<RiskMonitorWarnCountResult>();
- listRiskMonitorWarnCountResults.Add(res1);
- listRiskMonitorWarnCountResults.Add(res2);
+ if (groupId1 > 0)
+ {
+ var res1 = _alarmService.GetRiskMonitorWarnCountResult(startTime, endTime, groupId1);
+ listRiskMonitorWarnCountResults.Add(res1);
+ }
+ if (groupId2 > 0)
+ {
+ var res2 = _alarmService.GetRiskMonitorWarnCountResult(startTime, endTime, groupId2);
+ listRiskMonitorWarnCountResults.Add(res2);
+ }
+
return SuccessNoShow(data: listRiskMonitorWarnCountResults);
}
--
Gitblit v1.8.0