diff --git a/CRICS_V3_1124.suo b/CRICS_V3_1124.suo index 8ef3c2a..eee4d41 100644 Binary files a/CRICS_V3_1124.suo and b/CRICS_V3_1124.suo differ diff --git a/Common/CSRedisCacheHelper.cs b/Common/CSRedisCacheHelper.cs index c9ac3c3..81656c9 100644 --- a/Common/CSRedisCacheHelper.cs +++ b/Common/CSRedisCacheHelper.cs @@ -324,7 +324,7 @@ namespace Common CSRedisClient client = WhitchRedisSlice(SliceNo); client.LPush(key, obj); } - public static int MaxLen = 500000; + public static int MaxLen = 800000; public static void StreamAdd(int SliceNo, string key, string Value) { try diff --git a/RCUHost/Implement/HostServer.cs b/RCUHost/Implement/HostServer.cs index f8a962c..60b1745 100644 --- a/RCUHost/Implement/HostServer.cs +++ b/RCUHost/Implement/HostServer.cs @@ -169,6 +169,7 @@ namespace RCUHost.Implement try { udpClient = new UdpClient(3339); + udpClient.Client.ReceiveBufferSize = 2 * 1024 * 1024; uint IOC_IN = 0x80000000; uint IOC_VENDOR = 0x18000000; uint SIO_UDP_CONNRESET = IOC_IN | IOC_VENDOR | 12; @@ -179,7 +180,7 @@ namespace RCUHost.Implement CSRedisCacheHelper.redis1.Del(UDPAllDataKey); CSRedisCacheHelper.redis1.XGroupCreate(UDPAllDataKey, "UDPData", "0", true); - for (int i = 1; i <= 10; i++) + for (int i = 1; i <= 15; i++) { Task.Factory.StartNew((iii) => { @@ -1761,10 +1762,10 @@ namespace RCUHost.Implement public static object oo = new object(); private void NewXieYi(ReceiverContext context_1, string hotelCode_1, string HostNNN_1, byte[] framenolist_1, byte cmdType_1, string EndPoint_1, ushort MyFrameNO) { - var Tuple = new Tuple(context_1, hotelCode_1, HostNNN_1, framenolist_1, cmdType_1, EndPoint_1); - Task.Factory.StartNew((state) => - { - var ts = state as Tuple; + var ts = new Tuple(context_1, hotelCode_1, HostNNN_1, framenolist_1, cmdType_1, EndPoint_1); + //Task.Factory.StartNew((state) => + // { + //var ts = state as Tuple; ReceiverContext context111 = ts.Item1; string hotelCode = ts.Item2; string HostNNN = ts.Item3; @@ -2743,7 +2744,7 @@ namespace RCUHost.Implement } #endregion - }, Tuple); + //}, Tuple); } public struct JiNamTongPaiTeShu { diff --git a/WebSite/Controllers/ApiController.cs b/WebSite/Controllers/ApiController.cs index b78be13..e018b46 100644 --- a/WebSite/Controllers/ApiController.cs +++ b/WebSite/Controllers/ApiController.cs @@ -6465,6 +6465,8 @@ namespace WebSite.Controllers List hosts = HostManager.LoadAll().Where(t => t.RoomType.ID == roomTypeModal.RoomType.ID).ToList(); foreach (Host host in hosts)//该房型下所有主机关联回路 { + //删除掉上报的 + CSRedisCacheHelper.Del_Partition(CacheKey.DingShiReportData + "_" + host.ID, 3); var hostModal = HostModalManager.GetByModalAddress(host.ID, roomTypeModal.ModalAddress); if (null == hostModal) {