监听ActiveTask 的notice错误

TEAMModelFunction/ActivityHttpTrigger.cs

@@ -383,5 +383,24 @@ namespace TEAMModelFunction
             }
             return new OkObjectResult(new { });
         }
+        /// <summary>
+        /// 设置问卷调查未初始化学生列表的业务
+        /// </summary>
+        /// <param name="req"></param>
+        /// <param name="log"></param>
+        /// <returns></returns>
+        [FunctionName("refresh-stu-activity")]
+        public async Task<IActionResult> RefreshStuActivity(
+            [HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequest req,
+            ILogger log)
+        {
+            string id = "";
+            string code = "";
+            var client = _azureCosmos.GetCosmosClient();
+            List<MQActivity> datas = new List<MQActivity>();
+            var item = client.GetContainer("TEAMModelOS", "Common").ReadItemAsync<MQActivity>(id , new Azure.Cosmos.PartitionKey($"{code}"));
+            return null;
+        }
+
     }
 }

TEAMModelFunction/MonitorServicesBus.cs

@@ -158,118 +158,7 @@ namespace TEAMModelFunction
                 await _dingDing.SendBotMsg($"StuListServiceBus-StuList\n{ex.Message}{ex.StackTrace}", GroupNames.成都开发測試群組);
             }
         }
-        [FunctionName("Notice")]
-        public async Task Notice([ServiceBusTrigger("%Azure:ServiceBus:NoticeTask%", "notice", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
-        {
-            var client = _azureRedis.GetRedisClient(8);
-            try
-            {
-
-                Console.WriteLine(msg);
-                // List<Task<string>> tasks = new List<Task<string>>();
-                //List<Task> sessionTasks = new List<Task>();
-                var jsonMsg = JsonDocument.Parse(msg);
-                Notice notice = msg.ToObject<Notice>();
-                var blobcntr = "";
-
-                if (notice.scope.Equals("school"))
-                {
-                    blobcntr = notice.school;
-                }
-                else
-                {
-                    blobcntr = notice.creatorId;
-                }
-                if (string.IsNullOrEmpty(blobcntr))
-                {
-                    return;
-                }
-#if DEBUG
-                await _dingDing.SendBotMsg($"NoticeServiceBus-Notice：\n发起通知{msg}", GroupNames.成都开发測試群組);
-#endif
-                var urlNotice = $"{notice.msgId}.json";
-                var blobNotice = new
-                {
-                    notice.type,
-                    notice.priority,
-                    notice.body,
-                    notice.creation,
-                    notice.expire,
-                    notice.creatorId
-
-                };
-                await _azureStorage.UploadFileByContainer(blobcntr, blobNotice.ToJsonString(), "notice", urlNotice);
-                var urlReceiver = $"{notice.msgId}_receiver.json";
-                var blobReceiver = new
-                {
-                    notice.stuids,
-                    notice.tmdids
-                };
-                await _azureStorage.UploadFileByContainer(blobcntr, blobReceiver.ToJsonString(), "notice", urlReceiver);
-                long now = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-                // "ttl":2592000,不能超过30天（2592000），一天（3600），一周（25200）
 
-                if (notice.stuids.IsNotEmpty())
-                {
-                    //  List<Receiver> receivers = new List<Receiver>();
-                    foreach (var stu in notice.stuids)
-                    {
-                        Receiver receiver = new Receiver
-                        {
-                            id = notice.msgId,
-                            pk = "Receiver",
-                            status = 0,
-                            scope = "school",
-                            ctime = now,
-                            urlNotice = $"/notice/{urlNotice}",
-                            rid = $"{stu.schoolId}-{stu.id}"
-                        };
-                        var url = $"{stu.id}/receive/{notice.msgId}.json";
-                        await client.HashSetAsync($"Notice:Receiver:{stu.schoolId}-{stu.id}", notice.msgId, $"/student/{url}");
-                        // await client.GetContainer("TEAMModelOS", "Common").UpsertItemAsync<Receiver>(receiver,new Azure.Cosmos.PartitionKey(receiver.code));
-                        //  /student/{stuid}/receive/{notice.sid}.json
-                        //存放通知到学生容器空间
-
-                        await _azureStorage.UploadFileByContainer(blobcntr, receiver.ToJsonString(), "student", url);
-                        var messageBlob = new ServiceBusMessage(receiver.ToJsonString()) { SessionId = $"{stu.schoolId}-{stu.id}" };
-                        // messageBlob.ApplicationProperties.Add("name", "Receiver");
-                        await _serviceBus.GetServiceBusClient().SendMessageAsync("notice-task", messageBlob);
-                    }
-                }
-                if (notice.tmdids.IsNotEmpty())
-                {
-                    foreach (var tmdid in notice.tmdids)
-                    {
-                        Receiver receiver = new Receiver
-                        {
-                            id = notice.msgId,
-                            pk = "Receiver",
-                            status = 0,
-                            //school = stu.schoolId,
-                            scope = "school",
-
-                            ctime = now,
-                            urlNotice = $"/notice/{urlNotice}",
-                            rid = $"{tmdid}"
-                        };
-                        var url = $"{notice.msgId}.json";
-                        await client.HashSetAsync($"Notice:Receiver:{tmdid}", notice.msgId, new { now, url = $"/receive/{url}" }.ToJsonString());
-                        //await client.GetContainer("TEAMModelOS", "Common").UpsertItemAsync<Receiver>(receiver, new Azure.Cosmos.PartitionKey(receiver.code));
-                        //  /student/{stuid}/receive/{notice.sid}.json
-                        //存放通知到学生容器空间
-
-                        await _azureStorage.UploadFileByContainer(blobcntr, receiver.ToJsonString(), "receive", url);
-                        var messageBlob = new ServiceBusMessage(receiver.ToJsonString()) { SessionId = $"{tmdid}" };
-                        //messageBlob.ApplicationProperties.Add("name", "Receiver");
-                        await _serviceBus.GetServiceBusClient().SendMessageAsync("notice-task", messageBlob);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                await _dingDing.SendBotMsg($"NoticeServiceBus-Notice\n{ex.Message}{ex.StackTrace}", GroupNames.成都开发測試群組);
-            }
-        }
 
     }
 }

TEAMModelFunction/NoticeServiceBus.cs

@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Azure.Cosmos;
+using Azure.Messaging.ServiceBus;
+using Microsoft.Azure.WebJobs;
+using Microsoft.Azure.WebJobs.Host;
+using Microsoft.Extensions.Logging;
+using StackExchange.Redis;
+using TEAMModelOS.SDK.DI;
+using TEAMModelOS.SDK.Extension;
+using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
+using TEAMModelOS.SDK.Models;
+using TEAMModelOS.SDK.Models.Cosmos.Common;
+namespace TEAMModelFunction
+{
+    public class NoticeServiceBus
+    {
+        private readonly AzureCosmosFactory _azureCosmos;
+        private readonly DingDing _dingDing;
+        private readonly AzureStorageFactory _azureStorage;
+        private readonly AzureRedisFactory _azureRedis;
+        private readonly AzureServiceBusFactory _serviceBus;
+        public NoticeServiceBus(AzureCosmosFactory azureCosmos, DingDing dingDing, AzureStorageFactory azureStorage, AzureRedisFactory azureRedis, AzureServiceBusFactory serviceBus)
+        {
+            _azureCosmos = azureCosmos;
+            _dingDing = dingDing;
+            _azureStorage = azureStorage;
+            _azureRedis = azureRedis;
+            _serviceBus = serviceBus;
+        }
+        [FunctionName("Notice")]
+        public async Task Notice([ServiceBusTrigger("%Azure:ServiceBus:ActiveTask%", "notice", Connection = "Azure:ServiceBus:ConnectionString")] string msg)
+        {
+            var client = _azureRedis.GetRedisClient(8);
+            try
+            {
+
+                Console.WriteLine(msg);
+                // List<Task<string>> tasks = new List<Task<string>>();
+                //List<Task> sessionTasks = new List<Task>();
+                var jsonMsg = JsonDocument.Parse(msg);
+                Notice notice = msg.ToObject<Notice>();
+                var blobcntr = "";
+
+                if (notice.scope.Equals("school"))
+                {
+                    blobcntr = notice.school;
+                }
+                else
+                {
+                    blobcntr = notice.creatorId;
+                }
+                if (string.IsNullOrEmpty(blobcntr))
+                {
+                    return;
+                }
+#if DEBUG
+                await _dingDing.SendBotMsg($"NoticeServiceBus-Notice：\n发起通知{msg}", GroupNames.成都开发測試群組);
+#endif
+                var urlNotice = $"{notice.msgId}.json";
+                var blobNotice = new
+                {
+                    notice.type,
+                    notice.priority,
+                    notice.body,
+                    notice.creation,
+                    notice.expire,
+                    notice.creatorId
+
+                };
+                await _azureStorage.UploadFileByContainer(blobcntr, blobNotice.ToJsonString(), "notice", urlNotice);
+                var urlReceiver = $"{notice.msgId}_receiver.json";
+                var blobReceiver = new
+                {
+                    notice.stuids,
+                    notice.tmdids
+                };
+                await _azureStorage.UploadFileByContainer(blobcntr, blobReceiver.ToJsonString(), "notice", urlReceiver);
+                long now = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+                // "ttl":2592000,不能超过30天（2592000），一天（3600），一周（25200）
+
+                if (notice.stuids.IsNotEmpty())
+                {
+                    //  List<Receiver> receivers = new List<Receiver>();
+                    foreach (var stu in notice.stuids)
+                    {
+                        Receiver receiver = new Receiver
+                        {
+                            id = notice.msgId,
+                            pk = "Receiver",
+                            status = 0,
+                            scope = "school",
+                            ctime = now,
+                            urlNotice = $"/notice/{urlNotice}",
+                            rid = $"{stu.schoolId}-{stu.id}"
+                        };
+                        var url = $"{stu.id}/receive/{notice.msgId}.json";
+                        await client.HashSetAsync($"Notice:Receiver:{stu.schoolId}-{stu.id}", notice.msgId, $"/student/{url}");
+                        // await client.GetContainer("TEAMModelOS", "Common").UpsertItemAsync<Receiver>(receiver,new Azure.Cosmos.PartitionKey(receiver.code));
+                        //  /student/{stuid}/receive/{notice.sid}.json
+                        //存放通知到学生容器空间
+
+                        await _azureStorage.UploadFileByContainer(blobcntr, receiver.ToJsonString(), "student", url);
+                        var messageBlob = new ServiceBusMessage(receiver.ToJsonString()) { SessionId = $"{stu.schoolId}-{stu.id}" };
+                        // messageBlob.ApplicationProperties.Add("name", "Receiver");
+                        await _serviceBus.GetServiceBusClient().SendMessageAsync("notice-task", messageBlob);
+                    }
+                }
+                if (notice.tmdids.IsNotEmpty())
+                {
+                    foreach (var tmdid in notice.tmdids)
+                    {
+                        Receiver receiver = new Receiver
+                        {
+                            id = notice.msgId,
+                            pk = "Receiver",
+                            status = 0,
+                            //school = stu.schoolId,
+                            scope = "school",
+
+                            ctime = now,
+                            urlNotice = $"/notice/{urlNotice}",
+                            rid = $"{tmdid}"
+                        };
+                        var url = $"{notice.msgId}.json";
+                        await client.HashSetAsync($"Notice:Receiver:{tmdid}", notice.msgId, new { now, url = $"/receive/{url}" }.ToJsonString());
+                        //await client.GetContainer("TEAMModelOS", "Common").UpsertItemAsync<Receiver>(receiver, new Azure.Cosmos.PartitionKey(receiver.code));
+                        //  /student/{stuid}/receive/{notice.sid}.json
+                        //存放通知到学生容器空间
+
+                        await _azureStorage.UploadFileByContainer(blobcntr, receiver.ToJsonString(), "receive", url);
+                        var messageBlob = new ServiceBusMessage(receiver.ToJsonString()) { SessionId = $"{tmdid}" };
+                        //messageBlob.ApplicationProperties.Add("name", "Receiver");
+                        await _serviceBus.GetServiceBusClient().SendMessageAsync("notice-task", messageBlob);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                await _dingDing.SendBotMsg($"NoticeServiceBus-Notice\n{ex.Message}{ex.StackTrace}", GroupNames.成都开发測試群組);
+            }
+        }
+
+    }
+}

TEAMModelFunction/TriggerExam.cs

@@ -161,7 +161,7 @@ namespace TEAMModelFunction
                     };
                     //var messageBlob = new ServiceBusMessage(notice.ToJsonString());
                     //messageBlob.ApplicationProperties.Add("name", "Notice");
-                    //await _serviceBus.GetServiceBusClient().SendMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:NoticeTask"), messageBlob);
+                    //await _serviceBus.GetServiceBusClient().SendMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), messageBlob);
                     #endregion
                     if (examClassResults.Count == 0)
                     {

TEAMModelFunction/TriggerSurvey.cs

@@ -139,7 +139,7 @@ namespace TEAMModelFunction
                         };
                         //var messageBlob = new ServiceBusMessage(notice.ToJsonString());
                         //messageBlob.ApplicationProperties.Add("name", "Notice");
-                        //await _serviceBus.GetServiceBusClient().SendMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:NoticeTask"), messageBlob);
+                        //await _serviceBus.GetServiceBusClient().SendMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), messageBlob);
                         #endregion
 #if DEBUG
                         await _dingDing.SendBotMsg($"问卷调查{tdata.id}写入完成！", GroupNames.成都开发測試群組);