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-13 19:28:17 +08:00
parent 4aa6bb31ef
commit 8ce4017100
7 changed files with 58 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
WebSite/Controllers/ApiController.cs
View File

@@ -6385,6 +6385,9 @@ namespace WebSite.Controllers
{
try
{
//Host hostua = new Host() { HostNumber = "096008126073", MAC = "" };
//HostModal hostModal1 = new HostModal() { Modal = new RoomTypeModal() { ModalAddress = "007001000", Type = DeviceType.AirConditioner } };
//HostModalManager.SetDevice(hostua, hostModal1, 0, 0, 25, 0, 1, 0);
var dic = CSRedisCacheHelper.HMGetAll(5, CacheKey.JiNan_TongPai_Spec);
foreach (var item in dic)
@@ -6398,9 +6401,20 @@ namespace WebSite.Controllers
if (span.TotalSeconds >= 60 && span.TotalMinutes <= 75)
{
string[] h_a = k.Split('_');
Host host = new Host() { HostNumber = h_a[0], MAC = "" };
HostModal hostModal = new HostModal() { Modal = new RoomTypeModal() { ModalAddress = h_a[1], Type = DeviceType.AirConditioner } };
HostModalManager.SetDevice(host, hostModal, 0, 0, 0, 0);
var hostnumber = h_a[0];
var address = h_a[1];
var hostid = h_a[2];
Host host = new Host() { HostNumber = hostnumber, MAC = "" };
HostModal hostModal = new HostModal() { Modal = new RoomTypeModal() { ModalAddress = address, Type = DeviceType.AirConditioner } };
string KKey = CacheKey.HostModalStatus_Prefix + "_" + hostid + "_" + address;
var HHostModalData = CSRedisCacheHelper.Get_Partition<HostModal_Cache>(KKey);
var temp = HHostModalData.AirConditionData.SettingTemp;
var mode = HHostModalData.AirConditionData.Mode;
HostModalManager.SetDevice(host, hostModal, 0, 0, temp, 0, mode, 0);
}
}
}
@@ -6408,6 +6422,7 @@ namespace WebSite.Controllers
}
catch (Exception ex)
{
logger.Error("同派出错:"+ex.Message);
return Json(new { IsSuccess = false, Message = HttpContext.InnerLanguage("SaveFailedBecause") + ex.Message });
}
}

14
WebSite/Controllers/IoTController.cs
View File

@@ -1576,6 +1576,13 @@ namespace WebSite.Controllers
bool wendu1 = KongTiaoControlName.Equals("IncrementTemperatureRequest") || KongTiaoControlName.Equals("IncrementTemperatureRequest") || KongTiaoControlName.Equals("SetTemperatureRequest");
bool fengsu1 = KongTiaoControlName.Equals("SetFanSpeedRequest") || KongTiaoControlName.Equals("IncrementFanSpeedRequest") || KongTiaoControlName.Equals("DecrementFanSpeedRequest");
bool moshi1 = KongTiaoControlName.Equals("SetModeRequest");
string tiaowen = request.header.name;
if (tiaowen.Equals("IncrementTemperatureRequest") || tiaowen.Equals("DecrementTemperatureRequest"))
{
HostModalManager.SetDevice(host, hostModal, 1, 0, temperature, 0, 0, 0);
Thread.Sleep(50);
}
//特殊酒店
if (AssertFault(hotel_code))
{
@@ -1626,13 +1633,6 @@ namespace WebSite.Controllers
}
else
{
string tiaowen = request.header.name;
if (tiaowen.Equals("IncrementTemperatureRequest") || tiaowen.Equals("DecrementTemperatureRequest"))
{
HostModalManager.SetDevice(host, hostModal, 1, 0);
Thread.Sleep(50);
}
//对房间设备进行操作
HostModalManager.SetDevice(host, hostModal, status, brightness, temperature, fanSpeed, mode, valve);
}