Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/OrderController.cs

@@ -1,4 +1,5 @@
 using DotNetCore.CAP;
+using FluentValidation;
 using Hotline.Api.Filter;
 using Hotline.Application.CallCenter;
 using Hotline.Application.ExportExcel;
@@ -23,7 +24,6 @@ using Hotline.Orders.Notifications;
 using Hotline.OrderTranspond;
 using Hotline.Push.FWMessage;
 using Hotline.Push.Notifies;
-using Hotline.Repository.SqlSugar.CallCenter;
 using Hotline.Repository.SqlSugar.Extensions;
 using Hotline.Repository.SqlSugar.Ts;
 using Hotline.SeedData;
@@ -32,8 +32,8 @@ using Hotline.Settings.Hotspots;
 using Hotline.Settings.TimeLimitDomain;
 using Hotline.Settings.TimeLimits;
 using Hotline.Share.Dtos;
+using Hotline.Share.Dtos.Article;
 using Hotline.Share.Dtos.CallCenter;
-using Hotline.Share.Dtos.File;
 using Hotline.Share.Dtos.FlowEngine;
 using Hotline.Share.Dtos.FlowEngine.Workflow;
 using Hotline.Share.Dtos.Order;
@@ -44,6 +44,7 @@ using Hotline.Share.Dtos.Order.Publish;
 using Hotline.Share.Dtos.Org;
 using Hotline.Share.Dtos.Settings;
 using Hotline.Share.Dtos.Snapshot;
+using Hotline.Share.Enums.Article;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Enums.FlowEngine;
 using Hotline.Share.Enums.Order;
@@ -56,6 +57,7 @@ using Hotline.Snapshot;
 using Hotline.Snapshot.Interfaces;
 using Hotline.Tools;
 using Hotline.Users;
+using Hotline.Validators.FlowEngine;
 using Hotline.YbEnterprise.Sdk;
 using Mapster;
 using MapsterMapper;
@@ -67,20 +69,12 @@ using MiniExcelLibs;
 using SqlSugar;
 using System.Text;
 using System.Text.Json;
-using FluentValidation;
-using Hotline.Validators.FlowEngine;
 using XF.Domain.Authentications;
 using XF.Domain.Cache;
-using XF.Domain.Entities;
 using XF.Domain.Exceptions;
 using XF.Domain.Repository;
 using XF.Utility.EnumExtensions;
 using OrderDto = Hotline.Share.Dtos.Order.OrderDto;
-using System.Threading;
-using Hotline.Realtimes;
-using Hotline.Article;
-using Hotline.Share.Dtos.Article;
-using Hotline.Api.Realtimes;
 
 namespace Hotline.Api.Controllers;
 
@@ -162,8 +156,6 @@ public class OrderController : BaseController
     private readonly IRepository<SystemDicData> _sysDicDataRepository;
     private readonly IRepository<SystemOrganize> _systemOrganizeRepository;
     private readonly IRepository<OrderComplement> _orderComplementRepository;
-    private readonly IRealtimeService _realtimeService;
-    private readonly IRepository<NotificationWaitSend> _notificationWaitSendRepository;
 
     public OrderController(
         IOrderDomainService orderDomainService,
@@ -237,9 +229,7 @@ public class OrderController : BaseController
         IOrderSnapshotApplication orderSnapshotApplication,
         IRepository<SystemDicData> sysDicDataRepository,
         IRepository<SystemOrganize> systemOrganizeRepository,
-        IRepository<OrderComplement> orderComplementRepository,
-        IRealtimeService realtimeService,
-        IRepository<NotificationWaitSend> notificationWaitSendRepository)
+        IRepository<OrderComplement> orderComplementRepository)
     {
         _orderDomainService = orderDomainService;
         _orderRepository = orderRepository;
@@ -313,8 +303,6 @@ public class OrderController : BaseController
         _sysDicDataRepository = sysDicDataRepository;
         _systemOrganizeRepository = systemOrganizeRepository;
         _orderComplementRepository = orderComplementRepository;
-        _realtimeService = realtimeService;
-        _notificationWaitSendRepository = notificationWaitSendRepository;
     }
 
     #endregion
@@ -5540,13 +5528,13 @@ public class OrderController : BaseController
             if (specialAny) throw UserFriendlyException.SameMessage("工单已存在待审批特提信息！");
             if (order.Workflow.IsInCountersign) throw UserFriendlyException.SameMessage("工单会签中，无法进行退回！");
 
-			var (currentStep, prevStep, steps, isOrgToCenter, isSecondToFirstOrgLevel) = await _workflowApplication.GetPreviousInformationAsync(
-			   dto.WorkflowId, _sessionContext.RequiredUserId, _sessionContext.RequiredOrgId, _sessionContext.Roles, HttpContext.RequestAborted);
+            var (currentStep, prevStep, steps, isOrgToCenter, isSecondToFirstOrgLevel) = await _workflowApplication.GetPreviousInformationAsync(
+               dto.WorkflowId, _sessionContext.RequiredUserId, _sessionContext.RequiredOrgId, _sessionContext.Roles, HttpContext.RequestAborted);
 
-			if (oneSendBack && isOrgToCenter && _appOptions.Value.IsZiGong)
+            if (oneSendBack && isOrgToCenter && _appOptions.Value.IsZiGong)
             {
                 if (order.SendBackAuditEndTime.HasValue && order.SendBackAuditEndTime.Value < DateTime.Now)
-                    throw UserFriendlyException.SameMessage("工单截至退回时间【" + order.SendBackAuditEndTime.Value.ToString("yyyy-MM-dd HH:mm:ss") +"】,无法进行退回！");
+                    throw UserFriendlyException.SameMessage("工单截至退回时间【" + order.SendBackAuditEndTime.Value.ToString("yyyy-MM-dd HH:mm:ss") + "】,无法进行退回！");
 
                 var sendBackAgain = await _orderSendBackAuditRepository.Queryable().Where(x => x.OrderId == dto.OrderId && x.IsReturnAgain == false).AnyAsync();
                 if (sendBackAgain)
@@ -5557,30 +5545,30 @@ public class OrderController : BaseController
             {
                 await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { Status = EOrderStatus.SendBackAudit })
                     .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
-				audit.ApplyOrgId = currentStep.AcceptorOrgId;
-				audit.ApplyOrgName = currentStep!.AcceptorOrgName;
-				///判断是否指定
-				
+                audit.ApplyOrgId = currentStep.AcceptorOrgId;
+                audit.ApplyOrgName = currentStep!.AcceptorOrgName;
+                ///判断是否指定
+
                 var assignStep = new WorkflowStep();
-				if (audit.IsAssign.Value)
+                if (audit.IsAssign.Value)
                 {
                     assignStep = steps.FirstOrDefault(x => x.Id == dto.AssignStepId);
-				}
-				audit.SendBackOrgId = audit.IsAssign.Value ? assignStep .HandlerOrgId: prevStep.HandlerOrgId;
-				audit.SendBackOrgName = audit.IsAssign.Value ? assignStep.HandlerOrgName : prevStep.HandlerOrgName;
-				audit.SendBackStepName = audit.IsAssign.Value ? assignStep.Name : prevStep.Name;
-
-				audit.WorkflowStepSendBackCrTime = currentStep.CreationTime;
-				audit.TraceId = currentStep.Id;
-				await _orderSendBackAuditRepository.AddAsync(audit, HttpContext.RequestAborted);
-			}
+                }
+                audit.SendBackOrgId = audit.IsAssign.Value ? assignStep.HandlerOrgId : prevStep.HandlerOrgId;
+                audit.SendBackOrgName = audit.IsAssign.Value ? assignStep.HandlerOrgName : prevStep.HandlerOrgName;
+                audit.SendBackStepName = audit.IsAssign.Value ? assignStep.Name : prevStep.Name;
+
+                audit.WorkflowStepSendBackCrTime = currentStep.CreationTime;
+                audit.TraceId = currentStep.Id;
+                await _orderSendBackAuditRepository.AddAsync(audit, HttpContext.RequestAborted);
+            }
             else
             {
                 audit.State = ESendBackAuditState.End;
                 audit.AuditUser = "默认通过";
                 audit.AuditTime = DateTime.Now;
-				await _orderApplication.OrderPrevious(audit, order, HttpContext.RequestAborted);
-			}
+                await _orderApplication.OrderPrevious(audit, order, HttpContext.RequestAborted);
+            }
         }
         else
         {
@@ -5589,7 +5577,7 @@ public class OrderController : BaseController
             audit.AuditTime = DateTime.Now;
             await _orderApplication.OrderPrevious(audit, order, HttpContext.RequestAborted);
 
-		}
+        }
     }
 
     /// <summary>
@@ -5620,7 +5608,7 @@ public class OrderController : BaseController
             var order = await _orderRepository.Queryable().Includes(d => d.Workflow).FirstAsync(d => d.Id == sendBack.OrderId);
             if (_appOptions.Value.IsZiGong)
             {
-                var (currentStep, prevStep,steps ,isOrgToCenter, isSecondToFirstOrgLevel) = await _workflowApplication.GetPreviousInformationAsync(
+                var (currentStep, prevStep, steps, isOrgToCenter, isSecondToFirstOrgLevel) = await _workflowApplication.GetPreviousInformationAsync(
                     order.WorkflowId, sendBack.WorkflowUserId, sendBack.WorkflowOrgId, sendBack.WorkflowRoleIds.ToArray(),
                     HttpContext.RequestAborted);
 
@@ -5636,14 +5624,14 @@ public class OrderController : BaseController
                 }
             }
             sendBack.SendBackData.ExpiredTime = order.ExpiredTime;
-			await _orderApplication.OrderPrevious(sendBack, order, HttpContext.RequestAborted);
-		}
+            await _orderApplication.OrderPrevious(sendBack, order, HttpContext.RequestAborted);
+        }
         else
         {
             await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { Status = sendBack.Status.Value })
                 .Where(o => o.Id == sendBack.OrderId).ExecuteCommandAsync(HttpContext.RequestAborted);
-			await _orderSendBackAuditRepository.UpdateAsync(sendBack, HttpContext.RequestAborted);
-		}
+            await _orderSendBackAuditRepository.UpdateAsync(sendBack, HttpContext.RequestAborted);
+        }
     }
 
     /// <summary>
@@ -5675,7 +5663,7 @@ public class OrderController : BaseController
                 var order = await _orderRepository.Queryable().Includes(d => d.Workflow).FirstAsync(d => d.Id == sendBack.OrderId);
                 if (_appOptions.Value.IsZiGong)
                 {
-                    var (currentStep, prevStep,steps, isOrgToCenter, isSecondToFirstOrgLevel) = await _workflowApplication.GetPreviousInformationAsync(
+                    var (currentStep, prevStep, steps, isOrgToCenter, isSecondToFirstOrgLevel) = await _workflowApplication.GetPreviousInformationAsync(
                         order.WorkflowId, sendBack.WorkflowUserId, sendBack.WorkflowOrgId, sendBack.WorkflowRoleIds.ToArray(),
                         HttpContext.RequestAborted);
                     if (prevStep.BusinessType == EBusinessType.Send)
@@ -5691,16 +5679,16 @@ public class OrderController : BaseController
                 }
 
                 sendBack.SendBackData.ExpiredTime = order.ExpiredTime;
-				await _orderApplication.OrderPrevious(sendBack, order, HttpContext.RequestAborted);
-			}
+                await _orderApplication.OrderPrevious(sendBack, order, HttpContext.RequestAborted);
+            }
             else
             {
                 await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { Status = sendBack.Status.Value })
                     .Where(o => o.Id == sendBack.OrderId).ExecuteCommandAsync(HttpContext.RequestAborted);
-				await _orderSendBackAuditRepository.UpdateAsync(sendBack, HttpContext.RequestAborted);
-			}
+                await _orderSendBackAuditRepository.UpdateAsync(sendBack, HttpContext.RequestAborted);
+            }
+
 
-           
         }
     }
 
@@ -5799,24 +5787,25 @@ public class OrderController : BaseController
         if (string.IsNullOrEmpty(order.WorkflowId))
             throw UserFriendlyException.SameMessage("该工单未开启流程");
 
-        var (currentStep, prevStep,steps, isOrgToCenter, isSecondToFirstOrgLevel) = await _workflowApplication.GetPreviousInformationAsync(
+        var (currentStep, prevStep, steps, isOrgToCenter, isSecondToFirstOrgLevel) = await _workflowApplication.GetPreviousInformationAsync(
             order.WorkflowId, _sessionContext.RequiredUserId, _sessionContext.RequiredOrgId, _sessionContext.Roles, HttpContext.RequestAborted);
-		///查询上一节点是否是领导节点
-		///ture 流程排除领导节点 排除当前节点 prevStep.BusinessType == EBusinessType.DepartmentLeader
-		if (_appOptions.Value.IsYiBin  && prevStep.Name.Contains("领导"))
+        ///查询上一节点是否是领导节点
+        ///ture 流程排除领导节点 排除当前节点 prevStep.BusinessType == EBusinessType.DepartmentLeader
+        if (_appOptions.Value.IsYiBin && prevStep.Name.Contains("领导"))
         {
-            var step = steps.Where(x=> !x.Name.Contains("领导") && x.Code != currentStep.Code).OrderByDescending(x=>x.CreationTime).FirstOrDefault();
+            var step = steps.Where(x => !x.Name.Contains("领导") && x.Code != currentStep.Code).OrderByDescending(x => x.CreationTime).FirstOrDefault();
             var resStep = new List<WorkflowStep>
-			{
-				step,
-				prevStep
-			};
-            return new TargetStepInfo {
-				CurrentBusinessType = currentStep.BusinessType,
-				TargetBusinessType = prevStep.BusinessType,
+            {
+                step,
+                prevStep
+            };
+            return new TargetStepInfo
+            {
+                CurrentBusinessType = currentStep.BusinessType,
+                TargetBusinessType = prevStep.BusinessType,
                 Steps = _mapper.Map<List<TargetStep>>(resStep)
-			};
-		}
+            };
+        }
 
         return new TargetStepInfo
         {
@@ -8841,6 +8830,7 @@ public class OrderController : BaseController
         var id = await _orderComplementRepository.AddAsync(complement, HttpContext.RequestAborted);
         if (!string.IsNullOrEmpty(id))
         {
+            #region 处理推送消息
             //获取当前办理节点数据
             var work = await _workflowStepRepository.GetAsync(p => p.Id == data.ActualHandleStepId, HttpContext.RequestAborted);
             if (work != null)
@@ -8849,60 +8839,61 @@ public class OrderController : BaseController
                 var workflowStepHandler = work.GetWorkflowStepHandler();
                 if (workflowStepHandler != null)
                 {
-                    List<string> users = [];
+
+                    AddCircularDto circularDto = new AddCircularDto()
+                    {
+                        Title = "工单补充",
+                        Content = "工单" + data.No + "有补充内容，请注意查收！",
+                        CircularTypeId = "6",
+                        CircularTypeName = "工单补充",
+                        IsMustRead = true,
+                        SourceOrgId = _sessionContext.RequiredOrgId,
+                        SourceOrgName = _sessionContext.OrgName,
+                        CircularType = ECircularType.Person
+                    };
+
+                    List<CircularReadGroupDto> users = [];
                     if (!string.IsNullOrEmpty(workflowStepHandler.UserId)) //指定用户
                     {
-                        users.Add(workflowStepHandler.UserId);
+                        users.Add(new CircularReadGroupDto()
+                        {
+                            UserId = workflowStepHandler.UserId,
+                            UserName = workflowStepHandler.Username
+                        });
                     }
                     else if (!string.IsNullOrEmpty(workflowStepHandler.RoleId))//指定角色
                     {
                         //查询指定角色下面所有的用户
                         var userlist = await _userRepository.Queryable().Where(x =>
-                            x.OrgId == workflowStepHandler.OrgId && x.Roles.Any(d => workflowStepHandler.RoleId.Contains(d.Id))).Select(p => p.Id).ToListAsync();
-                        if (userlist != null && userlist.Count > 0)
-                            users.AddRange(userlist);
+                            x.OrgId == workflowStepHandler.OrgId && x.Roles.Any(d => workflowStepHandler.RoleId.Contains(d.Id)))
+                            .Select(d => new CircularReadGroupDto
+                            {
+                                UserId = d.Id,
+                                UserName = d.Name
+                            }).ToListAsync();
+                        users.AddRange(userlist);
                     }
                     else if (!string.IsNullOrEmpty(workflowStepHandler.OrgId))//指定部门
                     {
-                        //添加成功以后查询需要发送的人员信息
-                        var acceptSmsRoleIds = _systemSettingCacheManager.GetSetting(SettingConstants.AcceptSmsRoleIds)?.SettingValue;
-
-                        //查询指定部门下面经办人的信息
-                        var userlist = await _userRepository.Queryable().Where(x =>
-                            x.OrgId == workflowStepHandler.OrgId && x.Roles.Any(d => acceptSmsRoleIds.Contains(d.Id))).Select(p => p.Id).ToListAsync();
-                        if (userlist != null && userlist.Count > 0)
-                            users.AddRange(userlist);
+                        users.Add(new CircularReadGroupDto()
+                        {
+                            OrgId = workflowStepHandler.OrgId,
+                            OrgName = workflowStepHandler.OrgName
+                        });
+                        circularDto.CircularType = ECircularType.Org;
                     }
+
                     if (users != null && users.Count > 0)
                     {
-                        var msg = @"工单" + data.No + "有补充内容，请注意查收！";
-                        foreach (var item in users)
-                        {
-                            //发送消息
-                            await _realtimeService.OrderComplementAsync(item, msg, HttpContext.RequestAborted);
-                        }
+                        circularDto.CircularReadGroups = users;
+                        //调用推送消息通用接口
                     }
                 }
             }
-        }
-    }
 
-    /// <summary>
-    /// 根据userid查询补充消息
-    /// </summary>
-    /// <param name="userId"></param>
-    /// <returns></returns>
-    [HttpGet("get_notification_wait_send/{userId}")]
-    public async Task<List<NotificationWaitSendDto>> GetNotificationWaitSend(string userId)
-    {
-        var data = await _notificationWaitSendRepository.Queryable()
-                .Where(p => p.UserId == userId && p.Method == RealtimeMethods.OrderComplementRecord && p.State == "0")
-                .ToListAsync();
-        if (data != null && data.Count > 0)
-        {
-            await _notificationWaitSendRepository.RemoveRangeAsync(data, HttpContext.RequestAborted);
+            #endregion
         }
-        return _mapper.Map<List<NotificationWaitSendDto>>(data);
     }
+
     #endregion
 }

src/Hotline.Api/Controllers/TestController.cs

@@ -1,7 +1,5 @@
-using DocumentFormat.OpenXml.Drawing.Charts;
-using DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing;
-using DotNetCore.CAP;
-using Hotline.Ai.Visit;
+using DotNetCore.CAP;
+using Hotline.Ai.Quality;
 using Hotline.Application.CallCenter;
 using Hotline.Application.ExportExcel;
 using Hotline.Application.FlowEngine;
@@ -9,7 +7,6 @@ using Hotline.Application.JudicialManagement;
 using Hotline.Application.Orders;
 using Hotline.Application.Quality;
 using Hotline.Application.StatisticalReport;
-using Hotline.Authentications;
 using Hotline.Caching.Interfaces;
 using Hotline.CallCenter.BlackLists;
 using Hotline.CallCenter.Calls;
@@ -18,9 +15,6 @@ using Hotline.CallCenter.Ivrs;
 using Hotline.CallCenter.Tels;
 using Hotline.Configurations;
 using Hotline.ContingencyManagement;
-using Hotline.FlowEngine;
-using Hotline.FlowEngine.Definitions;
-using Hotline.FlowEngine.Notifications;
 using Hotline.FlowEngine.WorkflowModules;
 using Hotline.FlowEngine.Workflows;
 using Hotline.Import;
@@ -28,62 +22,43 @@ using Hotline.JudicialManagement;
 using Hotline.Orders;
 using Hotline.Realtimes;
 using Hotline.Repository.SqlSugar;
-using Hotline.Repository.SqlSugar.CallCenter;
 using Hotline.Repository.SqlSugar.Ts;
 using Hotline.Settings;
 using Hotline.Settings.Hotspots;
 using Hotline.Settings.TimeLimitDomain;
 using Hotline.Settings.TimeLimits;
 using Hotline.Share.Dtos;
-using Hotline.Share.Dtos.FlowEngine;
 using Hotline.Share.Dtos.FlowEngine.Workflow;
+using Hotline.Share.Dtos.Home;
 using Hotline.Share.Dtos.Order;
 using Hotline.Share.Dtos.Realtime;
+using Hotline.Share.Dtos.Settings;
 using Hotline.Share.Dtos.Snapshot;
 using Hotline.Share.Dtos.TrCallCenter;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Enums.FlowEngine;
 using Hotline.Share.Enums.JudicialManagement;
 using Hotline.Share.Enums.Order;
-using Hotline.Share.Enums.Quality;
 using Hotline.Share.Mq;
 using Hotline.Users;
 using Mapster;
 using MapsterMapper;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Builder.Extensions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using MiniExcelLibs;
-using Newtonsoft.Json;
-using NPOI.POIFS.Crypt.Dsig;
+using NETCore.Encrypt;
 using SqlSugar;
-using StackExchange.Redis;
-using System.Threading;
 using XC.RSAUtil;
 using XF.Domain.Authentications;
 using XF.Domain.Cache;
-using XF.Domain.Exceptions;
 using XF.Domain.Filters;
 using XF.Domain.Locks;
 using XF.Domain.Queues;
 using XF.Domain.Repository;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 using Order = Hotline.Orders.Order;
-using Hotline.Share.Dtos.Settings;
 using OrderDto = Hotline.Share.Dtos.Order.OrderDto;
-using Hotline.Share.Dtos.Home;
-using Google.Protobuf.WellKnownTypes;
-using Microsoft.AspNetCore.DataProtection;
-using Hotline.Share.Tools;
-using NETCore.Encrypt;
-using Hotline.Ai.Quality;
-using Hotline.EventBus;
-using Hotline.JudicialManagement.Notifies;
-using Hotline.Snapshot.Notifications;
-using XF.Domain.Entities;
-using Hotline.Repository.SqlSugar.Orders;
 
 namespace Hotline.Api.Controllers;
 
@@ -279,15 +254,15 @@ ICallApplication callApplication,
     /// <returns></returns>
     [HttpGet("phonenumber_test")]
     [AllowAnonymous]
-    public async Task GetPhoneNumberTest()
+    public async Task<ThirdPhoneOutDto> GetPhoneNumberTest()
     {
-        await _realtimeService.OrderComplementAsync("08db98a6-29f9-4812-8ccc-c81bc1ab2d12","测试推送消息", HttpContext.RequestAborted);
-        //var inDto = new ThirdTokenDto
-        //{
-        //    AppId = _systemSettingCacheManager.WxOpenAppId,
-        //    Secret = _systemSettingCacheManager.WxOpenAppSecret
-        //};
-        //return await _thirdIdentiyService.GetPhoneNumberAsync(inDto);
+
+        var inDto = new ThirdTokenDto
+        {
+            AppId = _systemSettingCacheManager.WxOpenAppId,
+            Secret = _systemSettingCacheManager.WxOpenAppSecret
+        };
+        return await _thirdIdentiyService.GetPhoneNumberAsync(inDto);
     }
 
     /// <summary>

src/Hotline.Api/Realtimes/RealtimeService.cs

@@ -1,12 +1,10 @@
-using DocumentFormat.OpenXml.Spreadsheet;
-using Hotline.Article;
+using Hotline.Article;
 using Hotline.Caching.Interfaces;
 using Hotline.Caching.Services;
 using Hotline.Realtimes;
 using Hotline.Share.Dtos.Realtime;
 using Hotline.Users;
 using Microsoft.AspNetCore.SignalR;
-using XF.Domain.Cache;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
 using XF.Domain.Repository;
@@ -19,20 +17,17 @@ public class RealtimeService : IRealtimeService, IScopeDependency
     private readonly IRealtimeCacheManager _realtimeCacheManager;
     private readonly IRepository<CircularRecord> _circularRecordRepository;
     private readonly IRepository<User> _userRepository;
-    private readonly IRepository<NotificationWaitSend> _notificationWaitSendRepository;
 
     public RealtimeService(
         IHubContext<HotlineHub> hubContext,
         IRealtimeCacheManager realtimeCacheManager,
         IRepository<CircularRecord> circularRecordRepository,
-        IRepository<User> userRepository,
-        IRepository<NotificationWaitSend> notificationWaitSendRepository)
+        IRepository<User> userRepository)
     {
         _hubContext = hubContext;
         _realtimeCacheManager = realtimeCacheManager;
         _circularRecordRepository = circularRecordRepository;
         _userRepository = userRepository;
-        _notificationWaitSendRepository = notificationWaitSendRepository;
     }
 
     #region 通讯通知
@@ -126,36 +121,6 @@ public class RealtimeService : IRealtimeService, IScopeDependency
 
     #endregion
 
-    /// <summary>
-    /// 工单补充消息通知 
-    /// </summary>
-    /// <param name="userId"></param>
-    /// <param name="msg"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task OrderComplementAsync(string userId, string msg, CancellationToken cancellationToken)
-    {
-        var connection = await _realtimeCacheManager.GetConnectionOtherAsync(userId, cancellationToken);
-        if (connection == null)
-        {
-            //如果没有建立链接，写入数据库
-            NotificationWaitSend notificationWait = new NotificationWaitSend()
-            {
-                UserId = userId,
-                Msg = msg,
-                Method = RealtimeMethods.OrderComplementRecord,
-                State = "0"
-            };
-            await _notificationWaitSendRepository.AddAsync(notificationWait, cancellationToken);
-        }
-        else
-        {
-            //如果建立了链接直接发消息
-            await _hubContext.Clients.Client(connection.ConnectionId).SendAsync(RealtimeMethods.OrderComplementRecord, msg, cancellationToken);
-        }
-    }
-
-
     #region 系统信息通知
 
     /// <summary>

src/Hotline.Share/Dtos/Article/NotificationWaitSendDto.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Hotline.Share.Dtos.Article
-{
-    public class NotificationWaitSendDto
-    {
-        public string Id { get; set; }
-
-        public string Msg { get; set; }
-
-        public string? Method { get; set; }
-
-    }
-}

src/Hotline/Article/NotificationWaitSend.cs

@@ -1,21 +0,0 @@
-using XF.Domain.Repository;
-
-namespace Hotline.Article
-{
-    /// <summary>
-    /// 消息待推送
-    /// </summary>
-    public class NotificationWaitSend : CreationEntity
-    {
-        public string UserId { get; set; }
-
-        public string Msg { get; set; }
-
-        public string? Method { get; set; }
-
-        /// <summary>
-        /// 0:待发，1:已发
-        /// </summary>
-        public string? State { get; set; }
-    }
-}

src/Hotline/Realtimes/IRealtimeService.cs

@@ -86,13 +86,5 @@ namespace Hotline.Realtimes
 
         #endregion
 
-        /// <summary>
-        /// 工单补充消息通知
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <param name="msg"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        Task OrderComplementAsync(string userId, string msg, CancellationToken cancellationToken);
     }
 }