Browse Source

signalr
update

leiy 1 year ago
parent
commit
061b7b1b92

+ 4 - 4
OASystem/.claudiaideconfig

@@ -1,12 +1,12 @@
 {
-  "BackgroundImageAbsolutePath": "C:\\Users\\Lyyyi\\Pictures\\Camera Roll\\wallhaven2.png",
-  "BackgroundImagesDirectoryAbsolutePath": "C:\\Users\\Lyyyi\\Pictures\\Camera Roll",
+  "BackgroundImageAbsolutePath": "C:\\Users\\Lyyyi\\Pictures\\Camera Roll\\img\\wallhaven2.png",
+  "BackgroundImagesDirectoryAbsolutePath": "C:\\Users\\Lyyyi\\Pictures\\Camera Roll\\img",
   "BlurMethod": 0,
   "BlurRadius": 0,
   "ExpandToIDE": true,
   "Extensions": ".png, .jpg, .gif, .bmp",
-  "ImageBackgroundType": 1,
-  "ImageFadeAnimationInterval": "PT2S",
+  "ImageBackgroundType": 4,
+  "ImageFadeAnimationInterval": "PT0S",
   "ImageStretch": 1,
   "IsLimitToMainlyEditorWindow": true,
   "IsTransparentToContentMargin": true,

+ 14 - 11
OASystem/OASystem.Api/Controllers/ClientHubController.cs

@@ -56,21 +56,24 @@ namespace OASystem.API.Controllers
         /// <param name="hubContext"></param>
         /// <returns></returns>
         [HttpPost("SendCustomUserMessage", Name = "SendCustomUserMessage")]
-        public async Task<IActionResult> SendCustomUserMessage(int userId,string date )
+        public async Task<IActionResult> SendCustomUserMessage(List<int> userIds,string title,string content )
         {
             string connId = string.Empty;
 
-            UserModel user = UserStore.OnlineUser.Where(it => it.UserId == userId).FirstOrDefault();
-            if (user != null)
-            {
-                connId = user.ConnectionId;
-            }
-            else
-            {
-                return Ok("Send Failed! User Not Online!");
-            }
+            //UserModel user = UserStore.OnlineUser.Where(it => it.UserId == userId).FirstOrDefault();
+            //if (user != null)
+            //{
+            //    connId = user.ConnectionId;
+            //}
+            //else
+            //{
+            //    return Ok("Send Failed! User Not Online!");
+            //}
+
+            //await _hubContext.Clients.Client(connId).ReceiveMessage(date);
+
+            GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.Announcement,title, content, userIds);
 
-            await _hubContext.Clients.Client(connId).ReceiveMessage(date);
             return Ok("Send Successful!");
         }
 

+ 2 - 2
OASystem/OASystem.Infrastructure/Repositories/System/MessageRepository.cs

@@ -61,7 +61,7 @@ namespace OASystem.Infrastructure.Repositories.System
                     Param = msgDto.Param,
                 };
 
-                int? msgId = await _sqlSugar.Insertable(message).ExecuteReturnIdentityAsync();
+                int? msgId = _sqlSugar.Insertable(message).ExecuteReturnIdentity();
                 if (!msgId.HasValue) { _sqlSugar.RollbackTran(); return false; }
 
                 List<Sys_MessageReadAuth> messageReadAuths = new List<Sys_MessageReadAuth>();
@@ -82,7 +82,7 @@ namespace OASystem.Infrastructure.Repositories.System
                     messageReadAuths.Add(messageReadAuth);
                 }
 
-                int? readIds = await _sqlSugar.Insertable<Sys_MessageReadAuth>(messageReadAuths).ExecuteCommandAsync();
+                int? readIds = _sqlSugar.Insertable<Sys_MessageReadAuth>(messageReadAuths).ExecuteCommand();
                 if (!readIds.HasValue)
                 {
                     _sqlSugar.RollbackTran();