2

schangxiang@126.com

2024-12-10 171ee7068e480ffe07638d030223790fb81fae81

 CC/iWareCC_ASRS/Handler/DeviceWarningHandler.cs

@@ -1,4 +1,5 @@
using iWareCommon.Common.Globle;
using Admin.NET.Application;
using iWareCommon.Common.Globle;
using iWareCommon.Utils;
using iWareModel;
using iWareSql.WmsDBModel;
@@ -27,7 +28,10 @@
            {
                using (WmsDBModel edm = new WmsDBModel())
                {
                    dbList = edm.wms_config_device_warning.ToList();
                    //注意：只查询  安全报警、硬件报警信息
                    var query1 = (int)DeviceWarningTypeEnum.安全报警;
                    var query2 = (int)DeviceWarningTypeEnum.硬件报警;
                    dbList = edm.wms_config_device_warning.Where(x => x.DeviceWarningType == query1 || x.DeviceWarningType == query2).ToList();
                }
                foreach (var item in dbList)
                {
@@ -54,7 +58,7 @@
        /// <param name="deviceName"></param>
        /// <param name="warningCode"></param>
        /// <param name="warningContent"></param>
        public static void SaveWarning(EDevice device, LogType _LogType, string warningCode, int deviceAreaCode, string warningContent,int deviceWarningType)
        public static void SaveWarning(EDevice device, LogType _LogType, string warningCode, int deviceAreaCode, string warningContent, int deviceWarningType)
        {
            Task.Run(() =>
            {
@@ -69,7 +73,7 @@
                        WarningTime = DateTime.Now,
                        CreateUserName = SysGloble.WCSSystem,
                        DeviceAreaCode = deviceAreaCode,
                         DeviceWarningType= deviceWarningType,
                        DeviceWarningType = deviceWarningType,
                        DurationTime = "",

                        CreateTime = DateTime.Now,
@@ -100,23 +104,22 @@
        /// <param name="deviceId">设备区域</param>
        /// <param name="_LogType"></param>
        /// <returns></returns>
        public static void AutoCloseWarning(EDevice device, LogType _LogType, System.Collections.Generic.List<string> warningAddressList)
        public static void AutoCloseWarning(EDevice device, LogType _LogType, System.Collections.Generic.List<string> warningCodeList)
        {
            Task.Run(() =>
           {
               try
               {
                   string deviceCode = ((int)device).ToString();
                   using (WmsDBModel edm = new WmsDBModel())
                   {
                       var dataList = edm.wms_record_device_warning.Where(x => x.WarningCode == deviceCode && x.DeviceWarningStatus == 0).ToList();
                       var dataList = edm.wms_record_device_warning.Where(x => x.DeviceWarningStatus == 0).ToList();
                       if (dataList != null && dataList.Count > 0)
                       {
                           var msg = "";
                           var nowDate = DateTime.Now;
                           foreach (var detail in dataList)
                           {
                               if (!warningAddressList.Contains(detail.WarningCode))
                               if (!warningCodeList.Contains(detail.WarningCode))
                               {
                                   nowDate = DateTime.Now;
                                   detail.DeviceWarningStatus = 1; //状态（0：新建 1：已处理）