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

20220516 实名制定时器优化、考勤导入、考试接口调整

Browse Source
This commit is contained in:
杨红卫
2022-05-16 11:07:36 +08:00
parent fce7d98592
commit 15256b5c7c
11 changed files with 469 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/APIGetHttpService.cs
+3 -4
View File
@@ -30,7 +30,7 @@ namespace BLL
}
}
request.Headers.Add("token", "AF17168B-87BD-4GLY-1111-F0A0A1158F9B");
request.Timeout = 5000; /// 设置5秒超时
request.Timeout = 20000; /// 设置5秒超时
if (!string.IsNullOrEmpty(data))
{
Stream RequestStream = request.GetRequestStream();
@@ -93,8 +93,7 @@ namespace BLL
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
request.Method = string.IsNullOrEmpty(method) ? "GET" : method;
request.ContentType = string.IsNullOrEmpty(contenttype) ? "application/json;charset=utf-8" : contenttype;
request.Timeout = 5000; /// 设置5秒超时
request.ContentType = string.IsNullOrEmpty(contenttype) ? "application/json;charset=utf-8" : contenttype;
if (header != null)
{
foreach (var i in header.Keys)
@@ -163,7 +162,7 @@ namespace BLL
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
request.Method = string.IsNullOrEmpty(method) ? "GET" : method;
request.ContentType = string.IsNullOrEmpty(contenttype) ? "application/json;charset=utf-8" : contenttype;
request.Timeout = 5000; /// 设置5秒超时
request.Timeout = 20000; /// 设置5秒超时
if (header != null)
{
foreach (var i in header.Keys)
SGGL/BLL/API/HSSE/APITestPlanService.cs
+5 -2
View File
@@ -66,7 +66,7 @@ namespace BLL
returnItem.TestPlanName = getTestP.PlanName;
returnItem.TestPlanManId = getTestP.PlanManId;
returnItem.TestPlanManName = UserService.GetUserNameByUserId(getTestP.PlanManId);
returnItem.TestPlanDate = string.Format("{0:yyyy-MM-dd HH:mm}", getTestP.PlanDate);
returnItem.TestPlanDate = getTestP.PlanDate.HasValue ? string.Format("{0:yyyy-MM-dd HH:mm}", getTestP.PlanDate) : "";
returnItem.TestStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", getTestP.TestStartTime);
returnItem.TestEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", getTestP.TestEndTime);
returnItem.Duration = getTestP.Duration;
@@ -81,7 +81,10 @@ namespace BLL
returnItem.WorkPostIds = getTestP.WorkPostIds;
returnItem.WorkPostNames = WorkPostService.getWorkPostNamesWorkPostIds(getTestP.WorkPostIds);
returnItem.States = getTestP.States;
returnItem.QRCodeUrl = getTestP.QRCodeUrl.Replace('\\', '/');
if (!string.IsNullOrEmpty(getTestP.QRCodeUrl))
{
returnItem.QRCodeUrl = getTestP.QRCodeUrl.Replace('\\', '/');
}
returnItem.TrainingPlanId = getTestP.PlanId;
}
return returnItem;
SGGL/BLL/HSSE/SitePerson/PersonService.cs
+2 -1
View File
@@ -63,7 +63,8 @@ namespace BLL
}
if (!string.IsNullOrEmpty(workPostIds))
{
getPersonList = getPersonList.Where(x => workPostIds.Contains(x.WorkPostId));
List<string> wIds = Funs.GetStrListByStr(workPostIds, ',');
getPersonList = getPersonList.Where(x => wIds.Contains(x.WorkPostId));
}
if (ckTrain)
{
SGGL/BLL/ZHGL/RealName/RealNameMonitorService.cs
+37 -29
View File
@@ -11,19 +11,15 @@ namespace BLL
/// <summary>
/// 监视组件
/// </summary>
private static Timer messageTimer;
// private static Timer messageTimer;
/// <summary>
/// 启动监视器,不一定能成功，根据系统设置决定对监视器执行的操作 系统启动5分钟
/// </summary>
public static void StartMonitor()
{
int adTimeJ = Funs.GetNewInt(ConfigurationManager.AppSettings["Intervaltime"]) ?? 30;
//var getSynchroSet = Funs.DB.RealName_SynchroSet.FirstOrDefault();
//if (getSynchroSet != null && getSynchroSet.Intervaltime.HasValue)
//{
// adTimeJ = getSynchroSet.Intervaltime.Value;
//}
public static void StartMonitor(string jtProCode)
{
int adTimeJ = Funs.GetNewInt(ConfigurationManager.AppSettings["Intervaltime"]) ?? 30;
Timer messageTimer = new Timer();
if (messageTimer != null)
{
messageTimer.Stop();
@@ -36,7 +32,8 @@ namespace BLL
{
AutoReset = true
};
messageTimer.Elapsed += new ElapsedEventHandler(AdUserInProcess);
messageTimer.Elapsed += (sender, args) => AdUserInProcess(sender, jtProCode);
//messageTimer.Elapsed += new ElapsedEventHandler(AdUserInProcess);
messageTimer.Interval = 1000 * 60 * adTimeJ;// 60分钟 60000 * adTimeJ;
messageTimer.Start();
}
@@ -47,34 +44,45 @@ namespace BLL
/// </summary>
/// <param name="sender">Timer组件</param>
/// <param name="e">事件参数</param>
private static void AdUserInProcess(object sender, ElapsedEventArgs e)
public static void AdUserInProcess(object sender, string jtProCode)
{
try
{
SynchroSetService.PushCollCompany();
var getRProjects = from x in Funs.DB.RealName_Project
select x;
if (getRProjects.Count() > 0)
if (!string.IsNullOrEmpty(jtProCode))
{
foreach (var item in getRProjects)
{
var getSynchroSet = Funs.DB.RealName_SynchroSet.FirstOrDefault(x => x.ProCode == item.JTproCode);
if (getSynchroSet != null && !string.IsNullOrEmpty(item.JTproCode))
{
SynchroSetService.PushProCollCompany(item.JTproCode);
//SynchroSetService.PushCollTeam(item.ProCode);
//SynchroSetService.getCollTeam(item.ProCode);
SynchroSetService.PushPersons(Const.BtnAdd, item.JTproCode, null);
SynchroSetService.PushPersons(Const.BtnModify, item.JTproCode, null);
SynchroSetService.PushAttendance(item.JTproCode);
SynchroSetService.updatePersonsExitTime(item.JTproCode);
}
}
SynchroSetService.PushProCollCompany(jtProCode);
SynchroSetService.PushCollTeam(jtProCode);
SynchroSetService.getCollTeam(jtProCode);
SynchroSetService.PushPersons(Const.BtnAdd, jtProCode, null);
SynchroSetService.PushPersons(Const.BtnModify, jtProCode, null);
SynchroSetService.PushAttendance(jtProCode);
SynchroSetService.updatePersonsExitTime(jtProCode);
}
//var getRProjects = from x in Funs.DB.RealName_Project
// select x;
//if (getRProjects.Count() > 0)
//{
// foreach (var item in getRProjects)
// {
// var getSynchroSet = Funs.DB.RealName_SynchroSet.FirstOrDefault(x => x.ProCode == item.JTproCode);
// if (getSynchroSet != null && !string.IsNullOrEmpty(item.JTproCode))
// {
// SynchroSetService.PushProCollCompany(item.JTproCode);
// //SynchroSetService.PushCollTeam(item.ProCode);
// //SynchroSetService.getCollTeam(item.ProCode);
// SynchroSetService.PushPersons(Const.BtnAdd, item.JTproCode, null);
// SynchroSetService.PushPersons(Const.BtnModify, item.JTproCode, null);
// SynchroSetService.PushAttendance(item.JTproCode);
// SynchroSetService.updatePersonsExitTime(item.JTproCode);
// }
// }
//}
}
catch (Exception ex)
{
StartMonitor();
StartMonitor(jtProCode);
ErrLogInfo.WriteLog(ex, "数据接口定时器", "RealNameMonitorService.AdUserInProcess");
}
}
SGGL/BLL/ZHGL/RealName/SynchroSetService.cs
+13 -1
View File
@@ -56,6 +56,11 @@ namespace BLL
}
#endregion
public static List<Model.RealName_Project> GetRealNameProject()
{
return (from x in Funs.DB.RealName_Project select x).ToList();
}
#region 项目基础数据下拉框
/// <summary>
/// 表下拉框
@@ -1426,7 +1431,14 @@ namespace BLL
addTeam(getData.Select(x => x.TeamGroupId).Distinct().ToList(), newToken);
getTeam(proCode, newToken);
addPerson(getData.Select(x => x.PersonId).Distinct().ToList(), newToken);
var getPersonS = getData.Select(x => x.idcardNumber).Distinct().ToList();
foreach (var pitem in getPersonS)
{
PushPersonsByIdentityCard(Const.BtnAdd, proCode, pitem);
PushPersonsByIdentityCard(Const.BtnModify, proCode, pitem);
}
pushContent = JsonConvert.SerializeObject(listObject);
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", null, newToken, pushContent);
if (!string.IsNullOrEmpty(returndata))