From 53cb2e923961ca6110d80e45966b852174850b58 Mon Sep 17 00:00:00 2001 From: TianMaiCheng <746290578@qq.com> Date: Tue, 23 Dec 2025 14:33:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E4=BF=AE=E6=94=B9=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E9=9F=B3=E4=B9=90=E7=9A=84=E5=8A=9F=E8=83=BD=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=EF=BC=8C=E5=8E=9F=E6=9D=A5=E7=9A=84=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=B8=8D=E8=B5=B7=E4=BD=9C=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CRICS_V3_1124.suo | Bin 12780544 -> 12780544 bytes .../ConsoleApplication2.csproj | 7 +++ ConsoleApplication2/Program.cs | 7 +++ RCUHost/Implement/HostServer.cs | 25 ++++++----- RCUHost/Implement/New_RoomStatusReceiver.cs | 15 +++++++ RCUHost/Implement/RoomStatusReceiver.cs | 41 +++++++++++++----- WebSite/Controllers/SysHotelController.cs | 24 ++++++++++ WebSite/Scripts/host-index.js | 30 +++++++++++-- WebSite/Views/SysHotel/EditDockingInfo.ascx | 3 +- 9 files changed, 125 insertions(+), 27 deletions(-) diff --git a/CRICS_V3_1124.suo b/CRICS_V3_1124.suo index 923ba7d669105fc042cc95c493d829373f26da25..0bb61215a4068504c6e81b9612dec4fe71f1673a 100644 GIT binary patch delta 18220 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%0Dx{lhevfd%#JmJ_0O-ADI(``u z=eth|;oacJzzqFBmxHE(-UTfNt$&|zFdANpl6)t8g~V5UK)4~0&jb|;`VDkAX!c4e z{hd`}#pZJJS4%Zi;l&&)6!Jl_7;t54q!#WdmNH0LC$%tsz0|^oHb^au+$g251Ql91 zVw2RuWhGL&;LTD4SAhx*4BH~nVo-&!Df{CisfF*BN-b1>EY)xkXfYDZ+$yy&p-gJw z4N!sq`!=bCGs>lc`0Y{)^Faj*-KZqu%SEHA2p5m|PS9SU?U~e2aTBk{?*uU8G30J2 zolgWb{2NOgT~}&(o}QRsi4pIE=m$eD7OsciB^Fa?8R@6Q3Mo#ar|5gS^!TD@YViSW!P8MxRctB7x3l;H3d+pQZ0@vc%K1Wq3Od_iUNuD>|>rvRt?YOAk55BfI85;YFjTgfQ(|^JoyQnTapi zYqsmHbj)$fcouck(ul7(Qv&b>e+T4z{!oYICDj%M$wP6Pv9w{7-OTKKm>u7_TU1r` zmWzRO#u_X60YBkn z62cinq0TbaLw|uaF$`!2gahq?2%rNH33LRafQNu+pc4?otcjfqHYkLrwcSD3LY(}r zGY|`O0pfsoAOYwKBmxfuNkBKCJJ1721|9)=0=<9~;8CDA(1)G;&N_KVo3{#R*bZN_ zkMI`R(p7}Mx+rx4SuR{`^;uwDoC@IUJ}A z3xuwFdldbco~=gOa%S~ zOafj3CIeFd8}KSH6?hHE0bU2D0n>pQz)T<)cmtRP%m(HFa{)Ur56A=F1m**80dE5f zfQ7(2z#?EVkPj>YmIChr1;Bg2GN2Gx4!jQ(0TfsPd;qKjRspMl4}mqnTA&zM2doD+ z02_f#KnbuJ*aCb6lmZ_ETY*o2GGH4}4r~W1fJ$HouoI{P7_bZY6sQJv1ABnafW5#z Opa$5_tcz=FX8a$8kWb_Q delta 16480 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⋘L$Vi!JC>4XuR`)9&RjMl>(zw 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 + + False + ..\lib\Redis\CSRedisCore.dll + ..\lib\taskschedule\FluentScheduler.dll @@ -66,6 +70,9 @@ + + ..\lib\Redis\System.ValueTuple.dll + diff --git a/ConsoleApplication2/Program.cs b/ConsoleApplication2/Program.cs index ccc36ca..1c0c263 100644 --- a/ConsoleApplication2/Program.cs +++ b/ConsoleApplication2/Program.cs @@ -25,6 +25,7 @@ using Domain; using Newtonsoft.Json; using CommonEntity; using Newtonsoft.Json.Linq; +using CSRedis; namespace ConsoleApplication2 { @@ -241,8 +242,14 @@ namespace ConsoleApplication2 } MyHttp.SendHttpData("http://f-xcx.blv-oa.com/rcu/report", resp); } + static void RedisTest() + { + var redis_webchat = new CSRedisClient(string.Format("47.119.147.104:26379" + ",password={0},defaultDatabase=0", "1001^_^lool")); + redis_webchat.HMSet("a","b","c"); + } static void Main(string[] args) { + RedisTest(); Data(); Console.ReadLine(); string uuawer = string.Concat("h", "eeeelll"); diff --git a/RCUHost/Implement/HostServer.cs b/RCUHost/Implement/HostServer.cs index d7c67f3..2ee0457 100644 --- a/RCUHost/Implement/HostServer.cs +++ b/RCUHost/Implement/HostServer.cs @@ -1038,17 +1038,20 @@ namespace RCUHost.Implement foreach (string cuid in a)//多个英文逗号隔开 { - if (!string.IsNullOrEmpty(e)) - { - string ffg = "https://www.boonlive-rcu.com/welcomebgm/" + e; - TianMaoOperation.PostWebRequestToTianMao("PushWelcome", - Newtonsoft.Json.JsonConvert.SerializeObject(new { HotelId = cuid.Split('&')[0], RoomNo = cuid.Split('&')[1], WelcomeText = b, MusicUrl = ffg }), c, d);//通知天猫精灵播放欢迎词 - } - else - { - TianMaoOperation.PostWebRequestToTianMao("PushWelcome", - Newtonsoft.Json.JsonConvert.SerializeObject(new { HotelId = cuid.Split('&')[0], RoomNo = cuid.Split('&')[1], WelcomeText = b }), c, d);//通知天猫精灵播放欢迎词 - } + //if (!string.IsNullOrEmpty(e)) + //{ + // string ffg = "https://www.boonlive-rcu.com/welcomebgm/" + e; + // TianMaoOperation.PostWebRequestToTianMao("PushWelcome", + // Newtonsoft.Json.JsonConvert.SerializeObject(new { HotelId = cuid.Split('&')[0], RoomNo = cuid.Split('&')[1], WelcomeText = b, MusicUrl = ffg }), c, d);//通知天猫精灵播放欢迎词 + //} + //else + //{ + // TianMaoOperation.PostWebRequestToTianMao("PushWelcome", + // Newtonsoft.Json.JsonConvert.SerializeObject(new { HotelId = cuid.Split('&')[0], RoomNo = cuid.Split('&')[1], WelcomeText = b }), c, d);//通知天猫精灵播放欢迎词 + //} + + TianMaoOperation.PostWebRequestToTianMao("PushWelcome", + Newtonsoft.Json.JsonConvert.SerializeObject(new { HotelId = cuid.Split('&')[0], RoomNo = cuid.Split('&')[1], WelcomeText = b }), c, d);//通知天猫精灵播放欢迎词 Interface3Log w1 = new Interface3Log(); w1.HotelCode = c; diff --git a/RCUHost/Implement/New_RoomStatusReceiver.cs b/RCUHost/Implement/New_RoomStatusReceiver.cs index b0ac43f..2b7c74a 100644 --- a/RCUHost/Implement/New_RoomStatusReceiver.cs +++ b/RCUHost/Implement/New_RoomStatusReceiver.cs @@ -1596,6 +1596,21 @@ namespace RCUHost.Implement hostFaultRecords.Value = fault.Value.Data; hostFaultRecords.Date = now; HostFaultRecordsRepository.Save(hostFaultRecords); + + + + XuanZhuResponse resp1 = new XuanZhuResponse() + { + code = host.SysHotel.Code, + roomNumber = host.RoomNumber, + address = hostModal.Modal.ModalAddress, + name = hostModal.Modal.Name, + status = hostModal.Status, + faultType = fault.Value.Type, + faultData = fault.Value.Data + }; + string KKK = CacheKey.WebChatDeviceFault + "_" + resp1.code + "_" + resp1.roomNumber; + CSRedisCacheHelper.redis_webchat.HMSet(KKK, resp1.address, resp1); //出现异常信息时上报 if (!string.IsNullOrEmpty(host.SysHotel.FaultPushURL)) { diff --git a/RCUHost/Implement/RoomStatusReceiver.cs b/RCUHost/Implement/RoomStatusReceiver.cs index 8c3c06a..d183ccf 100644 --- a/RCUHost/Implement/RoomStatusReceiver.cs +++ b/RCUHost/Implement/RoomStatusReceiver.cs @@ -968,25 +968,28 @@ namespace RCUHost.Implement var b = hhh.SysHotel.WelcomeSpeech; string bb = hhh.SysHotel.WelcomeBGM; - if (!string.IsNullOrEmpty(bb)) - { - bb = "https://www.boonlive-rcu.com/welcomebgm/" + bb; - } + //if (!string.IsNullOrEmpty(bb)) + //{ + // bb = "https://www.boonlive-rcu.com/welcomebgm/" + bb; + //} var c = hhh.SysHotel.Code; var d = hhh.RoomNumber; foreach (string cuid in a)//多个英文逗号隔开 { - if (!string.IsNullOrEmpty(bb)) - { - TianMaoOperation.PostWebRequestToTianMao("PushWelcome", - Newtonsoft.Json.JsonConvert.SerializeObject(new { HotelId = cuid.Split('&')[0], RoomNo = cuid.Split('&')[1], WelcomeText = b, MusicUrl = bb }), c, d);//通知天猫精灵播放欢迎词 - } - else - { + //if (!string.IsNullOrEmpty(bb)) + //{ + // TianMaoOperation.PostWebRequestToTianMao("PushWelcome", + // Newtonsoft.Json.JsonConvert.SerializeObject(new { HotelId = cuid.Split('&')[0], RoomNo = cuid.Split('&')[1], WelcomeText = b, MusicUrl = bb }), c, d);//通知天猫精灵播放欢迎词 + //} + //else + //{ + // TianMaoOperation.PostWebRequestToTianMao("PushWelcome", + // Newtonsoft.Json.JsonConvert.SerializeObject(new { HotelId = cuid.Split('&')[0], RoomNo = cuid.Split('&')[1], WelcomeText = b }), c, d);//通知天猫精灵播放欢迎词 + //} + TianMaoOperation.PostWebRequestToTianMao("PushWelcome", Newtonsoft.Json.JsonConvert.SerializeObject(new { HotelId = cuid.Split('&')[0], RoomNo = cuid.Split('&')[1], WelcomeText = b }), c, d);//通知天猫精灵播放欢迎词 - } Interface3Log w1 = new Interface3Log(); w1.HotelCode = c; @@ -2121,6 +2124,20 @@ namespace RCUHost.Implement hostFaultRecords.Value = fault.Value.Data; hostFaultRecords.Date = now; HostFaultRecordsRepository.Save(hostFaultRecords); + + + XuanZhuResponse resp1 = new XuanZhuResponse() + { + code = host.SysHotel.Code, + roomNumber = host.RoomNumber, + address = hostModal.Modal.ModalAddress, + name = hostModal.Modal.Name, + status = hostModal.Status, + faultType = fault.Value.Type, + faultData = fault.Value.Data + }; + string KKK = CacheKey.WebChatDeviceFault + "_" + resp1.code + "_" + resp1.roomNumber; + CSRedisCacheHelper.redis_webchat.HMSet(KKK, resp1.address, resp1); //出现异常信息时上报 if (!string.IsNullOrEmpty(host.SysHotel.FaultPushURL)) { diff --git a/WebSite/Controllers/SysHotelController.cs b/WebSite/Controllers/SysHotelController.cs index e346e87..a9c9c5d 100644 --- a/WebSite/Controllers/SysHotelController.cs +++ b/WebSite/Controllers/SysHotelController.cs @@ -172,6 +172,7 @@ namespace WebSite.Controllers return Json(new { IsSuccess = true, Message = HttpContext.InnerLanguage("SaveSuccess") }); } + /// /// 上传BGM /// @@ -215,6 +216,7 @@ namespace WebSite.Controllers } sysHotel.WelcomeBGM = NewFileName; + SysHotelManager.Update(sysHotel); return Json(new { IsSuccess = true, FileName = NewFileName }, JsonRequestBehavior.AllowGet); } @@ -232,6 +234,22 @@ namespace WebSite.Controllers + [Authorize()] + public ActionResult DeleteBGM() + { + try + { + var sysHotel = SysHotelManager.Get(CurrentHotelID); + sysHotel.WelcomeBGM = ""; + SysHotelManager.Update(sysHotel); + return Json(new { IsSuccess = true }, JsonRequestBehavior.AllowGet); + } + catch (Exception ex) + { + return Json(new { IsSuccess = false, Message = ex.Message }, JsonRequestBehavior.AllowGet); + } + + } /// /// 保存第三方对接信息 /// @@ -282,6 +300,12 @@ namespace WebSite.Controllers //sysHotel.TCLAppSecret = entity.TCLAppSecret; SysHotelManager.Update(sysHotel); + if (!string.IsNullOrEmpty(entity.WelcomeBGM)) + { + string ffg = "https://www.boonlive-rcu.com/welcomebgm/" + entity.WelcomeBGM; + TianMaoOperation.PostWebRequestToTianMao("AddOrUpdateWelcomeText", + Newtonsoft.Json.JsonConvert.SerializeObject(new { HotelId = CurrentHotelID, MusicUrl = ffg, WelcomeText = entity.WelcomeSpeech }), CurrentHotelCode, "");//通知天猫精灵播放欢迎词 + } if (sysHotel.IsUseQianLiMa) { QianLiMa_PMS.QiYong(sysHotel.Code, "add"); diff --git a/WebSite/Scripts/host-index.js b/WebSite/Scripts/host-index.js index 3a6627d..9755a66 100644 --- a/WebSite/Scripts/host-index.js +++ b/WebSite/Scripts/host-index.js @@ -712,7 +712,29 @@ function dockingInfo() { .dialog({ title: lang.DockingInformation, width: 600, height: 380 }) .dialog("open"); } - +function deletemusic() +{ + $.ajax({ + url: '/SysHotel/DeleteBGM/', + type: 'Post', + //contentType: 'application/x-www-form-urlencoded', + contentType: 'application/json', + //data: JSON.stringify(getdata), + data: {}, + success: function(response) { + $("#welcomebgmid").val(""); + }, + error: function(xhr, status, error) { + console.log(error); + }, + beforeSend: function(xhr) { + console.log('Sending request...'); + }, + complete: function(xhr, status) { + console.log('Request completed.'); + } + }); +} function uploadmusic() { var filename = $("#welcomebgm").val(); @@ -725,8 +747,10 @@ function uploadmusic() secureuri: false, fileElementId: "welcomebgm", dataType: "json", - success: function (data) { - + success: function (response) { + console.log(response); + var fname= response.FileName; + $("#welcomebgmid").val(fname); }, error: function (data, status, e) { $("#msg").html(e); diff --git a/WebSite/Views/SysHotel/EditDockingInfo.ascx b/WebSite/Views/SysHotel/EditDockingInfo.ascx index 48ea0cc..dd0dc8a 100644 --- a/WebSite/Views/SysHotel/EditDockingInfo.ascx +++ b/WebSite/Views/SysHotel/EditDockingInfo.ascx @@ -80,8 +80,9 @@ - +
Save + Remove