From c7c0fc6888d64249b4d9a8af7dc988f6da29e791 Mon Sep 17 00:00:00 2001
From: admin <182004222@qq.com>
Date: 星期四, 07 十二月 2023 19:05:17 +0800
Subject: [PATCH] 风控优化备份20231207FX
---
RiskControl.NewService/Service/AlarmService.cs | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/RiskControl.NewService/Service/AlarmService.cs b/RiskControl.NewService/Service/AlarmService.cs
index 03823ba..a270ba5 100644
--- a/RiskControl.NewService/Service/AlarmService.cs
+++ b/RiskControl.NewService/Service/AlarmService.cs
@@ -54,7 +54,7 @@
//濡傛灉浼佷笟涓虹┖灏辫繑鍥炵┖
if (companyNames.Length == 0) return new List<WarnEventTypeCountResult>();
- var sqlTemp = $@"SELECT EventType,COUNT(1) num INTO #temp FROM dbo.ComDynamic WHERE CompanyName IN ('{string.Join("','", companyNames)}')
+ var sqlTemp = $@"SELECT EventType,COUNT(1) num INTO #temp FROM dbo.ComDynamic WHERE BlankFlag=0 and CompanyName IN ('{string.Join("','", companyNames)}')
{(startTime == null ? "" : $" AND ContentTime>='{startTime:yyyy-MM-dd HH:mm:ss}'")}
{(endTime == null ? "" : $" AND ContentTime<='{endTime:yyyy-MM-dd HH:mm:ss}'")}
GROUP BY EventType;";
@@ -84,14 +84,14 @@
{
eventTypeSql = @"
SELECT '鏂伴椈绫�' level1,EventType level2,SUM(num) num FROM #temp
- WHERE EventType IN ('娣卞害淇℃伅-缁忚惀淇℃伅-鎷涙姇鏍�','娣卞害淇℃伅-缁忚惀淇℃伅-璐湴淇℃伅','娣卞害淇℃伅-缁忚惀淇℃伅-鎷涜仒淇℃伅','娣卞害淇℃伅-缁忚惀淇℃伅-鏂伴椈鑸嗚','娣卞害淇℃伅-缁忚惀淇℃伅-鏂伴椈蹇','娣卞害淇℃伅-缁忚惀淇℃伅-鏂伴椈璧勮','娣卞害淇℃伅-缁忚惀淇℃伅-鍟嗘爣淇℃伅','娣卞害淇℃伅-缁忚惀淇℃伅-涓撳埄淇℃伅')
+ WHERE EventType IN ('娣卞害淇℃伅-缁忚惀淇℃伅-鎷涙姇鏍�','娣卞害淇℃伅-缁忚惀淇℃伅-璐湴淇℃伅','娣卞害淇℃伅-缁忚惀淇℃伅-鎷涜仒淇℃伅','娣卞害淇℃伅-缁忚惀淇℃伅-鏂伴椈鑸嗚','娣卞害淇℃伅-缁忚惀淇℃伅-鏂伴椈蹇','娣卞害淇℃伅-缁忚惀淇℃伅-鏂伴椈璧勮','娣卞害淇℃伅-缁忚惀淇℃伅-鍟嗘爣淇℃伅','娣卞害淇℃伅-缁忚惀淇℃伅-涓撳埄淇℃伅')
GROUP BY EventType";
}
else if (type == "鍏憡绫�")
{
eventTypeSql = @"
SELECT '鍏憡绫�' level1,EventType level2,SUM(num) num FROM #temp
- WHERE EventType IN ('娣卞害淇℃伅-涓婂競淇℃伅-鍏徃鍏憡-涓氱哗棰勫憡','娣卞害淇℃伅-涓婂競淇℃伅-鍏徃鍏憡-鍏徃鍏憡','娣卞害淇℃伅-鏂颁笁鏉夸笂甯備俊鎭�-鍏徃鍏憡','娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-浜ゆ槗琛屾儏-姣忔棩鎸囨爣', '娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-鑲′笢澧炲噺鎸�')
+ WHERE EventType IN ('娣卞害淇℃伅-涓婂競淇℃伅-鍏徃鍏憡-涓氱哗棰勫憡','娣卞害淇℃伅-涓婂競淇℃伅-鍏徃鍏憡-鍏徃鍏憡','娣卞害淇℃伅-鏂颁笁鏉夸笂甯備俊鎭�-鍏徃鍏憡','娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-浜ゆ槗琛屾儏-姣忔棩鎸囨爣', '娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-鑲′笢澧炲噺鎸�','娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-浜ゆ槗琛屾儏-璧勯噾娴佸悜','娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-铻嶈祫铻嶅埜','娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-澶у畻浜ゆ槗','娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-鑲＄エ鍥炶喘','娣卞害淇℃伅-涓婂競淇℃伅-鍏徃璧勬枡-鍩烘湰淇℃伅','娣卞害淇℃伅-涓婂競淇℃伅-鍒嗙孩铻嶈祫-鍒嗙孩閫佽偂')
GROUP BY EventType";
}
else
@@ -185,10 +185,15 @@
"娣卞害淇℃伅-缁忚惀淇℃伅-鎷涙姇鏍�", "娣卞害淇℃伅-缁忚惀淇℃伅-璐湴淇℃伅", "娣卞害淇℃伅-缁忚惀淇℃伅-鎷涜仒淇℃伅", "娣卞害淇℃伅-缁忚惀淇℃伅-鏂伴椈鑸嗚","娣卞害淇℃伅-缁忚惀淇℃伅-鏂伴椈蹇","娣卞害淇℃伅-缁忚惀淇℃伅-鏂伴椈璧勮", "娣卞害淇℃伅-缁忚惀淇℃伅-鍟嗘爣淇℃伅",
"娣卞害淇℃伅-缁忚惀淇℃伅-涓撳埄淇℃伅"
};
- var anTypeArr = new[] {"娣卞害淇℃伅-涓婂競淇℃伅-鍏徃鍏憡-涓氱哗棰勫憡", "娣卞害淇℃伅-涓婂競淇℃伅-鍏徃鍏憡-鍏徃鍏憡", "娣卞害淇℃伅-鏂颁笁鏉夸笂甯備俊鎭�-鍏徃鍏憡", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-浜ゆ槗琛屾儏-姣忔棩鎸囨爣", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-鑲′笢澧炲噺鎸�" };
+ var anTypeArr = new[]
+ {
+ "娣卞害淇℃伅-涓婂競淇℃伅-鍏徃鍏憡-涓氱哗棰勫憡", "娣卞害淇℃伅-涓婂競淇℃伅-鍏徃鍏憡-鍏徃鍏憡", "娣卞害淇℃伅-鏂颁笁鏉夸笂甯備俊鎭�-鍏徃鍏憡", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-浜ゆ槗琛屾儏-姣忔棩鎸囨爣",
+ "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-鑲′笢澧炲噺鎸�", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-浜ゆ槗琛屾儏-璧勯噾娴佸悜", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-铻嶈祫铻嶅埜", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-澶у畻浜ゆ槗",
+ "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-鑲＄エ鍥炶喘", "娣卞害淇℃伅-涓婂競淇℃伅-鍏徃璧勬枡-鍩烘湰淇℃伅","娣卞害淇℃伅-涓婂競淇℃伅-鍒嗙孩铻嶈祫-鍒嗙孩閫佽偂"
+ };
- var sqlTemp = $@"SELECT EventType,WarnLevel,COUNT(1) Num FROM dbo.ComDynamic WHERE CompanyName IN ('{string.Join("','", companyNames)}')
+ var sqlTemp = $@"SELECT EventType,WarnLevel,COUNT(1) Num FROM dbo.ComDynamic WHERE BlankFlag=0 and CompanyName IN ('{string.Join("','", companyNames)}')
{(startTime == null ? "" : $" AND ContentTime>='{startTime:yyyy-MM-dd HH:mm:ss}'")}
{(endTime == null ? "" : $" AND ContentTime<='{endTime:yyyy-MM-dd HH:mm:ss}'")}
GROUP BY EventType,WarnLevel;";
@@ -261,7 +266,12 @@
"娣卞害淇℃伅-缁忚惀淇℃伅-鎷涙姇鏍�", "娣卞害淇℃伅-缁忚惀淇℃伅-璐湴淇℃伅", "娣卞害淇℃伅-缁忚惀淇℃伅-鎷涜仒淇℃伅", "娣卞害淇℃伅-缁忚惀淇℃伅-鏂伴椈鑸嗚","娣卞害淇℃伅-缁忚惀淇℃伅-鏂伴椈蹇","娣卞害淇℃伅-缁忚惀淇℃伅-鏂伴椈璧勮", "娣卞害淇℃伅-缁忚惀淇℃伅-鍟嗘爣淇℃伅",
"娣卞害淇℃伅-缁忚惀淇℃伅-涓撳埄淇℃伅"
};
- var anTypeArr = new[] { "娣卞害淇℃伅-涓婂競淇℃伅-鍏徃鍏憡-涓氱哗棰勫憡", "娣卞害淇℃伅-涓婂競淇℃伅-鍏徃鍏憡-鍏徃鍏憡", "娣卞害淇℃伅-鏂颁笁鏉夸笂甯備俊鎭�-鍏徃鍏憡", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-浜ゆ槗琛屾儏-姣忔棩鎸囨爣", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-鑲′笢澧炲噺鎸�" };
+ var anTypeArr = new[]
+ {
+ "娣卞害淇℃伅-涓婂競淇℃伅-鍏徃鍏憡-涓氱哗棰勫憡", "娣卞害淇℃伅-涓婂競淇℃伅-鍏徃鍏憡-鍏徃鍏憡", "娣卞害淇℃伅-鏂颁笁鏉夸笂甯備俊鎭�-鍏徃鍏憡", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-浜ゆ槗琛屾儏-姣忔棩鎸囨爣",
+ "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-鑲′笢澧炲噺鎸�", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-浜ゆ槗琛屾儏-璧勯噾娴佸悜", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-铻嶈祫铻嶅埜", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-澶у畻浜ゆ槗",
+ "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-鑲＄エ鍥炶喘", "娣卞害淇℃伅-涓婂競淇℃伅-鍏徃璧勬枡-鍩烘湰淇℃伅","娣卞害淇℃伅-涓婂競淇℃伅-鍒嗙孩铻嶈祫-鍒嗙孩閫佽偂"
+ };
var result = alarmDb.Queryable<ComDynamic>()
.WhereIF(startTime != null, a => a.ContentTime >= startTime)
.WhereIF(endTime != null, a => a.ContentTime <= endTime)
@@ -269,6 +279,7 @@
.WhereIF(type == "椋庨櫓", a => rateTypeArr.Contains(a.EventType))
.WhereIF(type == "鏂伴椈", a => newsTypeArr.Contains(a.EventType))
.WhereIF(type == "鍏憡", a => anTypeArr.Contains(a.EventType))
+ .Where(a => a.BlankFlag == false)
.WhereIF(level != null, a => a.WarnLevel == level)
.ToList();
return result;
@@ -301,7 +312,12 @@
"娣卞害淇℃伅-缁忚惀淇℃伅-鎷涙姇鏍�", "娣卞害淇℃伅-缁忚惀淇℃伅-璐湴淇℃伅", "娣卞害淇℃伅-缁忚惀淇℃伅-鎷涜仒淇℃伅", "娣卞害淇℃伅-缁忚惀淇℃伅-鏂伴椈鑸嗚","娣卞害淇℃伅-缁忚惀淇℃伅-鏂伴椈蹇","娣卞害淇℃伅-缁忚惀淇℃伅-鏂伴椈璧勮", "娣卞害淇℃伅-缁忚惀淇℃伅-鍟嗘爣淇℃伅",
"娣卞害淇℃伅-缁忚惀淇℃伅-涓撳埄淇℃伅"
};
- var anTypeArr = new[] { "娣卞害淇℃伅-涓婂競淇℃伅-鍏徃鍏憡-涓氱哗棰勫憡", "娣卞害淇℃伅-涓婂競淇℃伅-鍏徃鍏憡-鍏徃鍏憡", "娣卞害淇℃伅-鏂颁笁鏉夸笂甯備俊鎭�-鍏徃鍏憡", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-浜ゆ槗琛屾儏-姣忔棩鎸囨爣", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-鑲′笢澧炲噺鎸�" };
+ var anTypeArr = new[]
+ {
+ "娣卞害淇℃伅-涓婂競淇℃伅-鍏徃鍏憡-涓氱哗棰勫憡", "娣卞害淇℃伅-涓婂競淇℃伅-鍏徃鍏憡-鍏徃鍏憡", "娣卞害淇℃伅-鏂颁笁鏉夸笂甯備俊鎭�-鍏徃鍏憡", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-浜ゆ槗琛屾儏-姣忔棩鎸囨爣",
+ "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-鑲′笢澧炲噺鎸�", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-浜ゆ槗琛屾儏-璧勯噾娴佸悜", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-铻嶈祫铻嶅埜", "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-澶у畻浜ゆ槗",
+ "娣卞害淇℃伅-涓婂競淇℃伅-琛屾儏璧板娍-鑲＄エ鍥炶喘", "娣卞害淇℃伅-涓婂競淇℃伅-鍏徃璧勬枡-鍩烘湰淇℃伅","娣卞害淇℃伅-涓婂競淇℃伅-鍒嗙孩铻嶈祫-鍒嗙孩閫佽偂"
+ };
var orWhere = Expressionable.Create<ComDynamic>();
orWhere.AndIF(eventType1.Contains("缁忚惀棰勮绫�"), a => a.EventType.StartsWith("娣卞害淇℃伅-缁忚惀棰勮"))
.OrIF(eventType1.Contains("鍙告硶娑夎瘔绫�"), a => a.EventType.StartsWith("娣卞害淇℃伅-鍙告硶娑夎瘔"))
@@ -312,6 +328,7 @@
.WhereIF(startTime != null, a => a.ContentTime >= startTime)
.WhereIF(endTime != null, a => a.ContentTime <= endTime)
.Where(a => companyNames.Contains(a.CompanyName))
+ .Where(a => a.BlankFlag==false)
.Where(orWhere.ToExpression())
.WhereIF(!string.IsNullOrWhiteSpace(eventType2), a => a.EventType.EndsWith(eventType2))
.WhereIF(warnLevel != null, a => a.WarnLevel == warnLevel)
@@ -320,6 +337,17 @@
return result;
}
-
+ /// <summary>
+ /// 鑾峰彇鎸囧畾Id鐨勯璀︿俊鎭�
+ /// </summary>
+ /// <param name="Id"></param>
+ /// <returns></returns>
+ public ComDynamic GetDynamicById(int Id)
+ {
+ var result = alarmDb.Queryable<ComDynamic>()
+ .WhereIF(Id > 0, a => a.Id == Id)
+ .First();
+ return result;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0