修改一些BUG
This commit is contained in:
@@ -55,6 +55,10 @@ namespace LogCap.Common
|
||||
List<byte> MsgData = data.Skip(15).Take(Len_int - 15 - 2).ToList();
|
||||
List<byte> CRC_byte = data.TakeLast(2).ToList();
|
||||
|
||||
if (source_ip.Equals("106.32.130.149")&&source_port==3386)
|
||||
{
|
||||
_logger.Error("data:"+Tools.ByteToString(data.ToArray()));
|
||||
}
|
||||
|
||||
string Key = string.Format("{0}_{1}_{2}", CacheKey.RoomIP_Port_Prefix, source_ip, source_port);
|
||||
string Dest_Key = string.Format("{0}_{1}_{2}", CacheKey.RoomIP_Port_Prefix, dest_ip, dest_port);
|
||||
@@ -170,39 +174,39 @@ namespace LogCap.Common
|
||||
//设备状态上报
|
||||
if (cmdType_byte == 0x0E)
|
||||
{
|
||||
if (MsgData != null && MsgData.Count > 0)
|
||||
if (MsgData != null && MsgData.Count > 8)
|
||||
{
|
||||
//设备的数量
|
||||
byte[] couont = MsgData.Skip(7).Take(1).ToArray();
|
||||
int Count = couont[0];
|
||||
|
||||
var MMN = MsgData.Skip(8);
|
||||
for (int j = 0; j < Count; j++)
|
||||
if (couont.Length > 0)
|
||||
{
|
||||
var DeviceData = MMN.Skip(j * 5).Take(5).ToArray();
|
||||
if (DeviceData[0] == 0x0A)
|
||||
int Count = couont[0];
|
||||
|
||||
var MMN = MsgData.Skip(8);
|
||||
for (int j = 0; j < Count; j++)
|
||||
{
|
||||
byte n1 = DeviceData[0];
|
||||
byte n2 = DeviceData[1];
|
||||
var DeviceData = MMN.Skip(j * 5).Take(5).ToArray();
|
||||
if (DeviceData.Length >= 5 && DeviceData[0] == 0x0A)
|
||||
{
|
||||
byte n1 = DeviceData[0];
|
||||
byte n2 = DeviceData[1];
|
||||
|
||||
byte[] vvv = new byte[] { DeviceData[4] };
|
||||
byte[] vvv = new byte[] { DeviceData[4] };
|
||||
|
||||
BitArray bitArray = new BitArray(vvv);
|
||||
|
||||
//卡身份
|
||||
var qqq1 = bitArray.Cast<bool>().Take(1).ToArray();
|
||||
|
||||
BitArray bitArray = new BitArray(vvv);
|
||||
|
||||
|
||||
|
||||
//卡身份
|
||||
var qqq1 = bitArray.Cast<bool>().Take(1).ToArray();
|
||||
|
||||
var qqq2 = bitArray.Cast<bool>().Skip(1).Take(3).ToArray();
|
||||
|
||||
var qqq3 = qqq2.ToArray().Prepend(false).ToArray();
|
||||
//节能状态
|
||||
byte hhhg1 = Tools.CombineBitsToByte(qqq3[3], qqq3[2], qqq3[1], qqq3[0]);
|
||||
|
||||
var qqq2 = bitArray.Cast<bool>().Skip(1).Take(3).ToArray();
|
||||
|
||||
var qqq3 = qqq2.ToArray().Prepend(false).ToArray();
|
||||
//节能状态
|
||||
if (qqq3.Length >= 4)
|
||||
{
|
||||
byte hhhg1 = Tools.CombineBitsToByte(qqq3[3], qqq3[2], qqq3[1], qqq3[0]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -240,6 +244,10 @@ namespace LogCap.Common
|
||||
{
|
||||
try
|
||||
{
|
||||
if (data == null || data.Count < 13)
|
||||
{
|
||||
return;
|
||||
}
|
||||
////系统 ID 的四个字节。固定“T3SA”
|
||||
//List<byte> ID = data.Skip(4).Take(4).ToList();
|
||||
|
||||
@@ -252,16 +260,19 @@ namespace LogCap.Common
|
||||
|
||||
//Project_Code
|
||||
List<byte> Project_Code = data.Skip(11).Take(2).ToList();
|
||||
ushort hotel_code_o = BitConverter.ToUInt16(Project_Code.ToArray(), 0);
|
||||
if (Project_Code.Count >= 2)
|
||||
{
|
||||
ushort hotel_code_o = BitConverter.ToUInt16(Project_Code.ToArray(), 0);
|
||||
|
||||
////MAC
|
||||
//List<byte> IP3 = data.Skip(13).Take(1).ToList();
|
||||
//List<byte> IP4 = data.Skip(14).Take(1).ToList();
|
||||
////MAC
|
||||
//List<byte> IP3 = data.Skip(13).Take(1).ToList();
|
||||
//List<byte> IP4 = data.Skip(14).Take(1).ToList();
|
||||
|
||||
long hotel_code = hotel_code_o;
|
||||
string hostnumber = "";
|
||||
string hexdata = Tools.ByteToString(data.ToArray());
|
||||
HttpSend.SendLog_2(cmdtype, hotel_code, 0, "", hostnumber, source_ip, source_port, "", 0, "", Send_Or_Receive, hexdata);
|
||||
long hotel_code = hotel_code_o;
|
||||
string hostnumber = "";
|
||||
string hexdata = Tools.ByteToString(data.ToArray());
|
||||
HttpSend.SendLog_2(cmdtype, hotel_code, 0, "", hostnumber, source_ip, source_port, "", 0, "", Send_Or_Receive, hexdata);
|
||||
}
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
@@ -281,28 +292,34 @@ namespace LogCap.Common
|
||||
ReceiverContext context = new ReceiverContext(data.ToArray());
|
||||
context.SystemHeader = DecodeSystemHeader(context.Data);
|
||||
|
||||
if (!context.SystemHeader.HasValue)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
string Ghostnumber = context.SystemHeader.Value.HostNumber.ToString() ?? "";
|
||||
if (string.IsNullOrEmpty(Ghostnumber))
|
||||
{
|
||||
return;
|
||||
}
|
||||
long HHH = 0;
|
||||
|
||||
var abd = context.SystemHeader.HasValue;
|
||||
if (abd == false)
|
||||
{
|
||||
return;
|
||||
}
|
||||
try
|
||||
{
|
||||
HHH = context.SystemHeader.Value.HostNumber.ToHotelCode();
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
var data_error= Tools.ByteToString(data.ToArray());
|
||||
Console.WriteLine("ErrorData"+data_error);
|
||||
var data_error = Tools.ByteToString(data.ToArray());
|
||||
Console.WriteLine("ErrorData" + data_error);
|
||||
return;
|
||||
}
|
||||
//var MAC = BitConverter.ToString(context.Data.Skip(9).Take(2).ToArray());
|
||||
|
||||
//if (MAC.ToLower().Equals("9CD6"))
|
||||
//{
|
||||
// _logger.Info("MAC:" + MAC);
|
||||
// _logger.Info("data:" + Tools.ByteToString(data.ToArray()));
|
||||
//}
|
||||
|
||||
var list = Program.Cache.Get<List<Monitor_Host>>(CacheKey.Key);
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Configuration;
|
||||
using System.Linq;
|
||||
@@ -63,7 +63,10 @@ namespace LogCap.Common
|
||||
|
||||
//var payload_data= Encoding.UTF8.GetBytes(str);
|
||||
|
||||
await Program.mqttClient.PublishStringAsync(debug_log_report_mqtt_topic, str);
|
||||
if (Program.mqttClient != null && Program.mqttClient.IsConnected)
|
||||
{
|
||||
await Program.mqttClient.PublishStringAsync(debug_log_report_mqtt_topic, str);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -97,7 +100,10 @@ namespace LogCap.Common
|
||||
mm.TiaoMaoCUID = "";
|
||||
|
||||
string str = Newtonsoft.Json.JsonConvert.SerializeObject(mm);
|
||||
await Program.mqttClient.PublishStringAsync(debug_log_report_mqtt_topic_new, str);
|
||||
if (Program.mqttClient != null && Program.mqttClient.IsConnected)
|
||||
{
|
||||
await Program.mqttClient.PublishStringAsync(debug_log_report_mqtt_topic_new, str);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
|
||||
-->
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<History>True|2026-01-21T08:04:29.2346921Z||;True|2026-01-08T17:31:34.8778232+08:00||;True|2026-01-08T17:29:38.5339303+08:00||;True|2026-01-08T17:17:34.1517942+08:00||;True|2026-01-08T17:13:33.6164621+08:00||;True|2026-01-08T16:50:29.4216579+08:00||;True|2026-01-08T16:42:32.5476567+08:00||;True|2025-11-18T10:38:51.0970145+08:00||;True|2025-11-18T10:38:36.6590100+08:00||;True|2025-11-18T09:55:20.7541888+08:00||;True|2025-11-18T09:54:09.8014429+08:00||;True|2025-11-18T09:03:03.6239935+08:00||;True|2025-11-12T13:37:44.5193799+08:00||;True|2025-11-04T19:04:11.1977717+08:00||;True|2025-10-15T14:12:11.7503437+08:00||;True|2025-09-29T09:53:03.7995047+08:00||;True|2025-09-29T09:52:00.2305647+08:00||;True|2025-09-29T09:49:50.6101495+08:00||;True|2025-09-29T09:35:55.7152890+08:00||;True|2025-09-29T09:34:28.6196941+08:00||;True|2025-09-29T09:31:27.1029278+08:00||;True|2025-09-29T09:31:20.5804056+08:00||;True|2025-09-29T09:29:27.0993157+08:00||;True|2025-09-29T09:26:09.9458028+08:00||;True|2025-09-11T14:19:22.7215134+08:00||;True|2025-07-21T09:19:25.8321680+08:00||;True|2025-07-18T16:09:34.8867018+08:00||;True|2025-07-18T16:06:18.6358237+08:00||;True|2025-07-18T15:49:28.4034135+08:00||;True|2025-07-18T15:38:30.1452114+08:00||;True|2025-07-18T15:37:55.7831800+08:00||;True|2025-07-18T15:26:49.0230860+08:00||;True|2025-07-18T15:14:11.3917759+08:00||;True|2025-07-18T14:53:35.1351174+08:00||;True|2025-07-18T14:51:40.7222368+08:00||;True|2025-07-18T14:50:19.5264194+08:00||;True|2025-07-18T14:48:37.5000171+08:00||;True|2025-07-18T14:46:06.6645443+08:00||;True|2025-07-18T14:43:35.5161662+08:00||;True|2025-07-18T14:41:32.1953723+08:00||;True|2025-07-18T14:39:41.8990197+08:00||;True|2025-07-18T14:37:59.5226728+08:00||;False|2025-07-18T14:36:34.9869313+08:00||;False|2025-07-18T14:36:28.5844407+08:00||;True|2025-07-18T14:33:19.7559086+08:00||;True|2025-07-18T14:31:58.6399805+08:00||;True|2025-07-18T14:29:41.3500470+08:00||;True|2025-07-18T14:25:09.8903114+08:00||;True|2025-07-18T14:04:10.8844905+08:00||;True|2025-07-18T13:30:11.7855851+08:00||;True|2025-07-18T13:17:27.5926995+08:00||;True|2025-07-16T09:38:37.9415699+08:00||;True|2025-07-16T09:29:01.5138136+08:00||;True|2025-07-16T09:21:08.0981473+08:00||;True|2025-07-15T17:38:31.1667932+08:00||;True|2025-07-15T16:43:05.4527411+08:00||;True|2025-07-07T10:16:09.3877487+08:00||;True|2025-07-07T10:10:49.7560402+08:00||;True|2025-06-17T14:46:41.6347900+08:00||;True|2025-06-17T14:39:33.5356221+08:00||;True|2025-06-17T14:35:00.6059962+08:00||;True|2025-06-16T14:29:42.1186724+08:00||;True|2025-04-10T16:27:27.4571680+08:00||;True|2025-04-10T16:26:52.4704500+08:00||;True|2025-04-10T16:23:44.7512424+08:00||;True|2025-04-10T16:20:38.5807986+08:00||;True|2025-04-10T16:18:39.7753691+08:00||;True|2025-04-10T16:14:06.5114394+08:00||;True|2025-04-09T15:37:02.3941152+08:00||;True|2025-04-09T14:51:04.4433953+08:00||;True|2025-04-09T09:50:05.6074325+08:00||;True|2025-04-08T19:25:32.8536115+08:00||;False|2025-04-08T19:23:51.5364323+08:00||;True|2025-04-08T09:23:44.2543020+08:00||;True|2025-04-08T09:22:54.9082916+08:00||;True|2025-03-31T16:13:42.0797431+08:00||;True|2025-03-31T16:13:15.4339600+08:00||;True|2025-03-31T16:12:35.5470378+08:00||;True|2025-03-31T16:12:06.9833114+08:00||;True|2025-03-31T16:04:47.2437329+08:00||;True|2025-03-31T15:27:09.4504997+08:00||;True|2025-03-14T19:40:25.2983776+08:00||;True|2025-03-10T09:17:51.3361540+08:00||;True|2025-03-10T09:09:10.4750125+08:00||;True|2025-03-08T16:44:19.0185608+08:00||;True|2025-03-08T16:38:26.8544178+08:00||;True|2025-03-07T08:58:41.8621312+08:00||;True|2025-03-07T08:58:23.6999802+08:00||;True|2025-03-05T16:32:51.3089913+08:00||;True|2025-03-05T15:52:19.9963516+08:00||;True|2025-03-05T15:52:02.6859260+08:00||;True|2025-03-04T14:09:36.4338421+08:00||;True|2025-03-04T10:05:44.6777562+08:00||;True|2025-03-04T09:12:49.9348187+08:00||;True|2025-03-03T08:47:09.8416556+08:00||;True|2025-03-03T08:44:56.7823894+08:00||;True|2025-02-21T14:47:27.2104567+08:00||;True|2025-02-21T14:42:30.8494218+08:00||;True|2025-02-21T14:36:24.1989089+08:00||;True|2025-02-21T14:34:10.8466400+08:00||;</History>
|
||||
<History>True|2026-03-05T06:09:58.2362427Z||;True|2026-03-05T11:58:22.5560787+08:00||;True|2026-03-05T11:52:20.1939003+08:00||;True|2026-03-05T11:50:40.1794133+08:00||;True|2026-03-05T11:38:59.6720357+08:00||;True|2026-03-05T11:35:44.6603884+08:00||;True|2026-03-05T11:35:32.6893445+08:00||;True|2026-03-05T11:32:01.3184104+08:00||;True|2026-03-03T13:19:47.4354530+08:00||;True|2026-01-21T16:04:29.2346921+08:00||;True|2026-01-08T17:31:34.8778232+08:00||;True|2026-01-08T17:29:38.5339303+08:00||;True|2026-01-08T17:17:34.1517942+08:00||;True|2026-01-08T17:13:33.6164621+08:00||;True|2026-01-08T16:50:29.4216579+08:00||;True|2026-01-08T16:42:32.5476567+08:00||;True|2025-11-18T10:38:51.0970145+08:00||;True|2025-11-18T10:38:36.6590100+08:00||;True|2025-11-18T09:55:20.7541888+08:00||;True|2025-11-18T09:54:09.8014429+08:00||;True|2025-11-18T09:03:03.6239935+08:00||;True|2025-11-12T13:37:44.5193799+08:00||;True|2025-11-04T19:04:11.1977717+08:00||;True|2025-10-15T14:12:11.7503437+08:00||;True|2025-09-29T09:53:03.7995047+08:00||;True|2025-09-29T09:52:00.2305647+08:00||;True|2025-09-29T09:49:50.6101495+08:00||;True|2025-09-29T09:35:55.7152890+08:00||;True|2025-09-29T09:34:28.6196941+08:00||;True|2025-09-29T09:31:27.1029278+08:00||;True|2025-09-29T09:31:20.5804056+08:00||;True|2025-09-29T09:29:27.0993157+08:00||;True|2025-09-29T09:26:09.9458028+08:00||;True|2025-09-11T14:19:22.7215134+08:00||;True|2025-07-21T09:19:25.8321680+08:00||;True|2025-07-18T16:09:34.8867018+08:00||;True|2025-07-18T16:06:18.6358237+08:00||;True|2025-07-18T15:49:28.4034135+08:00||;True|2025-07-18T15:38:30.1452114+08:00||;True|2025-07-18T15:37:55.7831800+08:00||;True|2025-07-18T15:26:49.0230860+08:00||;True|2025-07-18T15:14:11.3917759+08:00||;True|2025-07-18T14:53:35.1351174+08:00||;True|2025-07-18T14:51:40.7222368+08:00||;True|2025-07-18T14:50:19.5264194+08:00||;True|2025-07-18T14:48:37.5000171+08:00||;True|2025-07-18T14:46:06.6645443+08:00||;True|2025-07-18T14:43:35.5161662+08:00||;True|2025-07-18T14:41:32.1953723+08:00||;True|2025-07-18T14:39:41.8990197+08:00||;True|2025-07-18T14:37:59.5226728+08:00||;False|2025-07-18T14:36:34.9869313+08:00||;False|2025-07-18T14:36:28.5844407+08:00||;True|2025-07-18T14:33:19.7559086+08:00||;True|2025-07-18T14:31:58.6399805+08:00||;True|2025-07-18T14:29:41.3500470+08:00||;True|2025-07-18T14:25:09.8903114+08:00||;True|2025-07-18T14:04:10.8844905+08:00||;True|2025-07-18T13:30:11.7855851+08:00||;True|2025-07-18T13:17:27.5926995+08:00||;True|2025-07-16T09:38:37.9415699+08:00||;True|2025-07-16T09:29:01.5138136+08:00||;True|2025-07-16T09:21:08.0981473+08:00||;True|2025-07-15T17:38:31.1667932+08:00||;True|2025-07-15T16:43:05.4527411+08:00||;True|2025-07-07T10:16:09.3877487+08:00||;True|2025-07-07T10:10:49.7560402+08:00||;True|2025-06-17T14:46:41.6347900+08:00||;True|2025-06-17T14:39:33.5356221+08:00||;True|2025-06-17T14:35:00.6059962+08:00||;True|2025-06-16T14:29:42.1186724+08:00||;True|2025-04-10T16:27:27.4571680+08:00||;True|2025-04-10T16:26:52.4704500+08:00||;True|2025-04-10T16:23:44.7512424+08:00||;True|2025-04-10T16:20:38.5807986+08:00||;True|2025-04-10T16:18:39.7753691+08:00||;True|2025-04-10T16:14:06.5114394+08:00||;True|2025-04-09T15:37:02.3941152+08:00||;True|2025-04-09T14:51:04.4433953+08:00||;True|2025-04-09T09:50:05.6074325+08:00||;True|2025-04-08T19:25:32.8536115+08:00||;False|2025-04-08T19:23:51.5364323+08:00||;True|2025-04-08T09:23:44.2543020+08:00||;True|2025-04-08T09:22:54.9082916+08:00||;True|2025-03-31T16:13:42.0797431+08:00||;True|2025-03-31T16:13:15.4339600+08:00||;True|2025-03-31T16:12:35.5470378+08:00||;True|2025-03-31T16:12:06.9833114+08:00||;True|2025-03-31T16:04:47.2437329+08:00||;True|2025-03-31T15:27:09.4504997+08:00||;True|2025-03-14T19:40:25.2983776+08:00||;True|2025-03-10T09:17:51.3361540+08:00||;True|2025-03-10T09:09:10.4750125+08:00||;True|2025-03-08T16:44:19.0185608+08:00||;True|2025-03-08T16:38:26.8544178+08:00||;True|2025-03-07T08:58:41.8621312+08:00||;True|2025-03-07T08:58:23.6999802+08:00||;True|2025-03-05T16:32:51.3089913+08:00||;True|2025-03-05T15:52:19.9963516+08:00||;True|2025-03-05T15:52:02.6859260+08:00||;</History>
|
||||
<LastFailureDetails />
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
Reference in New Issue
Block a user