From 3ae7b33dfca55b3e9a745aea8d8e8f3cea67ae87 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 26 十一月 2024 16:44:01 +0800
Subject: [PATCH] 修复 要发送的信息为空时自动跳过,不进行发送
---
DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/DingDingMsg.csproj.FileListAbsolute.txt | 1
/dev/null | 0
DingDingMsg_EarlyWarning/bin/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.pdb | 0
DingDingMsg/.vs/DingDingMsg/v16/.suo | 0
DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/DingDingMsg.pdb | 0
DingDingMsg_EarlyWarning/obj/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.csproj.FileListAbsolute.txt | 1
DingDingMsg/DingDingMsg/bin/Debug/netcoreapp3.1/win-x64/DingDingMsg.pdb | 0
DingDingMsg_EarlyWarning/obj/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.pdb | 0
DingDingMsg/DingDingMsg/Program.cs | 111 +++++++++++++++++++++++++++++++------------------------
DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/win-x64/DingDingMsg.pdb | 0
DingDingMsg/DingDingMsg/bin/Debug/netcoreapp3.1/DingDingMsg.pdb | 0
DingDingMsg/DingDingMsg/Properties/PublishProfiles/FolderProfile1.pubxml.user | 2
12 files changed, 63 insertions(+), 52 deletions(-)
diff --git a/DingDingMsg/.vs/DingDingMsg/v16/.suo b/DingDingMsg/.vs/DingDingMsg/v16/.suo
index 610f1f9..2450437 100644
--- a/DingDingMsg/.vs/DingDingMsg/v16/.suo
+++ b/DingDingMsg/.vs/DingDingMsg/v16/.suo
Binary files differ
diff --git a/DingDingMsg/DingDingMsg/Program.cs b/DingDingMsg/DingDingMsg/Program.cs
index 6c4209a..c6c0c89 100644
--- a/DingDingMsg/DingDingMsg/Program.cs
+++ b/DingDingMsg/DingDingMsg/Program.cs
@@ -12,6 +12,8 @@
//寮傚父鍙嶉鍗�,寮傚父宸ヨ壓鍙傛暟棰勮 鍙戦�侀拤閽夋秷鎭�
static DBHelper oCN = new DBHelper();
static DataSet dt = new DataSet();
+ static DataSet dt1 = new DataSet();
+ static DataSet dt2 = new DataSet();
static async Task Main(string[] args)
{
//鏈湴
@@ -114,66 +116,77 @@
DBHelper.CustomWriteLog("娌℃湁鏇存柊鐨勮鍙�", DateTime.Now.ToString("yyyy-MM-dd"));
}
//鏌ヨ鍑鸿鍙戜俊鎭殑寮傚父鍙傛暟
- //string newSql = @"select STUFF((SELECT '; ' + 璁惧缂栫爜 + ' - ' + 宸ヨ壓鍙傛暟鍚嶇О + ' - 鏁伴噰鍊�: ' + CAST(鏁伴噰鍊� as VARCHAR(10)) + ' - 涓婇檺鍊�: ' + CAST(涓婇檺鍊� as VARCHAR(10)) + ' - 涓嬮檺鍊�: ' + CAST(涓嬮檺鍊� as VARCHAR(10))
- //FROM h_v_Sb_EquipMentCollectionTechParam_ERRList WHERE 鍙戠幇寮傚父鏃堕棿 >= DATEADD(minute, -1, GETDATE()) FOR XML PATH('')), 1, 2, '') as 鍐呭";
+
string newSql = @"SELECT 杞﹂棿, STUFF(( SELECT '; ' + 璁惧缂栫爜 + ' - ' + 宸ヨ壓鍙傛暟鍚嶇О + ' - 鏁伴噰鍊�: ' + CAST(鏁伴噰鍊� AS VARCHAR(10)) + ' - 涓婇檺鍊�: ' + CAST(涓婇檺鍊� AS VARCHAR(10)) + ' - 涓嬮檺鍊�: ' + CAST(涓嬮檺鍊� AS VARCHAR(10))
FROM h_v_Sb_EquipMentCollectionTechParam_ERRList AS InnerTable WHERE InnerTable.杞﹂棿 = OuterTable.杞﹂棿 AND 鍙戠幇寮傚父鏃堕棿 >= DATEADD(minute, -1, GETDATE())
FOR XML PATH('') ), 1, 2, '') AS 鍐呭 FROM h_v_Sb_EquipMentCollectionTechParam_ERRList AS OuterTable GROUP BY 杞﹂棿 ";
DBHelper.CustomWriteLog("鏌ヨ鍑鸿鍙戜俊鎭殑寮傚父鍙傛暟"+newSql, DateTime.Now.ToString("yyyy-MM-dd"));
- dt = oCN.RunProcReturn(newSql, "h_v_Sb_EquipMentCollectionTechParam_ERRList");
+ dt1 = oCN.RunProcReturn(newSql, "h_v_Sb_EquipMentCollectionTechParam_ERRList");
string HContext = ""; string HDeptName = "";
- HContext = dt.Tables[0].Rows[0]["鍐呭"].ToString();
- HDeptName= dt.Tables[0].Rows[0]["杞﹂棿"].ToString();
- DBHelper.CustomWriteLog("鏌ヨ鍑鸿鍙戜俊鎭殑鍐呭" + HContext, DateTime.Now.ToString("yyyy-MM-dd"));
- //鏌ヨ鍑鸿鍙戦�佺殑浜�
- string newSql1 = @"select a.HDingDingUserID 閽夐拤id,a.Czymc 鎺ユ敹浜� from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId
- left join System_UserGroup c on b.GroupId = c.GroupID where c.GroupName = '"+ HDeptName + "宸ヨ壓寮傚父棰勮鎺ユ敹浜�'";
- DBHelper.CustomWriteLog("鏌ヨ鍑鸿鍙戦�佺殑浜�:" + newSql1, DateTime.Now.ToString("yyyy-MM-dd"));
- dt = oCN.RunProcReturn(newSql1, "Gy_Czygl");
- DBHelper.CustomWriteLog("寮�濮嬭繘鍏ュ彂淇℃伅", DateTime.Now.ToString("yyyy-MM-dd"));
- if (dt.Tables[0].Rows.Count > 0)
+ for (int j = 0; j < dt1.Tables[0].Rows.Count; j++)
{
- DBHelper.CustomWriteLog("杩涘叆鍙戜俊鎭�", DateTime.Now.ToString("yyyy-MM-dd"));
- for (int i = 0; i < dt.Tables[0].Rows.Count; i++)
- {
- string HName = dt.Tables[0].Rows[i]["閽夐拤id"].ToString();
- string Stares = dt.Tables[0].Rows[i]["鎺ユ敹浜�"].ToString();
-
- MSG msg = new MSG();
-
- //鑾峰彇浼佷笟鐨刟ccess_token鐨勫��
- string response = msg.GetAccessToken(appKey, appSecret);
- JObject responseJson = JObject.Parse(response);
- // 鑾峰彇access_token鐨勫��
- string accessToken = responseJson["accessToken"].ToString();
-
- //璋冪敤鏂规硶鍙戦�佹秷鎭�
- //string agentId = "3118119317";//閽夐拤鍚庡彴寤虹珛鐨勫皬绋嬪簭id
- //鏂帿灏�
- string agentId = "3151454458";//閽夐拤鍚庡彴寤虹珛鐨勫皬绋嬪簭id
- string userIdList = HName;//閽夐拤浜哄憳鐨刬d
- string deptIdList = "0"; // 绌哄瓧绗︿覆琛ㄧず涓嶆寚瀹氶儴闂�
- string toAllUser = "false";
- string message = HContext;
-
- // 璋冪敤鏂规硶鍙戦�佹秷鎭�
- response = await msg.SendTextMessage(accessToken, agentId, userIdList, deptIdList, toAllUser, message);
- ResponseData responseData = JsonConvert.DeserializeObject<ResponseData>(response);
- if (responseData.errcode == 0)
+ DBHelper.CustomWriteLog("寮傚父鍐呭鏁伴噺 "+ dt1.Tables[0].Rows.Count, DateTime.Now.ToString("yyyy-MM-dd"));
+ HContext = dt1.Tables[0].Rows[j]["鍐呭"].ToString();
+ HDeptName = dt1.Tables[0].Rows[j]["杞﹂棿"].ToString();
+ DBHelper.CustomWriteLog("寮傚父鍐呭鍊� "+ HContext, DateTime.Now.ToString("yyyy-MM-dd"));
+ DBHelper.CustomWriteLog("寮傚父杞﹂棿鍊� " + HDeptName, DateTime.Now.ToString("yyyy-MM-dd"));
+ if (!string.IsNullOrEmpty(HContext) && HContext.ToLower() != "null")
+ {
+ DBHelper.CustomWriteLog("鏌ヨ鍑鸿鍙戜俊鎭殑鍐呭" + HContext, DateTime.Now.ToString("yyyy-MM-dd"));
+ //鏌ヨ鍑鸿鍙戦�佺殑浜�
+ string newSql1 = @"select a.HDingDingUserID 閽夐拤id,a.Czymc 鎺ユ敹浜� from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId
+ left join System_UserGroup c on b.GroupId = c.GroupID where c.GroupName = '" + HDeptName + "宸ヨ壓寮傚父棰勮鎺ユ敹浜�'";
+ DBHelper.CustomWriteLog("鏌ヨ鍑鸿鍙戦�佺殑浜�:" + newSql1, DateTime.Now.ToString("yyyy-MM-dd"));
+ dt = oCN.RunProcReturn(newSql1, "Gy_Czygl");
+ DBHelper.CustomWriteLog("寮�濮嬭繘鍏ュ彂淇℃伅", DateTime.Now.ToString("yyyy-MM-dd"));
+ if (dt.Tables[0].Rows.Count > 0)
{
- DBHelper.CustomWriteLog("閽夐拤寮傚父棰勮鍙戦�佹垚鍔�", DateTime.Now.ToString("yyyy-MM-dd"));
- }
- else
- {
- Console.WriteLine(responseData.errcode);
- DBHelper.CustomWriteLog("閽夐拤杩斿洖淇℃伅:" + response, DateTime.Now.ToString("yyyy-MM-dd"));
- }
+ DBHelper.CustomWriteLog("杩涘叆鍙戜俊鎭�", DateTime.Now.ToString("yyyy-MM-dd"));
+ for (int i = 0; i < dt.Tables[0].Rows.Count; i++)
+ {
+ string HName = dt.Tables[0].Rows[i]["閽夐拤id"].ToString();
+ string Stares = dt.Tables[0].Rows[i]["鎺ユ敹浜�"].ToString();
+ MSG msg = new MSG();
+
+ //鑾峰彇浼佷笟鐨刟ccess_token鐨勫��
+ string response = msg.GetAccessToken(appKey, appSecret);
+ JObject responseJson = JObject.Parse(response);
+ // 鑾峰彇access_token鐨勫��
+ string accessToken = responseJson["accessToken"].ToString();
+
+ //璋冪敤鏂规硶鍙戦�佹秷鎭�
+ //string agentId = "3118119317";//閽夐拤鍚庡彴寤虹珛鐨勫皬绋嬪簭id
+ //鏂帿灏�
+ string agentId = "3151454458";//閽夐拤鍚庡彴寤虹珛鐨勫皬绋嬪簭id
+ string userIdList = HName;//閽夐拤浜哄憳鐨刬d
+ string deptIdList = "0"; // 绌哄瓧绗︿覆琛ㄧず涓嶆寚瀹氶儴闂�
+ string toAllUser = "false";
+ string message = HContext;
+
+ // 璋冪敤鏂规硶鍙戦�佹秷鎭�
+ response = await msg.SendTextMessage(accessToken, agentId, userIdList, deptIdList, toAllUser, message);
+ ResponseData responseData = JsonConvert.DeserializeObject<ResponseData>(response);
+ if (responseData.errcode == 0)
+ {
+ DBHelper.CustomWriteLog("閽夐拤寮傚父棰勮鍙戦�佹垚鍔�", DateTime.Now.ToString("yyyy-MM-dd"));
+ }
+ else
+ {
+ Console.WriteLine(responseData.errcode);
+ DBHelper.CustomWriteLog("閽夐拤杩斿洖淇℃伅:" + response, DateTime.Now.ToString("yyyy-MM-dd"));
+ }
+
+ }
+ DBHelper.CustomWriteLog("閽夐拤寮傚父棰勮鍙戦�佹垚鍔熷嚭鏉�", DateTime.Now.ToString("yyyy-MM-dd"));
+ }
+ DBHelper.CustomWriteLog("閽夐拤寮傚父棰勮鍙戦�佹垚鍔熷嚭鏉�1", DateTime.Now.ToString("yyyy-MM-dd"));
}
+ DBHelper.CustomWriteLog("閽夐拤寮傚父棰勮鍙戦�佹垚鍔熷嚭鏉�2", DateTime.Now.ToString("yyyy-MM-dd"));
}
-
+ DBHelper.CustomWriteLog("閽夐拤寮傚父棰勮鍙戦�佹垚鍔熷嚭鏉�3", DateTime.Now.ToString("yyyy-MM-dd"));
}
-
+ DBHelper.CustomWriteLog("閽夐拤寮傚父棰勮鍙戦�佹垚鍔熷嚭鏉�4", DateTime.Now.ToString("yyyy-MM-dd"));
lastNewTaskExecution = DateTime.Now;
}
diff --git a/DingDingMsg/DingDingMsg/Properties/PublishProfiles/FolderProfile1.pubxml.user b/DingDingMsg/DingDingMsg/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 4b6e1da..0317ff3 100644
--- a/DingDingMsg/DingDingMsg/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/DingDingMsg/DingDingMsg/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -4,6 +4,6 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2024-10-20T02:01:37.4542558Z;True|2024-10-14T12:26:09.3008697+08:00;True|2024-10-11T17:14:32.1495789+08:00;True|2024-10-11T17:01:27.4785195+08:00;True|2024-10-11T16:54:48.1999562+08:00;True|2024-10-11T14:35:28.0629168+08:00;True|2024-09-23T18:16:07.9656797+08:00;</History>
+ <History>True|2024-11-26T08:37:35.6037283Z;True|2024-11-26T16:19:56.1650507+08:00;True|2024-11-26T16:18:43.9351401+08:00;True|2024-11-26T15:59:33.8234090+08:00;True|2024-11-26T15:52:30.0966988+08:00;True|2024-11-26T15:45:06.3092696+08:00;True|2024-11-25T17:40:06.4971070+08:00;True|2024-11-25T15:49:10.2661307+08:00;True|2024-10-20T10:01:37.4542558+08:00;True|2024-10-14T12:26:09.3008697+08:00;True|2024-10-11T17:14:32.1495789+08:00;True|2024-10-11T17:01:27.4785195+08:00;True|2024-10-11T16:54:48.1999562+08:00;True|2024-10-11T14:35:28.0629168+08:00;True|2024-09-23T18:16:07.9656797+08:00;</History>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/DingDingMsg/DingDingMsg/bin/Debug/netcoreapp3.1/DingDingMsg.pdb b/DingDingMsg/DingDingMsg/bin/Debug/netcoreapp3.1/DingDingMsg.pdb
index 3be4c88..d577751 100644
--- a/DingDingMsg/DingDingMsg/bin/Debug/netcoreapp3.1/DingDingMsg.pdb
+++ b/DingDingMsg/DingDingMsg/bin/Debug/netcoreapp3.1/DingDingMsg.pdb
Binary files differ
diff --git a/DingDingMsg/DingDingMsg/bin/Debug/netcoreapp3.1/win-x64/DingDingMsg.pdb b/DingDingMsg/DingDingMsg/bin/Debug/netcoreapp3.1/win-x64/DingDingMsg.pdb
index f216892..f1d200b 100644
--- a/DingDingMsg/DingDingMsg/bin/Debug/netcoreapp3.1/win-x64/DingDingMsg.pdb
+++ b/DingDingMsg/DingDingMsg/bin/Debug/netcoreapp3.1/win-x64/DingDingMsg.pdb
Binary files differ
diff --git a/DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/DingDingMsg.csproj.AssemblyReference.cache b/DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/DingDingMsg.csproj.AssemblyReference.cache
deleted file mode 100644
index f5e894a..0000000
--- a/DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/DingDingMsg.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/DingDingMsg.csproj.FileListAbsolute.txt b/DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/DingDingMsg.csproj.FileListAbsolute.txt
index a89eb41..07c56bc 100644
--- a/DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/DingDingMsg.csproj.FileListAbsolute.txt
+++ b/DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/DingDingMsg.csproj.FileListAbsolute.txt
@@ -39,4 +39,3 @@
D:\鏅轰簯杩堟�漒DingDingMsg\DingDingMsg\DingDingMsg\obj\Debug\netcoreapp3.1\DingDingMsg.dll
D:\鏅轰簯杩堟�漒DingDingMsg\DingDingMsg\DingDingMsg\obj\Debug\netcoreapp3.1\DingDingMsg.pdb
D:\鏅轰簯杩堟�漒DingDingMsg\DingDingMsg\DingDingMsg\obj\Debug\netcoreapp3.1\DingDingMsg.genruntimeconfig.cache
-D:\鏅轰簯杩堟�漒DingDingMsg\DingDingMsg\DingDingMsg\obj\Debug\netcoreapp3.1\DingDingMsg.csproj.AssemblyReference.cache
diff --git a/DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/DingDingMsg.pdb b/DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/DingDingMsg.pdb
index 3be4c88..d577751 100644
--- a/DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/DingDingMsg.pdb
+++ b/DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/DingDingMsg.pdb
Binary files differ
diff --git a/DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/win-x64/DingDingMsg.pdb b/DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/win-x64/DingDingMsg.pdb
index f216892..f1d200b 100644
--- a/DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/win-x64/DingDingMsg.pdb
+++ b/DingDingMsg/DingDingMsg/obj/Debug/netcoreapp3.1/win-x64/DingDingMsg.pdb
Binary files differ
diff --git a/DingDingMsg_EarlyWarning/bin/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.pdb b/DingDingMsg_EarlyWarning/bin/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.pdb
index 819cb31..08a31ce 100644
--- a/DingDingMsg_EarlyWarning/bin/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.pdb
+++ b/DingDingMsg_EarlyWarning/bin/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.pdb
Binary files differ
diff --git a/DingDingMsg_EarlyWarning/obj/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.csproj.AssemblyReference.cache b/DingDingMsg_EarlyWarning/obj/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.csproj.AssemblyReference.cache
deleted file mode 100644
index a323781..0000000
--- a/DingDingMsg_EarlyWarning/obj/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/DingDingMsg_EarlyWarning/obj/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.csproj.FileListAbsolute.txt b/DingDingMsg_EarlyWarning/obj/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.csproj.FileListAbsolute.txt
index ea89b54..50cb2de 100644
--- a/DingDingMsg_EarlyWarning/obj/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.csproj.FileListAbsolute.txt
+++ b/DingDingMsg_EarlyWarning/obj/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.csproj.FileListAbsolute.txt
@@ -18,4 +18,3 @@
D:\鏅轰簯杩堟�漒DingDingMsg\DingDingMsg_EarlyWarning\obj\Debug\netcoreapp3.1\DingDingMsg_EarlyWarning.dll
D:\鏅轰簯杩堟�漒DingDingMsg\DingDingMsg_EarlyWarning\obj\Debug\netcoreapp3.1\DingDingMsg_EarlyWarning.pdb
D:\鏅轰簯杩堟�漒DingDingMsg\DingDingMsg_EarlyWarning\obj\Debug\netcoreapp3.1\DingDingMsg_EarlyWarning.genruntimeconfig.cache
-D:\鏅轰簯杩堟�漒DingDingMsg\DingDingMsg_EarlyWarning\obj\Debug\netcoreapp3.1\DingDingMsg_EarlyWarning.csproj.AssemblyReference.cache
diff --git a/DingDingMsg_EarlyWarning/obj/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.pdb b/DingDingMsg_EarlyWarning/obj/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.pdb
index 819cb31..08a31ce 100644
--- a/DingDingMsg_EarlyWarning/obj/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.pdb
+++ b/DingDingMsg_EarlyWarning/obj/Debug/netcoreapp3.1/DingDingMsg_EarlyWarning.pdb
Binary files differ
--
Gitblit v1.9.1