Boonlive_RD_Web/Web_CRICS_Server_VS2010_Prod
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加日志推送，增加房态变化的时候 断电功能

Browse Source
This commit is contained in:
TianMaiCheng
2026-02-03 08:53:47 +08:00
parent e4610f1ffa
commit 1d77141ffe
21 changed files with 229 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
WebSite/Controllers/SysHotelController.cs
View File

@@ -306,6 +306,10 @@ namespace WebSite.Controllers
sysHotel.IsPushPMSData = entity.IsPushPMSData;
sysHotel.HeTongNumber = entity.HeTongNumber;
sysHotel.ETV_HotelID = entity.ETV_HotelID;
sysHotel.SwitchRoomStatus_PowerOff2 = entity.SwitchRoomStatus_PowerOff2;
sysHotel.SwitchRoomStatus_PowerOff4 = entity.SwitchRoomStatus_PowerOff4;
sysHotel.SwitchRoomStatus_PowerOff8 = entity.SwitchRoomStatus_PowerOff8;
sysHotel.SwitchRoomStatus_PowerOff16 = entity.SwitchRoomStatus_PowerOff16;
//sysHotel.TCLAppId = entity.TCLAppId;
//sysHotel.TCLAppSecret = entity.TCLAppSecret;
SysHotelManager.Update(sysHotel);
@@ -390,6 +394,12 @@ namespace WebSite.Controllers
TakeOut.SysHotel.IsPushPMSData = entity.IsPushPMSData;
TakeOut.SysHotel.HeTongNumber = entity.HeTongNumber;
TakeOut.SysHotel.ETV_HotelID = entity.ETV_HotelID;
TakeOut.SysHotel.SwitchRoomStatus_PowerOff2 = entity.SwitchRoomStatus_PowerOff2;
TakeOut.SysHotel.SwitchRoomStatus_PowerOff4 = entity.SwitchRoomStatus_PowerOff4;
TakeOut.SysHotel.SwitchRoomStatus_PowerOff8 = entity.SwitchRoomStatus_PowerOff8;
TakeOut.SysHotel.SwitchRoomStatus_PowerOff16 = entity.SwitchRoomStatus_PowerOff16;
//TakeOut.SysHotel.TCLAppId = entity.TCLAppId;
//TakeOut.SysHotel.TCLAppSecret = entity.TCLAppSecret;

15
WebSite/Global.asax.cs
View File

@@ -47,6 +47,7 @@ namespace WebSite
private IRoomStatusManager RoomStatusManager;
private IDeviceControlReceiver DeviceControlReceiver;
private IOverviewManager OverviewManager { get; set; }
public IHostModalManager HostModalManager { get; set; }
public static IHostServer hostServer { get; set; }
//private IGroupManager GroupManager;
@@ -521,6 +522,7 @@ namespace WebSite
RoomStatusManager = (IRoomStatusManager)cxt.GetObject("Manager.RoomStatus");
DeviceControlReceiver = (IDeviceControlReceiver)cxt.GetObject("RCUHost.DeviceControlReceiver");
OverviewManager = (IOverviewManager)cxt.GetObject("Manager.Overview");
HostModalManager = (IHostModalManager)cxt.GetObject("Manager.HostModal");
_client = new syncstatus.syncstatusSoapClient();
Timer timer2 = new Timer(20000);//每20秒扫描一次
@@ -735,6 +737,19 @@ namespace WebSite
Host host = HostManager.GetByRoomNumber(T1.Item2, T1.Item1);
if (host != null)
{
int status_id2 = host.SysHotel.SwitchRoomStatus_PowerOff2;
int status_id4 = host.SysHotel.SwitchRoomStatus_PowerOff4;
int status_id8 = host.SysHotel.SwitchRoomStatus_PowerOff8;
int status_id16 = host.SysHotel.SwitchRoomStatus_PowerOff16;
if (status_id2 != 0 || status_id4 != 0 || status_id8 != 0 || status_id16 != 0)
{
if (status_id2 == roomStatus.ID||status_id4==roomStatus.ID||status_id8==roomStatus.ID||status_id16==roomStatus.ID)
{
HostModal h1 = new HostModal();
h1.Modal = new RoomTypeModal() { ModalAddress = "004000001", Type = DeviceType.ServiceInfo };
HostModalManager.SetDevice(host, h1, 2, 0, 25, 0, 0, 0);
}
}
HostManager.ChangeRoomStatus(host, T1.Item3);
string Key = CacheKey.SyncRoomStatus + "_" + host.HostNumber;
RoomStatusRequest ddd = new RoomStatusRequest();

36
WebSite/Resource/en-US.Designer.cs generated
View File

@@ -1303,6 +1303,15 @@ namespace WebSite.Resource {
}
}
/// <summary>
/// 查找类似 Apartment for Rent​ 的本地化字符串。
/// </summary>
internal static string ChuZu {
get {
return ResourceManager.GetString("ChuZu", resourceCulture);
}
}
/// <summary>
/// 查找类似 Circuit 的本地化字符串。
/// </summary>
@@ -1663,6 +1672,15 @@ namespace WebSite.Resource {
}
}
/// <summary>
/// 查找类似 For Rent​ 的本地化字符串。
/// </summary>
internal static string DaiZu {
get {
return ResourceManager.GetString("DaiZu", resourceCulture);
}
}
/// <summary>
/// 查找类似 Data 的本地化字符串。
/// </summary>
@@ -6028,6 +6046,15 @@ namespace WebSite.Resource {
}
}
/// <summary>
/// 查找类似 Switch RoomStatus To Power Off 的本地化字符串。
/// </summary>
internal static string RoomStatusSwitch {
get {
return ResourceManager.GetString("RoomStatusSwitch", resourceCulture);
}
}
/// <summary>
/// 查找类似 Temp 的本地化字符串。
/// </summary>
@@ -7657,6 +7684,15 @@ namespace WebSite.Resource {
}
}
/// <summary>
/// 查找类似 CheckOut 的本地化字符串。
/// </summary>
internal static string TuiFang {
get {
return ResourceManager.GetString("TuiFang", resourceCulture);
}
}
/// <summary>
/// 查找类似 TV 的本地化字符串。
/// </summary>

12
WebSite/Resource/en-US.resx
View File

@@ -2899,4 +2899,16 @@ Single circuit status</value>
<data name="WelcomeBGM" xml:space="preserve">
<value>WelcomeBGM</value>
</data>
<data name="ChuZu" xml:space="preserve">
<value>Apartment for Rent​</value>
</data>
<data name="DaiZu" xml:space="preserve">
<value>For Rent​</value>
</data>
<data name="TuiFang" xml:space="preserve">
<value>CheckOut</value>
</data>
<data name="RoomStatusSwitch" xml:space="preserve">
<value>Switch RoomStatus To Power Off</value>
</data>
</root>

36
WebSite/Resource/zh-CN.Designer.cs generated
View File

@@ -1302,6 +1302,15 @@ namespace WebSite.Resource {
}
}
/// <summary>
/// 查找类似 出租 的本地化字符串。
/// </summary>
internal static string ChuZu {
get {
return ResourceManager.GetString("ChuZu", resourceCulture);
}
}
/// <summary>
/// 查找类似 回路 的本地化字符串。
/// </summary>
@@ -1662,6 +1671,15 @@ namespace WebSite.Resource {
}
}
/// <summary>
/// 查找类似 待租 的本地化字符串。
/// </summary>
internal static string DaiZu {
get {
return ResourceManager.GetString("DaiZu", resourceCulture);
}
}
/// <summary>
/// 查找类似 数据 的本地化字符串。
/// </summary>
@@ -6045,6 +6063,15 @@ namespace WebSite.Resource {
}
}
/// <summary>
/// 查找类似 状态更新断电​ 的本地化字符串。
/// </summary>
internal static string RoomStatusSwitch {
get {
return ResourceManager.GetString("RoomStatusSwitch", resourceCulture);
}
}
/// <summary>
/// 查找类似 客房温度 的本地化字符串。
/// </summary>
@@ -7665,6 +7692,15 @@ namespace WebSite.Resource {
}
}
/// <summary>
/// 查找类似 退房 的本地化字符串。
/// </summary>
internal static string TuiFang {
get {
return ResourceManager.GetString("TuiFang", resourceCulture);
}
}
/// <summary>
/// 查找类似 电视 的本地化字符串。
/// </summary>

12
WebSite/Resource/zh-CN.resx
View File

@@ -2901,4 +2901,16 @@
<data name="WelcomeBGM" xml:space="preserve">
<value>欢迎背景乐</value>
</data>
<data name="ChuZu" xml:space="preserve">
<value>出租</value>
</data>
<data name="DaiZu" xml:space="preserve">
<value>待租</value>
</data>
<data name="RoomStatusSwitch" xml:space="preserve">
<value>状态更新断电​</value>
</data>
<data name="TuiFang" xml:space="preserve">
<value>退房</value>
</data>
</root>

36
WebSite/Resource/zh-TW.Designer.cs generated
View File

@@ -1302,6 +1302,15 @@ namespace WebSite.Resource {
}
}
/// <summary>
/// 查找类似 出租 的本地化字符串。
/// </summary>
internal static string ChuZu {
get {
return ResourceManager.GetString("ChuZu", resourceCulture);
}
}
/// <summary>
/// 查找类似 回路 的本地化字符串。
/// </summary>
@@ -1662,6 +1671,15 @@ namespace WebSite.Resource {
}
}
/// <summary>
/// 查找类似 待租 的本地化字符串。
/// </summary>
internal static string DaiZu {
get {
return ResourceManager.GetString("DaiZu", resourceCulture);
}
}
/// <summary>
/// 查找类似 數據 的本地化字符串。
/// </summary>
@@ -6045,6 +6063,15 @@ namespace WebSite.Resource {
}
}
/// <summary>
/// 查找类似 切換狀態即斷電 的本地化字符串。
/// </summary>
internal static string RoomStatusSwitch {
get {
return ResourceManager.GetString("RoomStatusSwitch", resourceCulture);
}
}
/// <summary>
/// 查找类似 客房溫度 的本地化字符串。
/// </summary>
@@ -7667,6 +7694,15 @@ namespace WebSite.Resource {
}
}
/// <summary>
/// 查找类似 退房 的本地化字符串。
/// </summary>
internal static string TuiFang {
get {
return ResourceManager.GetString("TuiFang", resourceCulture);
}
}
/// <summary>
/// 查找类似 電視 的本地化字符串。
/// </summary>

12
WebSite/Resource/zh-TW.resx
View File

@@ -2903,4 +2903,16 @@
<data name="WelcomeBGM" xml:space="preserve">
<value>歡迎詞背景樂</value>
</data>
<data name="ChuZu" xml:space="preserve">
<value>出租</value>
</data>
<data name="DaiZu" xml:space="preserve">
<value>待租</value>
</data>
<data name="RoomStatusSwitch" xml:space="preserve">
<value>切換狀態即斷電</value>
</data>
<data name="TuiFang" xml:space="preserve">
<value>退房</value>
</data>
</root>

11
WebSite/Views/SysHotel/EditDockingInfo.ascx
View File

@@ -388,6 +388,17 @@
</div>
</td>
</tr>
<tr>
<th align="right">
<label for="IsPowerOff1"> <%: Html.Language("RoomStatusSwitch")%>: </label>
</th>
<td>
<input id="SwitchRoomStatus_PowerOff2" type="checkbox" name="SwitchRoomStatus_PowerOff2" style="vertical-align: top;" value="2" <%: Model.SwitchRoomStatus_PowerOff2==2 ? "checked='checked'" : "" %> /> <%: Html.Language("ChuZu")%>
<input id="SwitchRoomStatus_PowerOff4" type="checkbox" name="SwitchRoomStatus_PowerOff4" style="vertical-align: top;" value="4" <%: Model.SwitchRoomStatus_PowerOff4==4 ? "checked='checked'" : "" %> /> <%: Html.Language("DaiZu")%>
<input id="SwitchRoomStatus_PowerOff8" type="checkbox" name="SwitchRoomStatus_PowerOff8" style="vertical-align: top;" value="8" <%: Model.SwitchRoomStatus_PowerOff8==8 ? "checked='checked'" : "" %> /> <%: Html.Language("TuiFang")%>
</td>
</tr>
<%-- TCL 功能--%>
<%-- <tr>
<th align="right">