From d5a4545c243435aa3dcd515dbd9dc6faf51f3e07 Mon Sep 17 00:00:00 2001
From: WX <wx036@qq.com>
Date: 星期三, 07 六月 2023 22:28:18 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.245.94:8000/r/RiskControl_RR_Fast
---
GasolineBlend/Controllers/EventKgController.cs | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/GasolineBlend/Controllers/EventKgController.cs b/GasolineBlend/Controllers/EventKgController.cs
index 404e7cd..c4325a7 100644
--- a/GasolineBlend/Controllers/EventKgController.cs
+++ b/GasolineBlend/Controllers/EventKgController.cs
@@ -7,6 +7,7 @@
using GasolineBlend.Entity;
using RiskControl.NewService.Entity.RRAutoBIDB;
using RiskControl.NewService.Service;
+using RiskControl.NewService.ViewModel;
using SqlSugar;
namespace GasolineBlend.Controllers
@@ -94,6 +95,24 @@
}
/// <summary>
+ /// 鑾峰彇椋庨櫓銆佹柊闂汇�佸叕鍛婃娴嬬殑棰勮鏁�(棣栭〉鑷��)
+ /// </summary>
+ /// <param name="startTime"></param>
+ /// <param name="endTime"></param>
+ /// <param name="groupId1"></param>
+ /// <param name="groupId2"></param>
+ /// <returns></returns>
+ public ActionResult GetRiskMonitorWarnCountResult2(DateTime? startTime, DateTime? endTime, int groupId1, int groupId2)
+ {
+ 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);
+ return SuccessNoShow(data: listRiskMonitorWarnCountResults);
+ }
+
+ /// <summary>
/// 鏍规嵁椋庨櫓銆佹柊闂汇�佸叕鍛婃娴嬭幏鍙栭璀﹁鎯�
/// </summary>
/// <param name="startTime">寮�濮嬫椂闂�</param>
--
Gitblit v1.8.0