diff --git a/src/Khd.Core.Domain/Models/DmsBaseAlarmRule.cs b/src/Khd.Core.Domain/Models/DmsBaseAlarmRule.cs new file mode 100644 index 0000000..ba4d73d --- /dev/null +++ b/src/Khd.Core.Domain/Models/DmsBaseAlarmRule.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Khd.Core.Domain.Models +{ + [Table("dms_base_alarm_rule")] + public class DmsBaseAlarmRule + { + [Column("alarm_rule_id")] + public long AlarmRuleId { get; set; } + + [Column("device_id")] + public long DeviceId { get; set; } + + [Column("alarm_type")] + public string AlarmType { get; set; } + + [Column("alarm_level")] + public string AlarmLevel { get; set; } + + [Column("notice_type")] + public string NoticeType { get; set; } + + [Column("recover_type")] + public string RecoverType { get; set; } + + [Column("continue_time")] + public long ContinueTime { get; set; } + + [Column("alarm_reason")] + public string AlarmReason { get; set; } + + [Column("handle_suggest")] + public string HandleSuggest { get; set; } + + [Column("remark")] + public string Remark { get; set; } + } +} diff --git a/src/Khd.Core.Domain/Models/DmsBaseDeviceLedger.cs b/src/Khd.Core.Domain/Models/DmsBaseDeviceLedger.cs new file mode 100644 index 0000000..ea4d5d3 --- /dev/null +++ b/src/Khd.Core.Domain/Models/DmsBaseDeviceLedger.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Khd.Core.Domain.Models +{ + [Table("dms_base_device_ledger")] + public class DmsBaseDeviceLedger + { + [Column("device_id")] + public long DeviceId { get; set; } + + [Column("device_code")] + public string DeviceCode { get; set; } + + [Column("device_name")] + public string DeviceName { get; set; } + + [Column("station_id")] + public string StationId { get; set; } + + [Column("asset_number")] + public string AssetNumber { get; set; } + + [Column("device_location")] + public string DeviceLocation { get; set; } + + [Column("device_type_id")] + public string DeviceTypeId { get; set; } + + [Column("device_spec")] + public string DeviceSpec { get; set; } + + [Column("supplier_id")] + public string SupplierId { get; set; } + + [Column("device_status")] + public string DeviceStatus { get; set; } + + [Column("is_flag")] + public int IsFlag { get; set; } + + [Column("remark")] + public string Remark { get; set; } + } +} diff --git a/src/Khd.Core.Domain/Models/DmsRecordAlarmInfo.cs b/src/Khd.Core.Domain/Models/DmsRecordAlarmInfo.cs new file mode 100644 index 0000000..9edddf2 --- /dev/null +++ b/src/Khd.Core.Domain/Models/DmsRecordAlarmInfo.cs @@ -0,0 +1,70 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Khd.Core.Domain.Models +{ + [Table("dms_record_alarm_info")] + public class DmsRecordAlarmInfo + { + [Column("alarm_id")] + public long AlarmId { get; set; } + + [Column("device_id")] + public long DeviceId { get; set; } + + [Column("alarm_rule_id")] + public long AlarmRuleId { get; set; } + + [Column("alarm_begin_time")] + public DateTime AlarmBeginTime { get; set; } + + [Column("alarm_end_time")] + public DateTime AlarmEndTime { get; set; } + + [Column("continue_time")] + public long ContinueTime { get; set; } + + [Column("alarm_reason")] + public string AlarmReason { get; set; } + + [Column("alarm_data")] + public string AlarmData { get; set; } + + [Column("alarm_status")] + public string AlarmStatus { get; set; } + + [Column("handle_suggest")] + public string HandleSuggest { get; set; } + + [Column("notice_status")] + public string NoticeStatus { get; set; } + + [Column("handle_user")] + public string HandleUser { get; set; } + + [Column("handle_time")] + public DateTime HandleTime { get; set; } + + [Column("cause_analysis")] + public string CauseAnalysis { get; set; } + + [Column("remark")] + public string Remark { get; set; } + + [Column("create_by")] + public string CreateBy { get; set; } + + [Column("create_time")] + public DateTime CreateTime { get; set; } + + [Column("update_by")] + public string UpdateBy { get; set; } + + [Column("update_time")] + public DateTime UpdateTime { get; set; } + } +} diff --git a/src/Khd.Core.Domain/Models/DmsRecordAlarmTime.cs b/src/Khd.Core.Domain/Models/DmsRecordAlarmTime.cs new file mode 100644 index 0000000..697d2c7 --- /dev/null +++ b/src/Khd.Core.Domain/Models/DmsRecordAlarmTime.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Khd.Core.Domain.Models +{ + [Table("dms_record_alarm_time")] + public class DmsRecordAlarmTime + { + [Column("alarm_id")] + public long AlarmId { get; set; } + + [Column("device_id")] + public long DeviceId { get; set; } + + [Column("alarm_rule_id")] + public long AlarmRuleId { get; set; } + + [Column("alarm_begin_time")] + public DateTime AlarmBeginTime { get; set; } + + [Column("continue_time")] + public long ContinueTime { get; set; } + + [Column("alarm_reason")] + public string AlarmReason { get; set; } + + [Column("alarm_data")] + public string AlarmData { get; set; } + + [Column("handle_suggest")] + public string HandleSuggest { get; set; } + + [Column("remark")] + public string Remark { get; set; } + + [Column("create_by")] + public string CreateBy { get; set; } + + [Column("create_time")] + public DateTime CreateTime { get; set; } + + [Column("update_by")] + public string UpdateBy { get; set; } + + [Column("update_time")] + public DateTime UpdateTime { get; set; } + } +} diff --git a/src/Khd.Core.EntityFramework/DefaultDbContext.cs b/src/Khd.Core.EntityFramework/DefaultDbContext.cs index ee34aeb..dc28d57 100644 --- a/src/Khd.Core.EntityFramework/DefaultDbContext.cs +++ b/src/Khd.Core.EntityFramework/DefaultDbContext.cs @@ -80,6 +80,12 @@ namespace Khd.Core.EntityFramework public DbSet PlcPoint { get; set; } + public DbSet DmsBaseAlarmRule { get; set; } + public DbSet DmsBaseDeviceLedger { get; set; } + + public DbSet DmsRecordAlarmInfo { get; set; } + + public DbSet DmsRecordAlarmTime { get; set; } } } \ No newline at end of file diff --git a/src/Khd.Core.Wcs/Wcs/SystemTimer.cs b/src/Khd.Core.Wcs/Wcs/SystemTimer.cs index 6bf51c4..c612819 100644 --- a/src/Khd.Core.Wcs/Wcs/SystemTimer.cs +++ b/src/Khd.Core.Wcs/Wcs/SystemTimer.cs @@ -14,7 +14,7 @@ namespace Khd.Core.Wcs.Wcs { public class SystemTimer { - private readonly LoggerUtils _logger = new (); + private readonly LoggerUtils _logger = new(); private readonly IHost host; public SystemTimer(IHost host) @@ -65,9 +65,34 @@ namespace Khd.Core.Wcs.Wcs IsBackground = true }; deleteLogsThread.Start(); + + //var AgvAlarmThread = new Thread(AgvAlarmLogic) + //{ + // Name = "AgvAlarmThread", + // IsBackground = true + //}; + //AgvAlarmThread.Start(); Console.WriteLine($"{DateTime.Now}: SystemTimer started"); } + private void AgvAlarmLogic(object? obj) + { + using var scope = host.Services.CreateScope(); + using var dbContext = scope.ServiceProvider.GetRequiredService(); + while (true) + { + try + { + + } + catch + { + + } + Thread.Sleep(3000); + } + } + /// /// 定时清除日志文件 ///