diff --git a/BLW_Log/Controllers/LowerMachineLogController.cs b/BLW_Log/Controllers/LowerMachineLogController.cs index db508a5..6843963 100644 --- a/BLW_Log/Controllers/LowerMachineLogController.cs +++ b/BLW_Log/Controllers/LowerMachineLogController.cs @@ -89,68 +89,68 @@ namespace BLW_Log.Controllers [HttpPost()] public async Task AddIOTLog() { - string sssttt = ""; - try - { - var readResult = Request.BodyReader.ReadAsync().Result; - Request.BodyReader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.End); - string body = Encoding.UTF8.GetString(readResult.Buffer.FirstSpan); - sssttt = body; - Dictionary dic = JsonConvert.DeserializeObject>(body); - string topic = dic["topic"]; - string payload = dic["payload"]; + //string sssttt = ""; + //try + //{ + // var readResult = Request.BodyReader.ReadAsync().Result; + // Request.BodyReader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.End); + // string body = Encoding.UTF8.GetString(readResult.Buffer.FirstSpan); + // sssttt = body; + // Dictionary dic = JsonConvert.DeserializeObject>(body); + // string topic = dic["topic"]; + // string payload = dic["payload"]; - this._logger.Info("Topic: " + topic); - this._logger.Info("PayLoad: " + payload); + // this._logger.Info("Topic: " + topic); + // this._logger.Info("PayLoad: " + payload); - IOTMonitorData igs = JsonConvert.DeserializeObject(payload); + // IOTMonitorData igs = JsonConvert.DeserializeObject(payload); - //using (var a = new LowmachinelogContext()) - //{ + // //using (var a = new LowmachinelogContext()) + // //{ - // IotMonitorlog iot = new IotMonitorlog(); - // iot.TriggerTime = igs.TriggerTime; - // iot.RoomNumber = igs.RoomNumber; - // iot.RequestId = igs.RequestId; - // iot.Platform = igs.Platform; - // iot.Step = igs.Step; - // iot.CommandDescription = igs.CommandDescription; - // iot.HotelName = igs.HotelName; + // // IotMonitorlog iot = new IotMonitorlog(); + // // iot.TriggerTime = igs.TriggerTime; + // // iot.RoomNumber = igs.RoomNumber; + // // iot.RequestId = igs.RequestId; + // // iot.Platform = igs.Platform; + // // iot.Step = igs.Step; + // // iot.CommandDescription = igs.CommandDescription; + // // iot.HotelName = igs.HotelName; - // int abc = 0; - // int.TryParse(igs.HotelId ?? "0", out abc); - // iot.HotelId = abc; - // iot.HotelCode = igs.HotelCode.ToString(); - // a.IotMonitorlogs.Add(iot); - // a.SaveChanges(); - // a.WebapiMonitorlogs.AsNoTracking().ToArray(); - //} + // // int abc = 0; + // // int.TryParse(igs.HotelId ?? "0", out abc); + // // iot.HotelId = abc; + // // iot.HotelCode = igs.HotelCode.ToString(); + // // a.IotMonitorlogs.Add(iot); + // // a.SaveChanges(); + // // a.WebapiMonitorlogs.AsNoTracking().ToArray(); + // //} - IotMonitorlog iot = new IotMonitorlog(); - iot.TriggerTime = igs.TriggerTime; - iot.RoomNumber = igs.RoomNumber; - iot.RequestId = igs.RequestId; - iot.Platform = igs.Platform; - iot.Step = igs.Step; - iot.CommandDescription = igs.CommandDescription; - iot.HotelName = igs.HotelName; + // IotMonitorlog iot = new IotMonitorlog(); + // iot.TriggerTime = igs.TriggerTime; + // iot.RoomNumber = igs.RoomNumber; + // iot.RequestId = igs.RequestId; + // iot.Platform = igs.Platform; + // iot.Step = igs.Step; + // iot.CommandDescription = igs.CommandDescription; + // iot.HotelName = igs.HotelName; - int abc = 0; - int.TryParse(igs.HotelId ?? "0", out abc); - iot.HotelId = abc; - iot.HotelCode = igs.HotelCode.ToString(); - dbContext.IotMonitorlogs.Add(iot); - await dbContext.SaveChangesAsync(); - //dbContext.WebapiMonitorlogs.AsNoTracking().ToArray(); - } - catch (Exception ex) - { - this._logger.Error(ex.Message); - this._logger.Error("数据为: " + sssttt); - this._logger.Error(ex.StackTrace); - } + // int abc = 0; + // int.TryParse(igs.HotelId ?? "0", out abc); + // iot.HotelId = abc; + // iot.HotelCode = igs.HotelCode.ToString(); + // dbContext.IotMonitorlogs.Add(iot); + // await dbContext.SaveChangesAsync(); + // //dbContext.WebapiMonitorlogs.AsNoTracking().ToArray(); + //} + //catch (Exception ex) + //{ + // this._logger.Error(ex.Message); + // this._logger.Error("数据为: " + sssttt); + // this._logger.Error(ex.StackTrace); + //} } [HttpPost()] @@ -497,84 +497,84 @@ namespace BLW_Log.Controllers } - [HttpPost()] - public ReturnInfo Get_IOTLog([FromForm] string QueryData) - { - ReturnInfo info = new ReturnInfo(); - info.isok = true; - try - { - List lg = new List(); - LogQuery? q = JsonConvert.DeserializeObject(QueryData); + //[HttpPost()] + //public ReturnInfo Get_IOTLog([FromForm] string QueryData) + //{ + // ReturnInfo info = new ReturnInfo(); + // info.isok = true; + // try + // { + // List lg = new List(); + // LogQuery? q = JsonConvert.DeserializeObject(QueryData); - string? st = q?.Start_Time; - string? et = q?.End_Time; + // string? st = q?.Start_Time; + // string? et = q?.End_Time; - int PageSize = q.PageSize; - int PageIndex = q.PageIndex; + // int PageSize = q.PageSize; + // int PageIndex = q.PageIndex; - List c11 = q.CommandType; + // List c11 = q.CommandType; - int AAA = (PageIndex - 1) * PageSize; - DateTime sst = DateTime.Parse(st); - DateTime eet = DateTime.Parse(et); - if (eet < sst) - { - info.isok = false; - info.message = "结束时间不能大于开始时间"; - return info; - } - var qqqq = q?.Data; + // int AAA = (PageIndex - 1) * PageSize; + // DateTime sst = DateTime.Parse(st); + // DateTime eet = DateTime.Parse(et); + // if (eet < sst) + // { + // info.isok = false; + // info.message = "结束时间不能大于开始时间"; + // return info; + // } + // var qqqq = q?.Data; - int TotalCount = 0; - //using (var a = new LowmachinelogContext()) - //{ - var h11 = qqqq?.Select(x => x.HotelCode).Distinct(); - var r11 = qqqq?.Select(x => x.RoomNumber).Distinct(); + // int TotalCount = 0; + // //using (var a = new LowmachinelogContext()) + // //{ + // var h11 = qqqq?.Select(x => x.HotelCode).Distinct(); + // var r11 = qqqq?.Select(x => x.RoomNumber).Distinct(); - string h22 = string.Join(",", h11.Select(name => $"'{name.Replace("'", "''")}'")); - string r22 = string.Join(",", r11.Select(name => $"'{name.Replace("'", "''")}'")); + // string h22 = string.Join(",", h11.Select(name => $"'{name.Replace("'", "''")}'")); + // string r22 = string.Join(",", r11.Select(name => $"'{name.Replace("'", "''")}'")); - string sss = $""" - SELECT * FROM iot_monitorlog a - where a."HotelCode" in ({h22}) and a."RoomNumber" in ({r22}) - and a."TriggerTime">='{st}' and a."TriggerTime" <='{et}' order by a."ID" DESC; - """; + // string sss = $""" + // SELECT * FROM iot_monitorlog a + // where a."HotelCode" in ({h22}) and a."RoomNumber" in ({r22}) + // and a."TriggerTime">='{st}' and a."TriggerTime" <='{et}' order by a."ID" DESC; + // """; - var ddd = dbContext.IotMonitorlogs.FromSqlRaw(sss).ToList(); + // var ddd = dbContext.IotMonitorlogs.FromSqlRaw(sss).ToList(); - string sss111 = $""" - SELECT count("ID") FROM iot_monitorlog a - where a."HotelCode" in ({h22}) and a."RoomNumber" in ({r22}) - and a."TriggerTime">='{st}' and a."TriggerTime" <='{et}'; - """; - var query_int = dbContext.Database.SqlQueryRaw(sss111); + // string sss111 = $""" + // SELECT count("ID") FROM iot_monitorlog a + // where a."HotelCode" in ({h22}) and a."RoomNumber" in ({r22}) + // and a."TriggerTime">='{st}' and a."TriggerTime" <='{et}'; + // """; + // var query_int = dbContext.Database.SqlQueryRaw(sss111); - foreach (var NNH in query_int) - { - int ccg = 0; - int.TryParse(NNH.ToString(), out ccg); - TotalCount += ccg; - } - lg = ddd; - //} + // foreach (var NNH in query_int) + // { + // int ccg = 0; + // int.TryParse(NNH.ToString(), out ccg); + // TotalCount += ccg; + // } + // lg = ddd; + // //} - var qqa = lg.OrderBy(x => x.TriggerTime).ToList(); - DevMonitorIOTLogResult_WITH_Count c = new DevMonitorIOTLogResult_WITH_Count(); - c.TotalCount = TotalCount; - c.devMonitorLogResults = qqa; + // var qqa = lg.OrderBy(x => x.TriggerTime).ToList(); + // DevMonitorIOTLogResult_WITH_Count c = new DevMonitorIOTLogResult_WITH_Count(); + // c.TotalCount = TotalCount; + // c.devMonitorLogResults = qqa; - info.response = c; - } - catch (Exception ex) - { - info.isok = false; - info.message = ex.Message; - } - return info; - } + // info.response = c; + // } + // catch (Exception ex) + // { + // info.isok = false; + // info.message = ex.Message; + // } + // return info; + //} diff --git a/BLW_Log/Models/DevMonitorLog_EX.cs b/BLW_Log/Models/DevMonitorLog_EX.cs index 89cef25..89548de 100644 --- a/BLW_Log/Models/DevMonitorLog_EX.cs +++ b/BLW_Log/Models/DevMonitorLog_EX.cs @@ -32,7 +32,7 @@ namespace BLW_Log.Models public class DevMonitorIOTLogResult_WITH_Count { - public List devMonitorLogResults { get; set; } + //public List devMonitorLogResults { get; set; } public int TotalCount { get; set; } } public class DevMonitorWebAPILogResult_WITH_Count diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj index 5f17b93..7a13a11 100644 --- a/DAL/DAL.csproj +++ b/DAL/DAL.csproj @@ -20,4 +20,8 @@ + + + + diff --git a/DAL/PGModels/BlockIplog.cs b/DAL/PGModels/BlockIplog.cs new file mode 100644 index 0000000..37711fb --- /dev/null +++ b/DAL/PGModels/BlockIplog.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; + +namespace DAL.PGModels; + +public partial class BlockIplog +{ + public long Id { get; set; } + + public string? Human { get; set; } + + public DateTime? CreateTime { get; set; } + + public string? BlockContent { get; set; } +} diff --git a/DAL/PGModels/BlsHotelsList.cs b/DAL/PGModels/BlsHotelsList.cs new file mode 100644 index 0000000..80761d3 --- /dev/null +++ b/DAL/PGModels/BlsHotelsList.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; + +namespace DAL.PGModels; + +public partial class BlsHotelsList +{ + /// + /// ID + /// + public int Id { get; set; } + + /// + /// 酒店编号 + /// + public string? HotelCode { get; set; } + + /// + /// 酒店名称 + /// + public string? HotelName { get; set; } + + /// + /// 创建时间 + /// + public DateOnly? CreateDate { get; set; } + + /// + /// 房间数 + /// + public int? Rooms { get; set; } +} diff --git a/DAL/PGModels/DevMonitorlog.cs b/DAL/PGModels/DevMonitorlog.cs new file mode 100644 index 0000000..5a1d9bc --- /dev/null +++ b/DAL/PGModels/DevMonitorlog.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; + +namespace DAL.PGModels; + +public partial class DevMonitorlog +{ + public long Id { get; set; } + + public int? HotelId { get; set; } + + public string? HotelCode { get; set; } + + public string? HostNumber { get; set; } + + public int? HostId { get; set; } + + public string? RoomNo { get; set; } + + public string? LanIp { get; set; } + + public int? LanPort { get; set; } + + public string? Mac { get; set; } + + public int? WwwPort { get; set; } + + public string? WwwIp { get; set; } + + public string? CommandType { get; set; } + + public string? SendOrReceive { get; set; } + + public string? Data { get; set; } + + public DateTime? CreateTime { get; set; } + + public long? CreateTimeToUnixTime { get; set; } + + public string? AnalysisData { get; set; } +} diff --git a/DAL/PGModels/Excelgenerater.cs b/DAL/PGModels/Excelgenerater.cs new file mode 100644 index 0000000..95d6aac --- /dev/null +++ b/DAL/PGModels/Excelgenerater.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; + +namespace DAL.PGModels; + +public partial class Excelgenerater +{ + public long Id { get; set; } + + public string? StepInfo { get; set; } + + public DateTime? CreateTime { get; set; } + + public long? CreateTimeUnix { get; set; } +} diff --git a/DAL/PGModels/PostgresContext.cs b/DAL/PGModels/PostgresContext.cs new file mode 100644 index 0000000..001979a --- /dev/null +++ b/DAL/PGModels/PostgresContext.cs @@ -0,0 +1,228 @@ +using System; +using System.Collections.Generic; +using Microsoft.EntityFrameworkCore; + +namespace DAL.PGModels; + +public partial class PostgresContext : DbContext +{ + public PostgresContext() + { + } + + public PostgresContext(DbContextOptions options) + : base(options) + { + } + + public virtual DbSet BlockIplogs { get; set; } + + public virtual DbSet BlsHotelsLists { get; set; } + + public virtual DbSet DevMonitorlogs { get; set; } + + public virtual DbSet Excelgeneraters { get; set; } + + public virtual DbSet Qingaos { get; set; } + + public virtual DbSet Recordhotels { get; set; } + + public virtual DbSet SkyworthTvMonitorlogs { get; set; } + + public virtual DbSet StatisticsTotals { get; set; } + + public virtual DbSet TclTvMonitorlogs { get; set; } + + public virtual DbSet WebapiMonitorlogs { get; set; } + +// protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) +//#warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see https://go.microsoft.com/fwlink/?LinkId=723263. +// => optionsBuilder.UseNpgsql("Server=10.8.8.208;Database=postgres;user id=postgres;password=blw#1234^_^;port=15432;"); + + protected override void OnModelCreating(ModelBuilder modelBuilder) + { + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Id).HasName("BlockIPLog_pkey"); + + entity.ToTable("BlockIPLog"); + + entity.Property(e => e.Id).HasColumnName("ID"); + entity.Property(e => e.CreateTime).HasColumnType("timestamp(6) without time zone"); + entity.Property(e => e.Human).HasMaxLength(255); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Id).HasName("BLS_Hotels_List_pkey"); + + entity.ToTable("BLS_Hotels_List"); + + entity.Property(e => e.Id) + .HasComment("ID") + .HasColumnName("ID"); + entity.Property(e => e.CreateDate).HasComment("创建时间"); + entity.Property(e => e.HotelCode) + .HasMaxLength(255) + .HasComment("酒店编号"); + entity.Property(e => e.HotelName) + .HasMaxLength(255) + .HasComment("酒店名称"); + entity.Property(e => e.Rooms).HasComment("房间数"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Id).HasName("dev_monitorlog_pkey"); + + entity.ToTable("dev_monitorlog"); + + entity.HasIndex(e => e.CommandType, "CommandType"); + + entity.HasIndex(e => e.CreateTimeToUnixTime, "CreateTime").IsDescending(); + + entity.HasIndex(e => e.Id, "ID").IsUnique(); + + entity.HasIndex(e => new { e.HotelCode, e.HostNumber, e.HostId, e.RoomNo }, "MAC"); + + entity.HasIndex(e => e.Mac, "MM"); + + entity.HasIndex(e => e.CreateTime, "T"); + + entity.Property(e => e.Id).HasColumnName("ID"); + entity.Property(e => e.CommandType).HasMaxLength(128); + entity.Property(e => e.CreateTime).HasColumnType("timestamp(6) without time zone"); + entity.Property(e => e.HostId).HasColumnName("HostID"); + entity.Property(e => e.HostNumber).HasMaxLength(64); + entity.Property(e => e.HotelCode).HasMaxLength(64); + entity.Property(e => e.HotelId).HasColumnName("HotelID"); + entity.Property(e => e.LanIp) + .HasMaxLength(64) + .HasColumnName("LanIP"); + entity.Property(e => e.Mac) + .HasMaxLength(64) + .HasColumnName("MAC"); + entity.Property(e => e.RoomNo).HasMaxLength(64); + entity.Property(e => e.SendOrReceive).HasMaxLength(64); + entity.Property(e => e.WwwIp) + .HasMaxLength(64) + .HasColumnName("WWW_IP"); + entity.Property(e => e.WwwPort).HasColumnName("WWW_Port"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Id).HasName("excelgenerater_pkey"); + + entity.ToTable("excelgenerater"); + + entity.Property(e => e.Id).HasColumnName("ID"); + entity.Property(e => e.CreateTime).HasColumnType("timestamp(6) without time zone"); + entity.Property(e => e.CreateTimeUnix).HasColumnName("CreateTime_UNIX"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Id).HasName("Qingao_pkey"); + + entity.ToTable("Qingao"); + + entity.Property(e => e.Id).HasIdentityOptions(null, null, null, null, true, null); + entity.Property(e => e.CurrentTime).HasColumnType("timestamp(6) without time zone"); + entity.Property(e => e.HotelCode).HasMaxLength(32); + entity.Property(e => e.RoomNumber).HasMaxLength(64); + entity.Property(e => e.TakeCardStatus).HasMaxLength(64); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Id).HasName("recordhotel_pkey"); + + entity.ToTable("recordhotel"); + + entity.Property(e => e.Id).HasColumnName("ID"); + entity.Property(e => e.CreateTime).HasMaxLength(64); + entity.Property(e => e.HotelId).HasColumnName("HotelID"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Id).HasName("skyworth_tv_monitorlog_pkey"); + + entity.ToTable("skyworth_tv_monitorlog"); + + entity.Property(e => e.Id).HasColumnName("ID"); + entity.Property(e => e.HotelCode).HasMaxLength(64); + entity.Property(e => e.RequestId).HasMaxLength(64); + entity.Property(e => e.RequestTime).HasColumnType("timestamp(6) without time zone"); + entity.Property(e => e.ResponseTime).HasColumnType("timestamp(6) without time zone"); + entity.Property(e => e.RoomNum).HasMaxLength(64); + entity.Property(e => e.Step).HasMaxLength(16); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Id).HasName("statistics_total_pkey"); + + entity.ToTable("statistics_total"); + + entity.Property(e => e.Id).HasColumnName("ID"); + entity.Property(e => e.HostNumber).HasMaxLength(64); + entity.Property(e => e.HotelCode).HasMaxLength(64); + entity.Property(e => e.Mac) + .HasMaxLength(64) + .HasColumnName("MAC"); + entity.Property(e => e.RxCount).HasColumnName("RX_Count"); + entity.Property(e => e.TxCount).HasColumnName("TX_Count"); + entity.Property(e => e.UpdateTime) + .HasMaxLength(64) + .HasColumnName("Update_Time"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Id).HasName("tcl_tv_monitorlog_pkey"); + + entity.ToTable("tcl_tv_monitorlog"); + + entity.Property(e => e.Id).HasColumnName("ID"); + entity.Property(e => e.HotelCode).HasMaxLength(64); + entity.Property(e => e.RequestId).HasMaxLength(64); + entity.Property(e => e.RequestTime).HasColumnType("timestamp(6) without time zone"); + entity.Property(e => e.ResponseTime).HasColumnType("timestamp(6) without time zone"); + entity.Property(e => e.RoomNumber).HasMaxLength(64); + entity.Property(e => e.Step) + .HasMaxLength(16) + .HasDefaultValueSql("NULL::character varying"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Id).HasName("webapi_monitorlog_pkey"); + + entity.ToTable("webapi_monitorlog"); + + entity.HasIndex(e => e.MethodName, "MethodName"); + + entity.HasIndex(e => new { e.InvokStartTime, e.InvokEndTime }, "Time"); + + entity.Property(e => e.Id).HasColumnName("ID"); + entity.Property(e => e.HotelCode).HasMaxLength(64); + entity.Property(e => e.InvokEndTime) + .HasMaxLength(64) + .HasColumnName("InvokEnd_Time"); + entity.Property(e => e.InvokStartTime) + .HasMaxLength(64) + .HasColumnName("InvokStart_Time"); + entity.Property(e => e.MethodName).HasMaxLength(128); + entity.Property(e => e.RemoteIp) + .HasMaxLength(64) + .HasColumnName("RemoteIP"); + entity.Property(e => e.RoomNumber).HasMaxLength(64); + }); + + OnModelCreatingPartial(modelBuilder); + } + + partial void OnModelCreatingPartial(ModelBuilder modelBuilder); +} diff --git a/DAL/PGModels/Qingao.cs b/DAL/PGModels/Qingao.cs new file mode 100644 index 0000000..4f929f7 --- /dev/null +++ b/DAL/PGModels/Qingao.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; + +namespace DAL.PGModels; + +public partial class Qingao +{ + public long Id { get; set; } + + public string? RoomNumber { get; set; } + + public string? HotelCode { get; set; } + + public string? TakeCardStatus { get; set; } + + public DateTime? CurrentTime { get; set; } + + public bool? IsTriggerWelcomeMsg { get; set; } +} diff --git a/DAL/PGModels/Recordhotel.cs b/DAL/PGModels/Recordhotel.cs new file mode 100644 index 0000000..afc93b1 --- /dev/null +++ b/DAL/PGModels/Recordhotel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; + +namespace DAL.PGModels; + +public partial class Recordhotel +{ + public int Id { get; set; } + + public int? HotelId { get; set; } + + public int? RoomNo { get; set; } + + public string? CreateTime { get; set; } +} diff --git a/DAL/PGModels/SkyworthTvMonitorlog.cs b/DAL/PGModels/SkyworthTvMonitorlog.cs new file mode 100644 index 0000000..64a916b --- /dev/null +++ b/DAL/PGModels/SkyworthTvMonitorlog.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; + +namespace DAL.PGModels; + +public partial class SkyworthTvMonitorlog +{ + public long Id { get; set; } + + public DateTime? RequestTime { get; set; } + + public string? Step { get; set; } + + public string? HotelCode { get; set; } + + public string? RoomNum { get; set; } + + public string? RequestCommand { get; set; } + + public string? RequestId { get; set; } + + public string? ResponseMsg { get; set; } + + public DateTime? ResponseTime { get; set; } +} diff --git a/DAL/PGModels/StatisticsTotal.cs b/DAL/PGModels/StatisticsTotal.cs new file mode 100644 index 0000000..6bc0bad --- /dev/null +++ b/DAL/PGModels/StatisticsTotal.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; + +namespace DAL.PGModels; + +public partial class StatisticsTotal +{ + public long Id { get; set; } + + public string? HotelCode { get; set; } + + public int? TxCount { get; set; } + + public string? HostNumber { get; set; } + + public string? Mac { get; set; } + + public int? RxCount { get; set; } + + public string? UpdateTime { get; set; } +} diff --git a/DAL/PGModels/TclTvMonitorlog.cs b/DAL/PGModels/TclTvMonitorlog.cs new file mode 100644 index 0000000..136e6ed --- /dev/null +++ b/DAL/PGModels/TclTvMonitorlog.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; + +namespace DAL.PGModels; + +public partial class TclTvMonitorlog +{ + public long Id { get; set; } + + public DateTime? RequestTime { get; set; } + + public string? Step { get; set; } + + public string? HotelCode { get; set; } + + public string? RoomNumber { get; set; } + + public string? RequestCommand { get; set; } + + public string? RequestId { get; set; } + + public string? ResponseMsg { get; set; } + + public DateTime? ResponseTime { get; set; } +} diff --git a/DAL/PGModels/WebapiMonitorlog.cs b/DAL/PGModels/WebapiMonitorlog.cs new file mode 100644 index 0000000..bd52bd6 --- /dev/null +++ b/DAL/PGModels/WebapiMonitorlog.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; + +namespace DAL.PGModels; + +public partial class WebapiMonitorlog +{ + public long Id { get; set; } + + public string? RemoteIp { get; set; } + + public string? Parameters { get; set; } + + public string? MethodName { get; set; } + + public string? InvokStartTime { get; set; } + + public string? InvokEndTime { get; set; } + + public string? HotelCode { get; set; } + + public string? RoomNumber { get; set; } +} diff --git a/MQTTSub/MQTTSub.csproj.user b/MQTTSub/MQTTSub.csproj.user index e8dbc81..7f9bcdf 100644 --- a/MQTTSub/MQTTSub.csproj.user +++ b/MQTTSub/MQTTSub.csproj.user @@ -1,6 +1,6 @@  - <_LastSelectedProfileId>E:\tian\BLWLogMonitor\MQTTSub\Properties\PublishProfiles\FolderProfile.pubxml + <_LastSelectedProfileId>E:\tian\chongxin\NewGit\Web_BLVLOG_Server_Mvc_Prod\MQTTSub\Properties\PublishProfiles\FolderProfile.pubxml \ No newline at end of file diff --git a/MQTTSub/Program.cs b/MQTTSub/Program.cs index e033849..5ad140e 100644 --- a/MQTTSub/Program.cs +++ b/MQTTSub/Program.cs @@ -144,7 +144,8 @@ namespace MQTTSub } catch (Exception ex) { - + Console.WriteLine(ex.Message); + Console.WriteLine(ex.StackTrace); } } } diff --git a/MQTTSub/Properties/PublishProfiles/FolderProfile.pubxml.user b/MQTTSub/Properties/PublishProfiles/FolderProfile.pubxml.user index 98135fd..70bfb42 100644 --- a/MQTTSub/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/MQTTSub/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2025-11-04T11:06:18.9002195Z||;True|2025-11-04T19:05:51.2405850+08:00||;True|2025-11-03T20:13:22.1932631+08:00||;True|2025-09-11T14:20:42.1302268+08:00||;True|2025-09-10T17:17:09.2739326+08:00||;True|2025-09-10T17:08:31.5569167+08:00||;True|2025-09-10T16:41:46.9112811+08:00||;True|2025-09-10T16:20:40.1009846+08:00||;True|2025-09-10T16:11:12.1433165+08:00||;True|2025-09-10T16:10:48.6038183+08:00||;True|2025-09-10T16:07:28.3396370+08:00||;True|2025-09-10T16:00:05.7526799+08:00||;True|2025-09-10T15:58:09.8746067+08:00||;True|2025-09-10T15:57:56.8297653+08:00||;True|2025-07-28T16:21:10.8649644+08:00||;True|2025-07-16T14:12:27.9930991+08:00||;True|2025-07-16T13:46:08.4970137+08:00||;True|2025-07-16T10:37:44.2475360+08:00||;True|2025-07-16T10:24:29.2909172+08:00||;True|2025-07-16T10:21:25.9594513+08:00||;True|2025-07-16T10:11:20.7388389+08:00||;True|2025-07-16T10:03:48.3582870+08:00||;True|2025-07-16T10:00:21.9834347+08:00||;True|2025-07-16T09:59:56.7051258+08:00||;True|2025-07-16T09:59:34.5912181+08:00||;True|2025-07-16T09:57:23.0363480+08:00||;True|2025-07-16T09:48:31.2376825+08:00||;True|2025-07-16T09:14:24.2060906+08:00||;True|2025-07-16T09:14:11.1880969+08:00||;True|2025-07-16T09:10:09.8120587+08:00||;True|2025-07-16T09:06:54.3118239+08:00||;True|2025-07-16T09:06:46.1084131+08:00||;True|2025-07-16T09:01:49.5359062+08:00||;True|2025-07-16T09:00:55.6730546+08:00||;True|2025-07-16T08:58:14.9295082+08:00||;True|2025-07-09T16:13:41.0527242+08:00||;True|2025-06-18T14:30:55.2321064+08:00||;True|2025-06-17T19:57:50.2381939+08:00||;True|2025-06-17T19:55:28.1677076+08:00||;True|2025-06-17T19:54:36.2060636+08:00||;True|2025-06-17T19:51:56.9458374+08:00||;True|2025-06-17T19:48:39.1709895+08:00||;True|2025-06-17T17:27:38.0304812+08:00||;True|2025-06-17T17:26:35.4642304+08:00||;True|2025-06-17T17:21:58.1428000+08:00||;True|2025-06-17T16:22:14.4953962+08:00||;True|2025-06-17T16:20:42.1308664+08:00||;True|2025-06-17T16:09:47.0298574+08:00||;True|2025-06-17T16:08:17.5346187+08:00||;True|2025-06-17T16:05:06.3188068+08:00||;True|2025-06-17T15:56:12.6355499+08:00||;True|2025-06-17T15:54:47.1204334+08:00||;True|2025-06-17T15:50:06.6208615+08:00||;True|2025-06-17T15:44:40.6005489+08:00||;True|2025-06-17T15:39:18.1282195+08:00||;True|2025-06-17T15:32:44.0369092+08:00||;True|2025-06-17T15:25:47.1770835+08:00||;True|2025-06-17T15:20:37.2930604+08:00||;True|2025-06-17T15:14:55.2290167+08:00||;True|2025-06-16T18:00:44.7869573+08:00||;True|2025-06-16T16:29:10.6770377+08:00||;True|2025-06-16T13:43:53.7959568+08:00||; + True|2025-12-17T02:18:14.8177784Z||;True|2025-12-17T10:01:44.6151008+08:00||;True|2025-11-04T19:06:18.9002195+08:00||;True|2025-11-04T19:05:51.2405850+08:00||;True|2025-11-03T20:13:22.1932631+08:00||;True|2025-09-11T14:20:42.1302268+08:00||;True|2025-09-10T17:17:09.2739326+08:00||;True|2025-09-10T17:08:31.5569167+08:00||;True|2025-09-10T16:41:46.9112811+08:00||;True|2025-09-10T16:20:40.1009846+08:00||;True|2025-09-10T16:11:12.1433165+08:00||;True|2025-09-10T16:10:48.6038183+08:00||;True|2025-09-10T16:07:28.3396370+08:00||;True|2025-09-10T16:00:05.7526799+08:00||;True|2025-09-10T15:58:09.8746067+08:00||;True|2025-09-10T15:57:56.8297653+08:00||;True|2025-07-28T16:21:10.8649644+08:00||;True|2025-07-16T14:12:27.9930991+08:00||;True|2025-07-16T13:46:08.4970137+08:00||;True|2025-07-16T10:37:44.2475360+08:00||;True|2025-07-16T10:24:29.2909172+08:00||;True|2025-07-16T10:21:25.9594513+08:00||;True|2025-07-16T10:11:20.7388389+08:00||;True|2025-07-16T10:03:48.3582870+08:00||;True|2025-07-16T10:00:21.9834347+08:00||;True|2025-07-16T09:59:56.7051258+08:00||;True|2025-07-16T09:59:34.5912181+08:00||;True|2025-07-16T09:57:23.0363480+08:00||;True|2025-07-16T09:48:31.2376825+08:00||;True|2025-07-16T09:14:24.2060906+08:00||;True|2025-07-16T09:14:11.1880969+08:00||;True|2025-07-16T09:10:09.8120587+08:00||;True|2025-07-16T09:06:54.3118239+08:00||;True|2025-07-16T09:06:46.1084131+08:00||;True|2025-07-16T09:01:49.5359062+08:00||;True|2025-07-16T09:00:55.6730546+08:00||;True|2025-07-16T08:58:14.9295082+08:00||;True|2025-07-09T16:13:41.0527242+08:00||;True|2025-06-18T14:30:55.2321064+08:00||;True|2025-06-17T19:57:50.2381939+08:00||;True|2025-06-17T19:55:28.1677076+08:00||;True|2025-06-17T19:54:36.2060636+08:00||;True|2025-06-17T19:51:56.9458374+08:00||;True|2025-06-17T19:48:39.1709895+08:00||;True|2025-06-17T17:27:38.0304812+08:00||;True|2025-06-17T17:26:35.4642304+08:00||;True|2025-06-17T17:21:58.1428000+08:00||;True|2025-06-17T16:22:14.4953962+08:00||;True|2025-06-17T16:20:42.1308664+08:00||;True|2025-06-17T16:09:47.0298574+08:00||;True|2025-06-17T16:08:17.5346187+08:00||;True|2025-06-17T16:05:06.3188068+08:00||;True|2025-06-17T15:56:12.6355499+08:00||;True|2025-06-17T15:54:47.1204334+08:00||;True|2025-06-17T15:50:06.6208615+08:00||;True|2025-06-17T15:44:40.6005489+08:00||;True|2025-06-17T15:39:18.1282195+08:00||;True|2025-06-17T15:32:44.0369092+08:00||;True|2025-06-17T15:25:47.1770835+08:00||;True|2025-06-17T15:20:37.2930604+08:00||;True|2025-06-17T15:14:55.2290167+08:00||;True|2025-06-16T18:00:44.7869573+08:00||;True|2025-06-16T16:29:10.6770377+08:00||;True|2025-06-16T13:43:53.7959568+08:00||; \ No newline at end of file