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;//断电重置小度