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/Program.cs |  151 +++++++++++++++++++++++++++++++-------------------
 1 files changed, 93 insertions(+), 58 deletions(-)

diff --git a/DingDingMsg/DingDingMsg/Program.cs b/DingDingMsg/DingDingMsg/Program.cs
index 0a23638..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)
         {
             //鏈湴
@@ -20,7 +22,7 @@
             //鏂帿灏�
             string appKey = "dingkdddbhdcssk7jduw";
             string appSecret = "iv07c-GLfJPnzfJaNAAOfJDl3Z-eODvDAhlInMZCZhGorkle5Evbaxx3ImylvdjQ";
-            Console.WriteLine("绋嬪簭姝e湪鎵ц,璇蜂笉瑕佸叧闂�!!!!");
+            Console.WriteLine("瀹夌伅绋嬪簭姝e湪鎵ц,璇蜂笉瑕佸叧闂�!!!!");
             // 璁板綍涓婃鎵ц鏂板畾鏃朵换鍔$殑鏃堕棿
             DateTime lastNewTaskExecution = DateTime.MinValue;
             while (true)
@@ -77,81 +79,114 @@
                 }
 
                 //寮傚父宸ヨ壓鍙傛暟棰勮锛堟瘡 5 鍒嗛挓鎵ц涓�娆★級
-                if ((DateTime.Now - lastNewTaskExecution).TotalMinutes >= 5)
+                DBHelper.CustomWriteLog("寮�濮嬭繘鍏ユ墽琛屽惊鐜�:", DateTime.Now.ToString("yyyy-MM-dd"));
+                if ((DateTime.Now - lastNewTaskExecution).TotalMinutes >= 4)
                 {
+                    DBHelper.CustomWriteLog("宸茶繘鍏ユ墽琛屽惊鐜�:", DateTime.Now.ToString("yyyy-MM-dd"));
                     //鏌ヨ鍑鸿鏇存柊宸茬粡鍙戦�佺殑寮傚父鍙傛暟
-                    string Sql = "select HItemID from Sb_EquipMentCollectionTechParam_ERR where HCreateTime>=DATEADD(minute, - 1, GETDATE());";
-                    dt = oCN.RunProcReturn(Sql, "Sb_EquipMentCollectionTechParam_ERR");
+                    string Sql = "select HItemID from Sb_EquipMentCollectionTechParam_ERR where HCreateTime>=DATEADD(minute, - 1, GETDATE()) AND HSendFlag = 0";
+                    DBHelper.CustomWriteLog("鏌ヨ鍑哄紓甯哥殑鍙傛暟:"+Sql, DateTime.Now.ToString("yyyy-MM-dd"));
+                    dt = oCN.RunProcReturn(Sql, "Sb_EquipMentCollectionTechParam_ERR");                 
+                    if (dt != null && dt.Tables[0].Rows.Count > 0)
+                    {
+                        List<string> itemIds = new List<string>();
+                        foreach (DataRow row in dt.Tables[0].Rows)
+                        {
+                            itemIds.Add(row["HItemID"].ToString());
+                        }
+                        DBHelper.CustomWriteLog("杩斿洖鐨勫紓甯稿弬鏁伴泦鍚堬細" + string.Join(", ", itemIds), DateTime.Now.ToString("yyyy-MM-dd"));
+                    }
+                    DBHelper.CustomWriteLog("瑕佽繘鍏ユ洿鏂扮殑璇彞", DateTime.Now.ToString("yyyy-MM-dd"));
                     if (dt.Tables[0].Rows.Count > 0)
                     {
+                        DBHelper.CustomWriteLog("杩涘叆鏇存柊鐨勮鍙�", DateTime.Now.ToString("yyyy-MM-dd"));
                         //鏇存柊瑕佸彂閫佺殑鍗曞瓙
                         if (dt != null && dt.Tables != null && dt.Tables.Count > 0)
                         {
                             for (int i = 0; i < dt.Tables[0].Rows.Count; i++)
                             {
                                 string ycSql = "update Sb_EquipMentCollectionTechParam_ERR set HSendFlag = 1 where HItemID = " + dt.Tables[0].Rows[i]["HItemID"].ToString();
-                                DBHelper.CustomWriteLog("閽夐拤寮傚父棰勮鏇存柊璇彞:" + ycSql, DateTime.Now.ToString("yyyy - MM - dd"));
+                                DBHelper.CustomWriteLog("閽夐拤寮傚父棰勮鏇存柊璇彞:" + ycSql, DateTime.Now.ToString("yyyy-MM-dd"));
                                 oCN.RunProc(ycSql);
                             }
                         }
                         else
                         {
                             // 鍙互鍦ㄨ繖閲屾坊鍔犻�傚綋鐨勫鐞嗭紝姣斿璁板綍鏃ュ織琛ㄦ槑娌℃湁鍙鐞嗙殑鏁版嵁琛�
-                            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 鍐呭";                       
-                        dt = oCN.RunProcReturn(newSql, "h_v_Sb_EquipMentCollectionTechParam_ERRList");                      
-                        string HContext = "";
-                        HContext = dt.Tables[0].Rows[0]["鍐呭"].ToString();
-                        //鏌ヨ鍑鸿鍙戦�佺殑浜�
-                        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 = '宸ヨ壓寮傚父棰勮鎺ユ敹浜�'";
-                        DBHelper.CustomWriteLog("鏌ヨ鍑鸿鍙戦�佺殑浜�:" + newSql1, DateTime.Now.ToString("yyyy-MM-dd"));
-                        dt = oCN.RunProcReturn(newSql1, "Gy_Czygl");                       
-                        if (dt.Tables[0].Rows.Count > 0)
-                        {
-                            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"));
                         }
-                        
+                        //鏌ヨ鍑鸿鍙戜俊鎭殑寮傚父鍙傛暟
+                      
+                        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"));
+                        dt1 = oCN.RunProcReturn(newSql, "h_v_Sb_EquipMentCollectionTechParam_ERRList");                      
+                        string HContext = ""; string HDeptName = "";
+                        for (int j = 0; j < dt1.Tables[0].Rows.Count; j++)
+                        {
+                            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"));
+                                    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;
                 }
 

--
Gitblit v1.9.1