From 82ecc76d00c6d600cbcadd73e6b86069a78109ba Mon Sep 17 00:00:00 2001 From: TianMaiCheng <746290578@qq.com> Date: Tue, 23 Dec 2025 10:08:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=8C=E6=99=AF=E9=9F=B3=E4=B9=90=E5=92=8C?= =?UTF-8?q?=20=E6=95=85=E9=9A=9C=E4=B8=8A=E6=8A=A5=20=E5=AE=9D=E6=98=93?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CRICS_V3_1124.suo | Bin 12780544 -> 12780544 bytes Common/CSRedisCacheHelper.cs | 5 ++ CommonEntity/CacheKey.cs | 2 + Domain/SysHotel.cs | 9 +++ Domain/SysHotel.hbm.xml | 1 + RCUHost/Implement/HostServer.cs | 21 ++++-- RCUHost/Implement/RoomStatusReceiver.cs | 17 ++++- WebSite/Controllers/RoomStatusController.cs | 2 +- WebSite/Controllers/SysHotelController.cs | 63 +++++++++++++++++- WebSite/License/blw-t3s.lic | 2 +- WebSite/Resource/en-US.Designer.cs | 9 +++ WebSite/Resource/en-US.resx | 3 + WebSite/Resource/zh-CN.Designer.cs | 9 +++ WebSite/Resource/zh-CN.resx | 3 + WebSite/Resource/zh-TW.Designer.cs | 9 +++ WebSite/Resource/zh-TW.resx | 3 + WebSite/Scripts/host-index.js | 22 +++++++ WebSite/Views/SysHotel/EditDockingInfo.ascx | 68 ++++++++------------ WebSite/Web.config | 2 + 19 files changed, 200 insertions(+), 50 deletions(-) diff --git a/CRICS_V3_1124.suo b/CRICS_V3_1124.suo index a13dd3337f33fde5a23a0070eb3d35191766562b..923ba7d669105fc042cc95c493d829373f26da25 100644 GIT binary patch delta 60887 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 + /// 背景音乐 + /// + public virtual string WelcomeBGM + { + get; + set; + } /// /// 离房提示：拔卡结束提示语 /// diff --git a/Domain/SysHotel.hbm.xml b/Domain/SysHotel.hbm.xml index 3bec7e0..8c4f94a 100644 --- a/Domain/SysHotel.hbm.xml +++ b/Domain/SysHotel.hbm.xml @@ -25,6 +25,7 @@ + diff --git a/RCUHost/Implement/HostServer.cs b/RCUHost/Implement/HostServer.cs index 2de05c7..d7c67f3 100644 --- a/RCUHost/Implement/HostServer.cs +++ b/RCUHost/Implement/HostServer.cs @@ -887,6 +887,7 @@ namespace RCUHost.Implement //欢迎词 string WelcomeSpeech = host.SysHotel.WelcomeSpeech; + string WelcomeBGM = host.SysHotel.WelcomeBGM; //欢送词 string GoodbyeSpeech = host.SysHotel.GoodbyeSpeech; @@ -1023,21 +1024,31 @@ namespace RCUHost.Implement #region 天猫 if (flag == 1 && !string.IsNullOrEmpty(WelcomeSpeech))//取电打开时，播放欢迎词 { - var TTT = new Tuple(TianMaoCUID, WelcomeSpeech, hotelcode, roomnumber); + var TTT = new Tuple(TianMaoCUID, WelcomeSpeech, hotelcode, roomnumber, WelcomeBGM); Task.Factory.StartNew((state) => { - var hhh = state as Tuple; + var hhh = state as Tuple; var a = hhh.Item1.Split(','); var b = hhh.Item2; var c = hhh.Item3; var d = hhh.Item4; + var e = hhh.Item5; foreach (string cuid in a)//多个英文逗号隔开 { - 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);//通知天猫精灵播放欢迎词 + } Interface3Log w1 = new Interface3Log(); w1.HotelCode = c; @@ -1395,7 +1406,7 @@ namespace RCUHost.Implement //sb.Clear(); //sb.Append(VVV1); //sb.Append(VVV2); - string sb = string.Concat(VVV1,VVV2); + string sb = string.Concat(VVV1, VVV2); string YiJingChuLiGuo = CacheKey.AllReadyDealWith0E_Prefix + "_" + HostNUMBER; object data = MemoryCacheHelper.Get(YiJingChuLiGuo); if (data != null) diff --git a/RCUHost/Implement/RoomStatusReceiver.cs b/RCUHost/Implement/RoomStatusReceiver.cs index 9f0aebe..8c3c06a 100644 --- a/RCUHost/Implement/RoomStatusReceiver.cs +++ b/RCUHost/Implement/RoomStatusReceiver.cs @@ -967,13 +967,26 @@ namespace RCUHost.Implement var a = hhh.TianMaoCUID.Split(','); var b = hhh.SysHotel.WelcomeSpeech; + string bb = hhh.SysHotel.WelcomeBGM; + 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)//多个英文逗号隔开 { - TianMaoOperation.PostWebRequestToTianMao("PushWelcome", - Newtonsoft.Json.JsonConvert.SerializeObject(new { HotelId = cuid.Split('&')[0], RoomNo = cuid.Split('&')[1], WelcomeText = b }), c, d);//通知天猫精灵播放欢迎词 + 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);//通知天猫精灵播放欢迎词 + } Interface3Log w1 = new Interface3Log(); w1.HotelCode = c; diff --git a/WebSite/Controllers/RoomStatusController.cs b/WebSite/Controllers/RoomStatusController.cs index 0f67d94..fadb139 100644 --- a/WebSite/Controllers/RoomStatusController.cs +++ b/WebSite/Controllers/RoomStatusController.cs @@ -374,7 +374,7 @@ namespace WebSite.Controllers { string DKey = string.Format("DKey_{0}_{1}_{2}_{3}", CurrentHotelID, roomnum, "054000001", "054000100"); var ddd = HttpContext.Cache.Get(DKey); - List takeOutdata = null; + List takeOutdata = new List(); if (ddd != null) { takeOutdata = ddd as List; diff --git a/WebSite/Controllers/SysHotelController.cs b/WebSite/Controllers/SysHotelController.cs index f536ea3..e346e87 100644 --- a/WebSite/Controllers/SysHotelController.cs +++ b/WebSite/Controllers/SysHotelController.cs @@ -171,6 +171,67 @@ namespace WebSite.Controllers SaveSystemLog(AuthorityID, action, entity.Name); return Json(new { IsSuccess = true, Message = HttpContext.InnerLanguage("SaveSuccess") }); } + + /// + /// 上传BGM + /// + /// + [Authorize()] + public ActionResult UploadWebcomeBGM() + { + try + { + var sysHotel = SysHotelManager.Get(CurrentHotelID); + + HttpFileCollection hfc = System.Web.HttpContext.Current.Request.Files; + + if (hfc.Count < 1 || hfc[0].ContentLength <= 0 || String.IsNullOrEmpty(hfc[0].FileName)) + { + return Json(new { IsSuccess = false, Message = HttpContext.InnerLanguage("PleaseSelectAuthorizationFile") }); + } + string start_timeddd = DateTime.Now.ToString("yyyyMMddHHmmss"); + string NewFileName = start_timeddd + hfc[0].FileName; + string file = string.Format(Tools.GetApplicationPath() + @"welcomebgm\{0}", NewFileName); + string path = Path.GetDirectoryName(file); + if (!Directory.Exists(path)) + { + Directory.CreateDirectory(path); + } + + hfc[0].SaveAs(file); + + var LLL = HostManager.LoadAll(CurrentHotelID); + foreach (Host item in LLL) + { + Host TakeOut = null; + string HostNumberOnly = item.HostNumber; + string Key = CacheKey.HostInfo_Key_HostNumber + "_" + HostNumberOnly; + object obj = MemoryCacheHelper.Get(Key); + if (obj != null) + { + TakeOut = obj as Host; + TakeOut.SysHotel.WelcomeBGM = NewFileName; + } + } + + sysHotel.WelcomeBGM = NewFileName; + SysHotelManager.Update(sysHotel); + return Json(new { IsSuccess = true, FileName = NewFileName }, JsonRequestBehavior.AllowGet); + } + catch (Exception ex) + { + if (logger.IsErrorEnabled) + { + logger.Error(ex); + } + + return Json(new { IsSuccess = false, Message = ex.Message }, JsonRequestBehavior.AllowGet); + } + + } + + + /// /// 保存第三方对接信息 /// @@ -499,7 +560,7 @@ namespace WebSite.Controllers var T = JsonConvert.DeserializeObject>(reqData); //T.ForEach(A => A.HotelCode = CurrentHotelCode); string GGG = CacheKey.KT_Timer_Controller + "_" + CurrentHotelCode; - CSRedisCacheHelper.Set_PartitionWithForever>(GGG,T,5); + CSRedisCacheHelper.Set_PartitionWithForever>(GGG, T, 5); var client1 = new RestClient(missionsys_address); foreach (var item in T) { diff --git a/WebSite/License/blw-t3s.lic b/WebSite/License/blw-t3s.lic index 5927002..3a5c14e 100644 --- a/WebSite/License/blw-t3s.lic +++ b/WebSite/License/blw-t3s.lic @@ -1 +1 @@ -HP6vcqAL58UjczRRQ7SpqppM9wczrgOic0weey1QcnOwxYcvTnrjb2iqkBsCPfbOxOYezdzkDroujE752nqi5UkychJq0szAj70/q3C0tG5fzXspn9ih9W67FbPxy50NTFAQd97KmH9k0bLIUdgv8rG3zicIc8yKZBkungptRjF8u7TWygG7BU/TuQqWd7xnzwjgIiqu/38AwpbY22XWlTLlsR89SrM682uO41AKBP2NqlUv16f/sfXpsLhJ9wec0dPGjspdpmpbWYIHhETbSzjiBIBI6+ik6fI563PT9HuwSloHJcH7eUan+SBArY4Nr7B+I/mRP+bdSTqBW9OuJgRPtxqDUkfngqkwORHmsA4GNBNDavZAQQ== +HP6vcqAL58UjczRRQ7SpqppM9wczrgOic0weey1QcnOwxYcvTnrjb2iqkBsCPfbOxOYezdzkDroujE752nqi5al/ZAfZmClht3PdyuLcoBy09L1PXHp8fnfXgbAEhvN+VrclVv2W1CCOwhuobej6tFAf4WUYOQf8xJNTJvpm71IXNzGeairfhWwbWVsfXq+9qMrJYNiAEkUaCACHP7jNWxyOjnUv5p1hdcoVfjGmAJdgGhzl3KUwGpuTDQ9s4QqYWF9sN+lae8Xd7E9ueRF0A/eTr2ksTqdqdCIr2TYOxPL+oG+TmYhorTEVuA6DKJSiMGGTSvUILfwjUka9Zva88HB7MxbhqUB3zlYu+uut/vNVjNdSBveYow== diff --git a/WebSite/Resource/en-US.Designer.cs b/WebSite/Resource/en-US.Designer.cs index 929ad18..0d42286 100644 --- a/WebSite/Resource/en-US.Designer.cs +++ b/WebSite/Resource/en-US.Designer.cs @@ -8125,6 +8125,15 @@ namespace WebSite.Resource { } } + /// + /// 查找类似 WelcomeBGM 的本地化字符串。 + /// + internal static string WelcomeBGM { + get { + return ResourceManager.GetString("WelcomeBGM", resourceCulture); + } + } + /// /// 查找类似 Time of Welcome Mode（M） 的本地化字符串。 /// diff --git a/WebSite/Resource/en-US.resx b/WebSite/Resource/en-US.resx index 89a0352..97a47ad 100644 --- a/WebSite/Resource/en-US.resx +++ b/WebSite/Resource/en-US.resx @@ -2896,4 +2896,7 @@ Single circuit status Timed ECO + + WelcomeBGM + \ No newline at end of file diff --git a/WebSite/Resource/zh-CN.Designer.cs b/WebSite/Resource/zh-CN.Designer.cs index 7980e4d..75e96e9 100644 --- a/WebSite/Resource/zh-CN.Designer.cs +++ b/WebSite/Resource/zh-CN.Designer.cs @@ -8133,6 +8133,15 @@ namespace WebSite.Resource { } } + /// + /// 查找类似 欢迎背景乐 的本地化字符串。 + /// + internal static string WelcomeBGM { + get { + return ResourceManager.GetString("WelcomeBGM", resourceCulture); + } + } + /// /// 查找类似 欢迎模式时间(分) 的本地化字符串。 /// diff --git a/WebSite/Resource/zh-CN.resx b/WebSite/Resource/zh-CN.resx index 075431b..c19a4b0 100644 --- a/WebSite/Resource/zh-CN.resx +++ b/WebSite/Resource/zh-CN.resx @@ -2898,4 +2898,7 @@ 定时调温 + + 欢迎背景乐 + \ No newline at end of file diff --git a/WebSite/Resource/zh-TW.Designer.cs b/WebSite/Resource/zh-TW.Designer.cs index 3d5019a..91a72cd 100644 --- a/WebSite/Resource/zh-TW.Designer.cs +++ b/WebSite/Resource/zh-TW.Designer.cs @@ -8135,6 +8135,15 @@ namespace WebSite.Resource { } } + /// + /// 查找类似 歡迎詞背景樂 的本地化字符串。 + /// + internal static string WelcomeBGM { + get { + return ResourceManager.GetString("WelcomeBGM", resourceCulture); + } + } + /// /// 查找类似 歡迎模式時間(分) 的本地化字符串。 /// diff --git a/WebSite/Resource/zh-TW.resx b/WebSite/Resource/zh-TW.resx index 0585757..e7748c0 100644 --- a/WebSite/Resource/zh-TW.resx +++ b/WebSite/Resource/zh-TW.resx @@ -2900,4 +2900,7 @@ 定時調溫 + + 歡迎詞背景樂 + \ No newline at end of file diff --git a/WebSite/Scripts/host-index.js b/WebSite/Scripts/host-index.js index 13dd625..3a6627d 100644 --- a/WebSite/Scripts/host-index.js +++ b/WebSite/Scripts/host-index.js @@ -712,6 +712,28 @@ function dockingInfo() { .dialog({ title: lang.DockingInformation, width: 600, height: 380 }) .dialog("open"); } + +function uploadmusic() +{ + var filename = $("#welcomebgm").val(); + if (filename == "") { + return; + } + $.ajaxFileUpload({ + url: "/SysHotel/UploadWebcomeBGM/", + type: "POST", + secureuri: false, + fileElementId: "welcomebgm", + dataType: "json", + success: function (data) { + + }, + error: function (data, status, e) { + $("#msg").html(e); + } + }); +} + //保存酒店第三方对接信息 function saveDockingInfo() { var form = $("#dialog").find("form"); diff --git a/WebSite/Views/SysHotel/EditDockingInfo.ascx b/WebSite/Views/SysHotel/EditDockingInfo.ascx index a47bd9a..48ea0cc 100644 --- a/WebSite/Views/SysHotel/EditDockingInfo.ascx +++ b/WebSite/Views/SysHotel/EditDockingInfo.ascx @@ -1,4 +1,5 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +