Forráskód Böngészése

修复一些异常

qinchaoyue 3 hete
szülő
commit
f7666a27fe

+ 1 - 1
src/Hotline.Application/Snapshot/SnapshotApplicationBase.cs

@@ -1122,7 +1122,7 @@ public abstract class SnapshotApplicationBase
             Items = await _notificationReceiverRepository.Queryable()
                 .LeftJoin<Notification>((receiver, notify) => notify.Id == receiver.NotificationId)
                 .LeftJoin<SnapshotBulletin>((receiver, notify, bulletin) => bulletin.Id == notify.ExternalId)
-                .Where((receiver, notify, bulletin) => bulletin.Shape == EBulletinShape.Message)
+                .Where((receiver, notify, bulletin) => bulletin.Shape == EBulletinShape.Message && receiver.ReceiverId == _sessionContext.UserId)
                 .GroupBy((receiver, notify, bulletin) => new { notify.Id, notify.ExternalId, notify.Title})
                 .Select((receiver, notify, bulletin) => new PointsBulletinItemsOutDto
                 {

+ 3 - 2
src/TianQue.Sdk/TQHttpClient.cs

@@ -78,11 +78,12 @@ public class TQHttpClient
 
             if (SSHHost.NotNullOrEmpty() && SSHPort != 0 && SSHUserName.NotNullOrEmpty() && SSHPassword.NotNullOrEmpty())
             {
+                var port = new Random().Next(8089, 8099);
                 _sshClient.Connect();
-                var forwardedPort = new ForwardedPortLocal("127.0.0.1", 8090, uri.Host, (uint)uri.Port);
+                var forwardedPort = new ForwardedPortLocal("127.0.0.1", (uint)port, uri.Host, (uint)uri.Port);
                 _sshClient.AddForwardedPort(forwardedPort);
                 forwardedPort.Start();
-                uri = new Uri("http://127.0.0.1:8090" + uri.AbsolutePath);
+                uri = new Uri("http://127.0.0.1:" + port + uri.AbsolutePath);
             }
 
             var content = new StringContent(body, Encoding.GetEncoding("UTF-8"));

+ 9 - 2
test/Hotline.Tests/Application/RedPackApplicationTest.cs

@@ -58,12 +58,19 @@ public class RedPackApplicationTest : TestBase
         var dhzy = _systemDicDataCacheManager.OrderTag.Where(m => m.DicDataName == "动火作业").FirstOrDefault();
         dhzy.ShouldNotBeNull("SysDicTypeConsts.OrderTag 缺少动作火作业基础信息");
         SetZuoXi();
-        SetSettingCache(SettingConstants.OvertimeBack, "0.00027778");
         var industryItems = await _industryRepository.Queryable().Where(m => m.Name == "安全隐患").Select(d => new { d.Id, d.Name, }).ToListAsync();
         var industry = industryItems.First();
         var order = _orderServiceMock.CreateOrder(industryId: industry.Id, industryName: industry.Name, tags: [dhzy.Id])
+            .StepHandle(async order => 
+            {
+                SetSettingCache(SettingConstants.OvertimeBack, "0.00027778");
+            })
             .办理到网格员(SetZuoXi)
-            .StepHandle(async order => Thread.Sleep(5 * 1000))
+            .StepHandle(async order =>
+            {
+                Thread.Sleep(5 * 1000);
+                SetSettingCache(SettingConstants.OvertimeBack, "4");
+            })
             .办理到派单员(Set班长)
             .办理到一级部门(SetPaiDanYuan)
             .办理到归档(Set一级部门)

+ 18 - 3
test/Hotline.Tests/Mock/OrderServiceMock.cs

@@ -30,6 +30,7 @@ using System;
 using DocumentFormat.OpenXml.Bibliography;
 using Hotline.Snapshot;
 using Hotline.Share.Enums.Settings;
+using Npgsql;
 
 namespace Hotline.Tests.Mock;
 public class OrderServiceMock
@@ -130,7 +131,21 @@ public class OrderServiceMock
         AddOrderDto.Title = "单元测试" + DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss");
         if (tags.NotNullOrEmpty())
             AddOrderDto.Tags = tags;
-        CreateOrderOutDto = _orderController.Add(AddOrderDto).GetAwaiter().GetResult().ToJson().FromJson<CreateOrderOutDto>();
+        RetryHelper.Retry(() =>
+            {
+                try
+                {
+                    CreateOrderOutDto = _orderController.Add(AddOrderDto).GetAwaiter().GetResult().ToJson().FromJson<CreateOrderOutDto>();
+                }
+                catch (PostgresException e)
+                {
+                    if (e.Message.Contains("unique_order_no"))
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }, 10);
         _orderServiceStartWorkflow.orderServiceMock = this;
         return _orderServiceStartWorkflow;
     }
@@ -657,7 +672,7 @@ public class OrderServiceMock
         return this;
 
     }
-    
+
     public string 申请延期(Action action = null)
     {
         action?.Invoke();
@@ -669,7 +684,7 @@ public class OrderServiceMock
             {
                 NextStepCode = step.Key,
                 NextStepName = step.Value,
-                NextHandlers = new List<StepAssignInfo>{step.Items.First()},
+                NextHandlers = new List<StepAssignInfo> { step.Items.First() },
                 Opinion = "单元测试延期申请",
                 FlowDirection = step.FlowDirection,
                 BackToCountersignEnd = step.BackToCountersignEnd,