diff --git a/SGGL/BLL/BoSheng/BOSHENGMonitorService.cs b/SGGL/BLL/BoSheng/BOSHENGMonitorService.cs index 96a1e265..c157abac 100644 --- a/SGGL/BLL/BoSheng/BOSHENGMonitorService.cs +++ b/SGGL/BLL/BoSheng/BOSHENGMonitorService.cs @@ -19,7 +19,7 @@ namespace BLL /// public static void StartMonitor() { - int adTimeJ = 120; + int adTimeJ = 30; if (messageTimer != null) { messageTimer.Stop(); @@ -47,7 +47,7 @@ namespace BLL { try { - var getDataList = (from x in Funs.DB.Sys_DataExchange where x.IsUpdate == false select x).Take(200).ToList(); + var getDataList = (from x in Funs.DB.Sys_DataExchange where x.IsUpdate == false select x).Take(100).ToList(); if (getDataList.Count() > 0) { var getDataList0 = getDataList.Where(x => x.MessageText.Contains("\"Type\":0")).ToList(); diff --git a/SGGL/BLL/OpenService/MonitorService.cs b/SGGL/BLL/OpenService/MonitorService.cs index 1a08e481..630331f8 100644 --- a/SGGL/BLL/OpenService/MonitorService.cs +++ b/SGGL/BLL/OpenService/MonitorService.cs @@ -2177,7 +2177,7 @@ namespace BLL GetDataService.CloseLicenseData(); //////推送订阅消息 GetDataService.SendSubscribeMessage(); - // GetDataService.CorrectingPersonInOutNumber(null); + GetDataService.CorrectingPersonInOutNumber(null); } } } diff --git a/SGGL/FineUIPro.Web/Global.asax.cs b/SGGL/FineUIPro.Web/Global.asax.cs index c447a38b..b5bc6f9c 100644 --- a/SGGL/FineUIPro.Web/Global.asax.cs +++ b/SGGL/FineUIPro.Web/Global.asax.cs @@ -17,6 +17,7 @@ protected void Application_Start(object sender, EventArgs e) { Application["OnlineUserCount"] = 0; + Model.Sys_User sysUser = new Sys_User(); try { Funs.RootPath = Server.MapPath("~/"); @@ -27,6 +28,8 @@ Funs.SGGLUrl = ConfigurationManager.AppSettings["SGGLUrl"]; Funs.RealNameApiUrl = ConfigurationManager.AppSettings["RealNameApiUrl"]; Funs.ControlApiUrl = ConfigurationManager.AppSettings["ControlApiUrl"]; + + sysUser = UserService.GetUserByUserId(Const.sysglyId); } catch (Exception ex) { @@ -43,6 +46,7 @@ BLL.RealNameMonitorService.StartMonitor(); } BLL.RealNameMonitorService.StartInOutMonitor(); + BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "实名制同步定时器启动成功!"); } catch (Exception ex) { @@ -54,38 +58,52 @@ BLL.MonitorService.StartMonitor(); BLL.MonitorService.StartMonitorEve(); BLL.MonitorService.StartPersonQuarterCheck(); + BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "通用定时器启动成功!"); } catch (Exception ex) { - ErrLogInfo.WriteLog("通用定时器!", ex); + ErrLogInfo.WriteLog("通用定时器启动失败!", ex); } + ////员工考核定时器 + //try + //{ + // BLL.MonitorService.StartPersonQuarterCheck(); + // BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "员工考核定时器启动成功!"); + //} + //catch (Exception ex) + //{ + // ErrLogInfo.WriteLog("员工考核定时器启动失败!", ex); + //} ////从集团获取数据定时器 try { BLL.MCSWebService.StartMonitor(); + BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "从材料软件获取数据定时器启动成功!"); } catch (Exception ex) { - ErrLogInfo.WriteLog("材料软件定时器!", ex); + ErrLogInfo.WriteLog("材料软件定时器启动失败!", ex); } ////从集团获取数据定时器 try { BLL.CNCECHSSEMonitorService.StartMonitor(); + BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "从集团获取数据定时器启动成功!"); } catch (Exception ex) { - ErrLogInfo.WriteLog("从集团获取数据定时器!", ex); + ErrLogInfo.WriteLog("从集团获取数据定时器启动失败!", ex); } ////从博晟获取培训考试数据定时器 try { BLL.BOSHENGMonitorService.StartMonitor(); + BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "从博晟获取培训考试数据定时器启动成功!"); } catch (Exception ex) { - ErrLogInfo.WriteLog("从博晟获取培训考试数据定时器!", ex); + ErrLogInfo.WriteLog("从博晟获取培训考试数据定时器启动失败!", ex); } } diff --git a/SGGL/WebAPI/Controllers/HSSE/PageDataController.cs b/SGGL/WebAPI/Controllers/HSSE/PageDataController.cs index 9ccc41f5..94459aec 100644 --- a/SGGL/WebAPI/Controllers/HSSE/PageDataController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/PageDataController.cs @@ -113,7 +113,7 @@ namespace WebAPI.Controllers else { SafeHours = APIPageDataService.getSafeHours(projectId); - // GetDataService.CorrectingPersonInOutNumber(projectId); + GetDataService.CorrectingPersonInOutNumber(projectId); } } string hiddenStr = RectificationNum.ToString() + "/" + HiddenDangerNum.ToString();