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-23 08:48:22 +08:00
parent e46b19016b
commit 1840794f40
10 changed files with 131 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WebSite/Controllers/IoTController.cs
View File

@@ -7460,7 +7460,7 @@ namespace WebSite.Controllers
var name = item.applianceName;
var area = item.area;
List<HostModal> q1 = new List<HostModal>();
if (name.Equals("灯"))
if (name.Equals("灯")||name.Equals("所有灯"))
{
q1 = hostModals.Where(A => A.Modal.Name.Contains("灯")).ToList();
}

16
WebSite/Controllers/RoomStatusController.cs
View File

@@ -362,6 +362,22 @@ namespace WebSite.Controllers
var roomnum = room.RoomNumber;
var roomModel = new RoomModel();
#region 电量
string DLKey = CacheKey.DianLiang + "_" + room.HostNumber;
string dianliang = CSRedisCacheHelper.Get_Partition<string>(DLKey, 5);
if (!string.IsNullOrEmpty(dianliang))
{
ushort usa = 0;
ushort.TryParse(dianliang, out usa);
roomModel.WeiXinSuo_DianLiang = usa.ToString();
}
else
{
roomModel.WeiXinSuo_DianLiang = "";
}
#endregion
#region 碳达人
StringBuilder sb = new StringBuilder();
sb.Append(CacheKey.CarbonVIP_Prefix);

5
WebSite/Models/RoomStatusModels.cs
View File

@@ -114,6 +114,11 @@ namespace WebSite.Models
/// </summary>
public string CarbonVIP { get; set; }
/// <summary>
/// 微信锁电量
/// </summary>
public string WeiXinSuo_DianLiang { get; set; }
/// <summary>
/// 功率
/// </summary>

12
WebSite/Scripts/simon-room-status-index.js
View File

@@ -231,7 +231,8 @@ function loadRooms(opts, callback) {
strHtml += "<dl><dt>" + r.Data[i].FloorRooms[j].RoomNumber;
var CarbonVIP_Status = r.Data[i].FloorRooms[j].CarbonVIP;
console.log("VIP:"+CarbonVIP_Status);
var WeiXinSuo_DianLiang = r.Data[i].FloorRooms[j].WeiXinSuo_DianLiang;
console.log("VIP:" + WeiXinSuo_DianLiang);
if (CarbonVIP_Status == "open")
{
strHtml += "<img src='../../Images/ECO/eco_g.png' width='16' height='16' style='margin-right:5px;'/>" + r.Data[i].FloorRooms[j].RoomNumber + "</dt>";
@@ -261,7 +262,14 @@ function loadRooms(opts, callback) {
{
//strHtml += "<dd>" + r.Data[i].FloorRooms[j].Power + "</dd>";
strHtml += "<dd>" + r.Data[i].FloorRooms[j].RoomStatus + "&nbsp;" + r.Data[i].FloorRooms[j].Power + "</dd>";
strHtml += "<dd>" + lang.Identity + ":" + r.Data[i].FloorRooms[j].Identity + "&nbsp" + r.Data[i].FloorRooms[j].PowerSupplyName + "</dd>";
if (WeiXinSuo_DianLiang != "")
{
strHtml += "<dd>" + lang.Identity + ":" + r.Data[i].FloorRooms[j].Identity + "&nbsp;" + r.Data[i].FloorRooms[j].PowerSupplyName + "&nbsp;E:" + r.Data[i].FloorRooms[j].WeiXinSuo_DianLiang + "</dd>";
}
else
{
strHtml += "<dd>" + lang.Identity + ":" + r.Data[i].FloorRooms[j].Identity + "&nbsp;" + r.Data[i].FloorRooms[j].PowerSupplyName + "</dd>";
}
strHtml += "<dd>" + r.Data[i].FloorRooms[j].AirStatusName + "&nbsp;" + strRoomTemp + r.Data[i].FloorRooms[j].RoomTemp + "℃</font>&nbsp;" + r.Data[i].FloorRooms[j].SettingTemp + "℃" + "</dd>";
strHtml += "<dd>" + r.Data[i].FloorRooms[j].ValveName + "&nbsp;" + airMode(r.Data[i].FloorRooms[j].Mode) + "&nbsp;" + fanSpeed(r.Data[i].FloorRooms[j].FanSpeed) + "</dd>";
if (r.Data[i].FloorRooms[j].Peripheral != "")