流程处理增加消息通知

修复消息标记已读、删除

OpenAuth.App/SysMessage/SysMessageApp.cs

@@ -1,6 +1,8 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Infrastructure;
+using Microsoft.Extensions.Logging;
 using OpenAuth.App.Interface;
 using OpenAuth.App.Request;
 using OpenAuth.App.Response;
@@ -14,6 +16,7 @@ namespace OpenAuth.App
     public class SysMessageApp : BaseStringApp<SysMessage,OpenAuthDBContext>
     {
         private RevelanceManagerApp _revelanceApp;
+        private readonly ILogger<SysMessageApp> _logger;
 
         /// <summary>
         /// 加载列表
@@ -27,12 +30,18 @@ namespace OpenAuth.App
             }
 
             var result = new TableData();
-            var objs = UnitWork.Find<SysMessage>(u =>u.ToId == loginContext.User.Id);
+            var objs = UnitWork.Find<SysMessage>(u =>u.ToId == loginContext.User.Id && u.ToStatus != -1);
 
             if (!string.IsNullOrEmpty(request.key))
             {
                 objs = objs.Where(u => u.Title.Contains(request.key) || u.Id.Contains(request.key));
             }
+            
+            //过滤消息状态
+            if (request.Status != 999)
+            {
+                objs = objs.Where(u => u.ToStatus == request.Status);
+            }
 
             result.data = objs.OrderBy(u => u.Id)
                 .Skip((request.page - 1) * request.limit)
@@ -45,20 +54,74 @@ namespace OpenAuth.App
         {
             Repository.Add(obj);
         }
-        
-        public void Update(SysMessage obj)
+
+        /// <summary>
+        /// 发送指定消息给用户
+        /// </summary>
+        /// <param name="user"></param>
+        /// <param name="message"></param>
+        public void SendMsgTo(string userId, string message)
         {
-            UnitWork.Update<SysMessage>(u => u.Id == obj.Id, u => new SysMessage
+            User user = null;
+            if (userId == Guid.Empty.ToString())
             {
-               //todo:要修改的字段赋值
+                user = new User
+                {
+                    Name = Define.SYSTEM_USERNAME,
+                    Id = userId
+                };
+            }
+            else
+            {
+                 user = UnitWork.FirstOrDefault<User>(u => u.Id == userId);
+            }
+            if (user == null)
+            {
+                _logger.LogError($"未能找到用户{userId},不能给该用户发送消息");
+                return;
+            }
+            Repository.Add(new SysMessage
+            {
+                ToId = user.Id,
+                ToName = user.Name,
+                TypeName = "系统消息",
+                TypeId ="SYS_MSG",
+                FromId = Guid.Empty.ToString(),
+                FromName = "系统管理员",
+                Content = message,
+                CreateTime = DateTime.Now
+            });
+        }
+
+        /// <summary>
+        /// 消息变为已读
+        /// </summary>
+        /// <param name="msgid"></param>
+        public void Read(ReadMsgReq req)
+        {
+            UnitWork.Update<SysMessage>(u => u.Id == req.Id, u => new SysMessage
+            {
+                ToStatus = 1
+            });
+        }
+        /// <summary>
+        /// 消息采用逻辑删除
+        /// </summary>
+        /// <param name="ids"></param>
+        public void Del(string[] ids)
+        {
+            UnitWork.Update<SysMessage>(u => ids.Contains(u.Id), u => new SysMessage
+            {
+               ToStatus = -1 //逻辑删除
             });
 
         }
 
         public SysMessageApp(IUnitWork<OpenAuthDBContext> unitWork, IRepository<SysMessage,OpenAuthDBContext> repository,
-            RevelanceManagerApp app,IAuth auth) : base(unitWork, repository, auth)
+            RevelanceManagerApp app,IAuth auth, ILogger<SysMessageApp> logger) : base(unitWork, repository, auth)
         {
             _revelanceApp = app;
+            _logger = logger;
         }
     }
 }