lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC

This commit is contained in:
gaofei 2021-12-08 10:28:47 +08:00
parent 92c5facf4d fa779f17b2
commit aaf9629b87
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/BLL/BoSheng/BOSHENGMonitorService.cs
View File

@ -19,7 +19,7 @@ namespace BLL
/// </summary> /// </summary>
public static void StartMonitor() public static void StartMonitor()
{ {
int adTimeJ = 120; int adTimeJ = 30;
if (messageTimer != null) if (messageTimer != null)
{ {
messageTimer.Stop(); messageTimer.Stop();
@ -47,7 +47,7 @@ namespace BLL
{ {
try 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) if (getDataList.Count() > 0)
{ {
var getDataList0 = getDataList.Where(x => x.MessageText.Contains("\"Type\":0")).ToList(); var getDataList0 = getDataList.Where(x => x.MessageText.Contains("\"Type\":0")).ToList();

2
SGGL/BLL/OpenService/MonitorService.cs
View File

@ -2177,7 +2177,7 @@ namespace BLL
GetDataService.CloseLicenseData(); GetDataService.CloseLicenseData();
//////推送订阅消息 //////推送订阅消息
GetDataService.SendSubscribeMessage(); GetDataService.SendSubscribeMessage();
// GetDataService.CorrectingPersonInOutNumber(null); GetDataService.CorrectingPersonInOutNumber(null);
} }
} }
} }

26
SGGL/FineUIPro.Web/Global.asax.cs
View File

@ -17,6 +17,7 @@
protected void Application_Start(object sender, EventArgs e) protected void Application_Start(object sender, EventArgs e)
{ {
Application["OnlineUserCount"] = 0; Application["OnlineUserCount"] = 0;
Model.Sys_User sysUser = new Sys_User();
try try
{ {
Funs.RootPath = Server.MapPath("~/"); Funs.RootPath = Server.MapPath("~/");
@ -27,6 +28,8 @@
Funs.SGGLUrl = ConfigurationManager.AppSettings["SGGLUrl"]; Funs.SGGLUrl = ConfigurationManager.AppSettings["SGGLUrl"];
Funs.RealNameApiUrl = ConfigurationManager.AppSettings["RealNameApiUrl"]; Funs.RealNameApiUrl = ConfigurationManager.AppSettings["RealNameApiUrl"];
Funs.ControlApiUrl = ConfigurationManager.AppSettings["ControlApiUrl"]; Funs.ControlApiUrl = ConfigurationManager.AppSettings["ControlApiUrl"];
sysUser = UserService.GetUserByUserId(Const.sysglyId);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -43,6 +46,7 @@
BLL.RealNameMonitorService.StartMonitor(); BLL.RealNameMonitorService.StartMonitor();
} }
BLL.RealNameMonitorService.StartInOutMonitor(); BLL.RealNameMonitorService.StartInOutMonitor();
BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "实名制同步定时器启动成功！");
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -54,38 +58,52 @@
BLL.MonitorService.StartMonitor(); BLL.MonitorService.StartMonitor();
BLL.MonitorService.StartMonitorEve(); BLL.MonitorService.StartMonitorEve();
BLL.MonitorService.StartPersonQuarterCheck(); BLL.MonitorService.StartPersonQuarterCheck();
BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "通用定时器启动成功！");
} }
catch (Exception ex) 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 try
{ {
BLL.MCSWebService.StartMonitor(); BLL.MCSWebService.StartMonitor();
BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "从材料软件获取数据定时器启动成功！");
} }
catch (Exception ex) catch (Exception ex)
{ {
ErrLogInfo.WriteLog("材料软件定时器!", ex); ErrLogInfo.WriteLog("材料软件定时器启动失败!", ex);
} }
////从集团获取数据定时器 ////从集团获取数据定时器
try try
{ {
BLL.CNCECHSSEMonitorService.StartMonitor(); BLL.CNCECHSSEMonitorService.StartMonitor();
BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "从集团获取数据定时器启动成功！");
} }
catch (Exception ex) catch (Exception ex)
{ {
ErrLogInfo.WriteLog("从集团获取数据定时器!", ex); ErrLogInfo.WriteLog("从集团获取数据定时器启动失败!", ex);
} }
////从博晟获取培训考试数据定时器 ////从博晟获取培训考试数据定时器
try try
{ {
BLL.BOSHENGMonitorService.StartMonitor(); BLL.BOSHENGMonitorService.StartMonitor();
BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "从博晟获取培训考试数据定时器启动成功！");
} }
catch (Exception ex) catch (Exception ex)
{ {
ErrLogInfo.WriteLog("从博晟获取培训考试数据定时器!", ex); ErrLogInfo.WriteLog("从博晟获取培训考试数据定时器启动失败!", ex);
} }
} }

2
SGGL/WebAPI/Controllers/HSSE/PageDataController.cs
View File

@ -113,7 +113,7 @@ namespace WebAPI.Controllers
else else
{ {
SafeHours = APIPageDataService.getSafeHours(projectId); SafeHours = APIPageDataService.getSafeHours(projectId);
// GetDataService.CorrectingPersonInOutNumber(projectId); GetDataService.CorrectingPersonInOutNumber(projectId);
} }
} }
string hiddenStr = RectificationNum.ToString() + "/" + HiddenDangerNum.ToString(); string hiddenStr = RectificationNum.ToString() + "/" + HiddenDangerNum.ToString();