From e46b19016bf6527c8f81228eca6c9cb9d27a5c62 Mon Sep 17 00:00:00 2001 From: TianMaiCheng <746290578@qq.com> Date: Thu, 19 Mar 2026 08:56:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E7=B3=BB=E5=88=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 屏蔽 下位机 故障上报上报正常的数据。增加 日志系统的功能 --- CRICS_V3_1124.suo | Bin 12780544 -> 12780544 bytes CommonEntity/DataTongJi.cs | 1 + CommonEntity/FCS.cs | 2 +- CommonEntity/Kafka_XinTiao.cs | 1 + RCUHost/Implement/GenericReceiverBase.cs | 2 +- RCUHost/Implement/HostServer.cs | 3 ++ RCUHost/Implement/New_RoomStatusReceiver.cs | 9 ++-- RCUHost/Implement/RoomStatusReceiver.cs | 14 +++-- .../Implement/UpdateHostCompletedReceiver.cs | 32 ------------ RCUHost/Implement/UpdateHostReceiver.cs | 48 ++++++++++++++++++ WebSite/Views/Home/SimonLogOn.aspx | 4 +- 11 files changed, 72 insertions(+), 44 deletions(-) diff --git a/CRICS_V3_1124.suo b/CRICS_V3_1124.suo index 75a686d52288a5c113c0fc75a9532cdc08660179..465329af469a6e39b2b5aef7c8df9d93900e8fb3 100644 GIT binary patch delta 48243 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 G{{I1<$V>SE delta 37969 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 diff --git a/CommonEntity/DataTongJi.cs b/CommonEntity/DataTongJi.cs index 15d2a24..b9c0872 100644 --- a/CommonEntity/DataTongJi.cs +++ b/CommonEntity/DataTongJi.cs @@ -336,6 +336,7 @@ namespace CommonEntity /// "上报" 或 "下发" /// public string direction { get; set; } + public string ip { get; set; } public string cmd_word { get; set; } public int frame_id { get; set; } diff --git a/CommonEntity/FCS.cs b/CommonEntity/FCS.cs index c7aa7b1..7d14779 100644 --- a/CommonEntity/FCS.cs +++ b/CommonEntity/FCS.cs @@ -228,7 +228,7 @@ namespace CommonEntity }; fff.remark = remarkdata; fff.assigned_to = "auto"; - fff.user_type = 1; + fff.user_type = 2; fff.get_details = true; diff --git a/CommonEntity/Kafka_XinTiao.cs b/CommonEntity/Kafka_XinTiao.cs index 7f76023..82b9012 100644 --- a/CommonEntity/Kafka_XinTiao.cs +++ b/CommonEntity/Kafka_XinTiao.cs @@ -12,6 +12,7 @@ namespace CommonEntity public string hotel_id { get; set; } public string device_id { get; set; } public string room_id { get; set; } + public string ip { get; set; } } public struct ShengJi_Log { diff --git a/RCUHost/Implement/GenericReceiverBase.cs b/RCUHost/Implement/GenericReceiverBase.cs index 294346e..e070b22 100644 --- a/RCUHost/Implement/GenericReceiverBase.cs +++ b/RCUHost/Implement/GenericReceiverBase.cs @@ -265,7 +265,7 @@ namespace RCUHost.Implement } d1.control_list = lll3; d1.report_count = lll3.Count; - + d1.ip = ipAndPort; string sss = Newtonsoft.Json.JsonConvert.SerializeObject(d1); CSRedisCacheHelper.Publish("redis-0X36-0X0F", sss); diff --git a/RCUHost/Implement/HostServer.cs b/RCUHost/Implement/HostServer.cs index a35cf40..6d9906d 100644 --- a/RCUHost/Implement/HostServer.cs +++ b/RCUHost/Implement/HostServer.cs @@ -1281,6 +1281,7 @@ namespace RCUHost.Implement string hotelid = CODE; string roomid = RoomNUMBER; Kafka_XinTiao k = new Kafka_XinTiao(); + k.ip = EndPoint; k.hotel_id = CODE; k.device_id = HostNNN; k.room_id = RoomNUMBER; @@ -1444,6 +1445,7 @@ namespace RCUHost.Implement d1.cmd_word = "0F"; d1.udp_raw = OriginalByte; d1.direction = "上报"; + d1.ip = EndPoint; string sss = Newtonsoft.Json.JsonConvert.SerializeObject(d1); CSRedisCacheHelper.Publish("redis-0X36-0X0F", sss); @@ -1960,6 +1962,7 @@ namespace RCUHost.Implement d1.cmd_word = "36"; d1.udp_raw = OriginalByte; d1.direction = "上报"; + d1.ip = EndPoint; List lll1 = new List(); List lll2 = new List(); diff --git a/RCUHost/Implement/New_RoomStatusReceiver.cs b/RCUHost/Implement/New_RoomStatusReceiver.cs index 28ca251..54ca2c3 100644 --- a/RCUHost/Implement/New_RoomStatusReceiver.cs +++ b/RCUHost/Implement/New_RoomStatusReceiver.cs @@ -123,7 +123,7 @@ namespace RCUHost.Implement if (status.Devices != null && status.Devices.Count > 0) { //来一个数据,把所有的地址拼接起来 - ProcessModal_NEW_NEW(host, status.Devices, isTriggerWelcomeMsg, context.MessageID, context.IsMonitor);//更新灯光及其他回路状态 + ProcessModal_NEW_NEW(host, status.Devices, isTriggerWelcomeMsg, context.MessageID, context.IsMonitor,context.RemoteEndPoint.ToString());//更新灯光及其他回路状态 } if (status.Faults != null && status.Faults.Count > 0) @@ -183,7 +183,7 @@ namespace RCUHost.Implement public static string Missionsys_Address = ConfigurationManager.AppSettings["missionsys_address"]; public static string MQTTInfo_report_url = ConfigurationManager.AppSettings["debug_log_report_url"].ToString(); - private void ProcessModal_NEW_NEW(Host host, ConcurrentDictionary devices, bool IsTriggerWelcomeMsg, string ContextMessageId, bool ismonitor) + private void ProcessModal_NEW_NEW(Host host, ConcurrentDictionary devices, bool IsTriggerWelcomeMsg, string ContextMessageId, bool ismonitor,string EEndPoint) { string UUID = "9dc6a0ee-dcf1-4385-b05f-09cb463838cd"; UUID = host.FCS_locationUUID; @@ -1646,7 +1646,10 @@ namespace RCUHost.Implement case 1://状态:1离线,0在线 record.AbnormalStatus = fault.Value.Data; record.StatusDate = now; - RR.FCS_PushData(FCS_RCU_Device_Offline, host.FCS_locationUUID, PropertyUUID, FCSLoginUrl, FCSLoginUserName, FCSLoginPassWord, host.SysHotel.Code, host.RoomNumber, devicename + "###" + deviceaddress); + if (fault.Value.Data == 1) + { + RR.FCS_PushData(FCS_RCU_Device_Offline, host.FCS_locationUUID, PropertyUUID, FCSLoginUrl, FCSLoginUserName, FCSLoginPassWord, host.SysHotel.Code, host.RoomNumber, devicename + "###" + deviceaddress); + } //sbSQL.Append("AbnormalStatus=" + record.AbnormalStatus + ",StatusDate=GETDATE()"); break; case 2://电量 diff --git a/RCUHost/Implement/RoomStatusReceiver.cs b/RCUHost/Implement/RoomStatusReceiver.cs index 98fac73..9ea4029 100644 --- a/RCUHost/Implement/RoomStatusReceiver.cs +++ b/RCUHost/Implement/RoomStatusReceiver.cs @@ -157,7 +157,7 @@ namespace RCUHost.Implement //来一个数据,把所有的地址拼接起来 string YiJingChuLiGuo = CacheKey.AllReadyDealWith0E_Prefix + "_" + HostNumberOnly; MemoryCacheHelper.Delete(YiJingChuLiGuo); - ProcessModal_NEW_NEW(host, status.Devices, isTriggerWelcomeMsg, context.MessageID, context.IsMonitor, context.Data, status);//更新灯光及其他回路状态 + ProcessModal_NEW_NEW(host, status.Devices, isTriggerWelcomeMsg, context.MessageID, context.IsMonitor, context.Data, status,context.RemoteEndPoint.ToString());//更新灯光及其他回路状态 string nnn = VVV1 + VVV2; if (!string.IsNullOrEmpty(nnn)) { @@ -224,7 +224,7 @@ namespace RCUHost.Implement public static string Missionsys_Address = ConfigurationManager.AppSettings["missionsys_address"]; public static string MQTTInfo_report_url = ConfigurationManager.AppSettings["debug_log_report_url"].ToString(); - private void ProcessModal_NEW_NEW(Host host, ConcurrentDictionary devices, bool IsTriggerWelcomeMsg, string ContextMessageId, bool ismonitor, byte[] OriginalByteList, Status yuanshidata) + private void ProcessModal_NEW_NEW(Host host, ConcurrentDictionary devices, bool IsTriggerWelcomeMsg, string ContextMessageId, bool ismonitor, byte[] OriginalByteList, Status yuanshidata,string EEndPoint) { string UUID = "9dc6a0ee-dcf1-4385-b05f-09cb463838cd"; UUID = host.FCS_locationUUID; @@ -639,8 +639,8 @@ namespace RCUHost.Implement // } //} - string ebell_rtsp = host.EBell_RSTP; - int du = host.EBell_TV_duration; + string ebell_rtsp = host.EBell_RSTP; + int du = host.EBell_TV_duration; if (hostModal.Modal.ModalAddress.Equals("004000021")) { Dictionary ddd = new Dictionary(); @@ -2025,6 +2025,7 @@ namespace RCUHost.Implement d1.fault_list = exception_list; d1.report_count = shebei_changeaction_list.Count; d1.fault_count = exception_list.Count; + d1.ip = EEndPoint; string sss111 = Newtonsoft.Json.JsonConvert.SerializeObject(d1); CSRedisCacheHelper.Publish("redis-0X36-0X0F", sss111); @@ -2212,7 +2213,10 @@ namespace RCUHost.Implement case 1://状态:1离线,0在线 record.AbnormalStatus = fault.Value.Data; record.StatusDate = now; - RR.FCS_PushData(FCS_RCU_Device_Offline, host.FCS_locationUUID, PropertyUUID, FCSLoginUrl, FCSLoginUserName, FCSLoginPassWord, host.SysHotel.Code, host.RoomNumber); + if (record.AbnormalStatus == 1) + { + RR.FCS_PushData(FCS_RCU_Device_Offline, host.FCS_locationUUID, PropertyUUID, FCSLoginUrl, FCSLoginUserName, FCSLoginPassWord, host.SysHotel.Code, host.RoomNumber); + } //sbSQL.Append("AbnormalStatus=" + record.AbnormalStatus + ",StatusDate=GETDATE()"); break; case 2://电量 diff --git a/RCUHost/Implement/UpdateHostCompletedReceiver.cs b/RCUHost/Implement/UpdateHostCompletedReceiver.cs index 77db855..dbce64e 100644 --- a/RCUHost/Implement/UpdateHostCompletedReceiver.cs +++ b/RCUHost/Implement/UpdateHostCompletedReceiver.cs @@ -69,23 +69,6 @@ namespace RCUHost.Implement break; } - var host = updateHostWorker.Host; - ShengJi_Log s1 = new ShengJi_Log(); - s1.hotel_id = host.SysHotel.Code; - s1.room_id = host.RoomNumber; - s1.device_id = host.HostNumber; - - s1.is_send = 0; - s1.udp_raw = context.Data; - s1.remote_endpoint = endpoint; - s1.md5 = ""; - s1.partition = 0; - s1.file_type = 0; - s1.file_path = ""; - s1.upgrade_state = reply.Value.Status; - s1.app_version = reply.Value.Version; - - CSRedisCacheHelper.Publish("redis-up", Newtonsoft.Json.JsonConvert.SerializeObject(s1)); BarData bbb = new BarData(); @@ -120,21 +103,6 @@ namespace RCUHost.Implement } - ShengJi_Log s1 = new ShengJi_Log(); - s1.hotel_id = host.SysHotel.Code; - s1.room_id = host.RoomNumber; - s1.device_id = host.HostNumber; - - s1.is_send = 0; - s1.udp_raw = context.Data; - s1.remote_endpoint = endpoint; - s1.md5 = ""; - s1.partition = 0; - s1.file_type = 0; - s1.file_path = ""; - s1.upgrade_state = reply.Value.Status; - s1.app_version = reply.Value.Version; - CSRedisCacheHelper.Publish("redis-up", Newtonsoft.Json.JsonConvert.SerializeObject(s1)); BarData bbb = new BarData(); bbb.HostID = host.ID; diff --git a/RCUHost/Implement/UpdateHostReceiver.cs b/RCUHost/Implement/UpdateHostReceiver.cs index 278dca2..43bd8ab 100644 --- a/RCUHost/Implement/UpdateHostReceiver.cs +++ b/RCUHost/Implement/UpdateHostReceiver.cs @@ -24,6 +24,12 @@ namespace RCUHost.Implement private IList updateHostList = new List(); /// /// 升级 + /// + /// + /// + /// 升级 成功 或者失败会在这里上报, + /// + /// 唯 一的在这里上报,别的地方不会 /// /// /// @@ -147,6 +153,27 @@ namespace RCUHost.Implement bbb.Upgrade_status = "升级失败"; break; } + + + string endpoint = context.RemoteEndPoint.ToString(); + + var host = updateHostWorker.Host; + ShengJi_Log s1 = new ShengJi_Log(); + s1.hotel_id = host.SysHotel.Code; + s1.room_id = host.RoomNumber; + s1.device_id = host.HostNumber; + + s1.is_send = 0; + s1.udp_raw = context.Data; + s1.remote_endpoint = endpoint; + s1.md5 = ""; + s1.partition = 0; + s1.file_type = 0; + s1.file_path = ""; + s1.upgrade_state = reply.Value.Status; + s1.app_version = reply.Value.Version; + + CSRedisCacheHelper.Publish("redis-up", Newtonsoft.Json.JsonConvert.SerializeObject(s1)); UploadCurrentVersionReceiver.UP_Grade_Json(updateHostWorker.Host, bbb); } else @@ -196,6 +223,27 @@ namespace RCUHost.Implement updateHostList.Remove(updateHostWorker); break; } + + var host = hostUpdateStatus.Host; + string endpoint = context.RemoteEndPoint.ToString(); + + ShengJi_Log s1 = new ShengJi_Log(); + s1.hotel_id = host.SysHotel.Code; + s1.room_id = host.RoomNumber; + s1.device_id = host.HostNumber; + + s1.is_send = 0; + s1.udp_raw = context.Data; + s1.remote_endpoint = endpoint; + s1.md5 = ""; + s1.partition = 0; + s1.file_type = 0; + s1.file_path = ""; + s1.upgrade_state = reply.Value.Status; + s1.app_version = reply.Value.Version; + CSRedisCacheHelper.Publish("redis-up", Newtonsoft.Json.JsonConvert.SerializeObject(s1)); + + bbb.Upgrade_DateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); UploadCurrentVersionReceiver.UP_Grade_Json(updateHostWorker.Host, bbb); hostUpdateStatus.UpdatedTime = DateTime.Now; diff --git a/WebSite/Views/Home/SimonLogOn.aspx b/WebSite/Views/Home/SimonLogOn.aspx index ed4fd49..3e233db 100644 --- a/WebSite/Views/Home/SimonLogOn.aspx +++ b/WebSite/Views/Home/SimonLogOn.aspx @@ -75,11 +75,11 @@