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-04 18:05:46 +08:00
parent 1d77141ffe
commit 6196311cb7
7 changed files with 118 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
RCUHost/Implement/RoomStatusReceiver.cs
View File

@@ -157,7 +157,7 @@ namespace RCUHost.Implement
//来一个数据，把所有的地址拼接起来
string YiJingChuLiGuo = CacheKey.AllReadyDealWith0E_Prefix + "_" + HostNumberOnly;
MemoryCacheHelper.Delete(YiJingChuLiGuo);
ProcessModal_NEW_NEW(host, status.Devices, isTriggerWelcomeMsg, context.MessageID, context.IsMonitor);//更新灯光及其他回路状态
ProcessModal_NEW_NEW(host, status.Devices, isTriggerWelcomeMsg, context.MessageID, context.IsMonitor, context.Data, status);//更新灯光及其他回路状态
string nnn = VVV1 + VVV2;
if (!string.IsNullOrEmpty(nnn))
{
@@ -224,7 +224,7 @@ namespace RCUHost.Implement
public static string Missionsys_Address = ConfigurationManager.AppSettings["missionsys_address"];
public static string MQTTInfo_report_url = ConfigurationManager.AppSettings["debug_log_report_url"].ToString();
private void ProcessModal_NEW_NEW(Host host, ConcurrentDictionary<string, Device> devices, bool IsTriggerWelcomeMsg, string ContextMessageId, bool ismonitor)
private void ProcessModal_NEW_NEW(Host host, ConcurrentDictionary<string, Device> devices, bool IsTriggerWelcomeMsg, string ContextMessageId, bool ismonitor, byte[] OriginalByteList, Status yuanshidata)
{
string UUID = "9dc6a0ee-dcf1-4385-b05f-09cb463838cd";
UUID = host.FCS_locationUUID;
@@ -257,6 +257,9 @@ namespace RCUHost.Implement
bool isInsert = false;
StepTongJi.SendInfo(4.3, "Task开始执行设备信息处理", ContextMessageId, ismonitor);
List<ts_deviceitem> shebei_changeaction_list = new List<ts_deviceitem>();
List<ts_faultitem> exception_list = new List<ts_faultitem>();
//StringBuilder sbSQL;
foreach (var device in devices)
{
@@ -1845,9 +1848,26 @@ namespace RCUHost.Implement
}
#endregion
//0关闭设备，
//1打开设备且当前设备处于关闭状态，
//2打开设备且当前设备处于打开状态
if (flag == 0 || flag == 1)
{
ts_deviceitem t1 = new ts_deviceitem();
string dizhi = device.Value.Address;
t1.dev_type = short.Parse(dizhi.Substring(0, 3));
t1.dev_addr = short.Parse(dizhi.Substring(3, 3));
t1.dev_loop = short.Parse(dizhi.Substring(6, 3));
t1.dev_data = device.Value.StatusReceiver;
shebei_changeaction_list.Add(t1);
}
#region 当设备或服务状态发生变化时，推送给指定的第三方接口
if ((flag == 0 || flag == 1) && (!string.IsNullOrEmpty(host.SysHotel.DeviceStatusPushURL)))
{
if (host.SysHotel.DeviceStatusPushURL.ToLower().IndexOf("wangjile") > -1)//freego过滤
{
switch (hostModal.Modal.ModalAddress)
@@ -1892,18 +1912,12 @@ namespace RCUHost.Implement
}
MyHttp.SendHttpData(ttt.Item1.SysHotel.DeviceStatusPushURL, resp);
//string Key = "HttpRequest_" + resp.code + "_" + resp.roomNumber;
//var Data = MemoryCacheHelper.Get(Key);
//if (Data != null)
//{
//}
//else
//{
// //XuanZhuOperation.ReportService(ttt.Item1.SysHotel.DeviceStatusPushURL, resp);
//}
}, tup);
}
#endregion
@@ -1940,6 +1954,7 @@ namespace RCUHost.Implement
CSRedisCacheHelper.Publish("Redis-XuanZhuKafka", str111);
}
#endregion
}
else
{
@@ -1952,6 +1967,55 @@ namespace RCUHost.Implement
}
}
#region 新版本日志队列
byte[] OriginalByte = OriginalByteList;
DeviceActionData d1 = new DeviceActionData();
d1.ts_ms = Tools.GetUnixTime();
d1.hotel_id = HOTEL_CODE;
d1.room_id = ROOMNUMBER;
d1.device_id = HOSTNUMBER;
d1.frame_id = frameNo;
d1.cmd_word = "0E";
d1.udp_raw = OriginalByte;
d1.direction = "上报";
if (yuanshidata.SysLock)
{
d1.sys_lock_status = 1;
}
else
{
d1.sys_lock_status = 2;
}
if (yuanshidata.Faults != null && yuanshidata.Faults.Count > 0)
{
var F1 = yuanshidata.Faults;
foreach (var item in F1)
{
string dizhi = item.Value.FaultNo;
ts_faultitem t1 = new ts_faultitem();
t1.dev_type = short.Parse(dizhi.Substring(0, 3));
t1.dev_addr = short.Parse(dizhi.Substring(3, 3));
t1.dev_loop = short.Parse(dizhi.Substring(6, 3));
t1.error_type = item.Value.Type;
t1.error_data = item.Value.Data;
exception_list.Add(t1);
}
}
d1.device_list = shebei_changeaction_list;
d1.fault_list = exception_list;
d1.report_count = shebei_changeaction_list.Count;
d1.fault_count = exception_list.Count;
string sss111 = Newtonsoft.Json.JsonConvert.SerializeObject(d1);
CSRedisCacheHelper.Publish("redis-0X36-0X0F", sss111);
#endregion
StepTongJi.SendInfo(5, "Task中的设备处理代码执行完毕", ContextMessageId, ismonitor);
devices.Clear();
}