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

增加电量报警模块

Browse Source 
但是只是一部分功能
This commit is contained in:
TianMaiCheng
2026-03-30 17:55:55 +08:00
parent 696144b2ff
commit 182186e1fb
22 changed files with 147 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
WebSite/Controllers/ApiController.cs
View File

@@ -4421,7 +4421,7 @@ namespace WebSite.Controllers
Request.InputStream.Read(byts, 0, byts.Length);
string jsonData = System.Text.Encoding.UTF8.GetString(byts);
JWTData JJJ = null;
int code = 0;
int code = 401;
string msg = "";
var dic = JsonConvert.DeserializeObject<Dictionary<string, string>>(jsonData);
if (dic != null)
@@ -5329,10 +5329,10 @@ namespace WebSite.Controllers
long jishu_error = Interlocked.Read(ref MvcApplication.UDPServerErrorCount);
if (jishu_error >= 3)
{
//logger.Error("重启了UDP服务器");
//Interlocked.Exchange(ref MvcApplication.UDPServerErrorCount, 0);
//var hostServer = (IHostServer)MvcApplication.cxt.GetObject("RCUHost.HostServer");
//hostServer.Start();
logger.Error("重启了UDP服务器");
Interlocked.Exchange(ref MvcApplication.UDPServerErrorCount, 0);
var hostServer = (IHostServer)MvcApplication.cxt.GetObject("RCUHost.HostServer");
hostServer.Start();
}
var TotalKey = "UDPPackage_TotalRecvPackage";
UDPPackageCount LLL_T = null;
@@ -6081,7 +6081,6 @@ namespace WebSite.Controllers
}
#region 宝易系统接口
/// <summary>
@@ -6816,6 +6815,7 @@ namespace WebSite.Controllers
{
try
{
HostServer.StopConsumerTasks();
if (key.Equals("blw^_^wlb"))
{
var hostServer = (IHostServer)MvcApplication.cxt.GetObject("RCUHost.HostServer");

11
WebSite/Controllers/IoTController.cs
View File

@@ -5365,7 +5365,7 @@ namespace WebSite.Controllers
}
else
{
r.code = code;
r.code = 401;
r.msg = msg;
}
}
@@ -5413,7 +5413,7 @@ namespace WebSite.Controllers
}
else
{
r.code = code;
r.code = 401;
r.msg = msg;
}
r.data = list;
@@ -5637,9 +5637,10 @@ namespace WebSite.Controllers
var TuT = SignKeyCommon.TokenValidate(Token, out JJJ, out code, out msg);
if (!TuT)
{
code = 0;
code = 401;
result.code = code;
result.msg = "Token验证不通过";
logger.Error("chuangwei Token验证失败 " + AuthData);
return Json(result, JsonRequestBehavior.AllowGet);
}
}
@@ -6208,7 +6209,7 @@ namespace WebSite.Controllers
var TuT = SignKeyCommon.TokenValidate(Token, out JJJ, out code, out msg);
if (!TuT)
{
code = 0;
code = 401;
result.code = code;
result.msg = "Token验证不通过";
return Json(result, JsonRequestBehavior.AllowGet);
@@ -7460,7 +7461,7 @@ namespace WebSite.Controllers
var name = item.applianceName;
var area = item.area;
List<HostModal> q1 = new List<HostModal>();
if (name.Equals("灯")||name.Equals("所有灯"))
if (name.Equals("灯") || name.Equals("所有灯"))
{
q1 = hostModals.Where(A => A.Modal.Name.Contains("灯")).ToList();
}

2
WebSite/Controllers/SysHotelController.cs
View File

@@ -296,6 +296,7 @@ namespace WebSite.Controllers
sysHotel.FCS_RCU_Online = entity.FCS_RCU_Online;
sysHotel.FCS_MenCi_Close = entity.FCS_MenCi_Close;
sysHotel.FCS_MenCi_Open = entity.FCS_MenCi_Open;
sysHotel.FCS_MenSuo_DianLiang = entity.FCS_MenSuo_DianLiang;
sysHotel.IsUseSkyworthTV = entity.IsUseSkyworthTV;
@@ -387,6 +388,7 @@ namespace WebSite.Controllers
TakeOut.SysHotel.FCS_RCU_Online = entity.FCS_RCU_Online;
TakeOut.SysHotel.FCS_MenCi_Close = entity.FCS_MenCi_Close;
TakeOut.SysHotel.FCS_MenCi_Open = entity.FCS_MenCi_Open;
TakeOut.SysHotel.FCS_MenSuo_DianLiang = entity.FCS_MenSuo_DianLiang;
TakeOut.SysHotel.IsUseSkyworthTV = entity.IsUseSkyworthTV;//断电重置小度
TakeOut.SysHotel.IsUseTCLTV = entity.IsUseTCLTV;//断电重置小度

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

@@ -2725,6 +2725,15 @@ namespace WebSite.Resource {
}
}
/// <summary>
/// 查找类似 Doorlockbattery 的本地化字符串。
/// </summary>
internal static string FCS_MenSuo_DianLiang {
get {
return ResourceManager.GetString("FCS_MenSuo_DianLiang", resourceCulture);
}
}
/// <summary>
/// 查找类似 FCS_RCU_Device_Offline 的本地化字符串。
/// </summary>

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

@@ -2911,4 +2911,7 @@ Single circuit status</value>
<data name="RoomStatusSwitch" xml:space="preserve">
<value>Switch RoomStatus To Power Off</value>
</data>
<data name="FCS_MenSuo_DianLiang" xml:space="preserve">
<value>Doorlockbattery</value>
</data>
</root>

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

@@ -2724,6 +2724,15 @@ namespace WebSite.Resource {
}
}
/// <summary>
/// 查找类似 门锁电量 的本地化字符串。
/// </summary>
internal static string FCS_MenSuo_DianLiang {
get {
return ResourceManager.GetString("FCS_MenSuo_DianLiang", resourceCulture);
}
}
/// <summary>
/// 查找类似 RCU 设备断线 的本地化字符串。
/// </summary>

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

@@ -2913,4 +2913,7 @@
<data name="TuiFang" xml:space="preserve">
<value>退房</value>
</data>
<data name="FCS_MenSuo_DianLiang" xml:space="preserve">
<value>门锁电量</value>
</data>
</root>

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

@@ -2724,6 +2724,15 @@ namespace WebSite.Resource {
}
}
/// <summary>
/// 查找类似 門鎖電量 的本地化字符串。
/// </summary>
internal static string FCS_MenSuo_DianLiang {
get {
return ResourceManager.GetString("FCS_MenSuo_DianLiang", resourceCulture);
}
}
/// <summary>
/// 查找类似 RCU 設備 OffLine 的本地化字符串。
/// </summary>

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

@@ -2915,4 +2915,7 @@
<data name="TuiFang" xml:space="preserve">
<value>退房</value>
</data>
<data name="FCS_MenSuo_DianLiang" xml:space="preserve">
<value>門鎖電量</value>
</data>
</root>

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

@@ -299,6 +299,17 @@
<input id="txt14" name="FCS_MenCi_Open" class="textbox text" value="<%: Model.FCS_MenCi_Open %>" />
</td>
</tr>
<tr>
<th align="right">
<label for="FCS_MenSuo_DianLiang">
<%: Html.Language("FCS_MenSuo_DianLiang")%>：</label>
</th>
<td>
<input id="txt14" name="FCS_MenSuo_DianLiang" class="textbox text" value="<%: Model.FCS_MenSuo_DianLiang %>" />
</td>
</tr>
<tr>
<th align="right">
<label for="isusechuangwei">