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

0522-004

Browse Source
This commit is contained in:
gaofei
2022-05-22 10:35:38 +08:00
parent e75e82e1fd 4fc483b04c
commit d33b007348
34 changed files with 952 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/FileUpload/QRCodeFile/20220702110716845.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 38 KiB

SGGL/FineUIPro.Web/FileUpload/QRCodeFile/20220702110726069.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 37 KiB

SGGL/FineUIPro.Web/FileUpload/QRCodeFile/20220702110734021.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

SGGL/FineUIPro.Web/FileUpload/QRCodeFile/20221629111627216.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+1 -1
View File
@@ -58,7 +58,7 @@
<ItemGroup>
<Reference Include="Apache.NMS, Version=1.8.0.0, Culture=neutral, PublicKeyToken=82756feee3957618, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\Apache.NMS.dll</HintPath>
<HintPath>..\..\..\..\DepCode\reference-bll\Reference BLL\Apache.NMS.dll</HintPath>
</Reference>
<Reference Include="Apache.NMS.ActiveMQ, Version=1.7.2.4108, Culture=neutral, PublicKeyToken=82756feee3957618, processorArchitecture=MSIL">
<HintPath>..\packages\Apache.NMS.ActiveMQ.1.7.2\lib\net40\Apache.NMS.ActiveMQ.dll</HintPath>
SGGL/FineUIPro.Web/Global.asax.cs
+37 -26
View File
@@ -1,11 +1,12 @@
namespace FineUIPro.Web
{
using BLL;
using Model;
using System;
using System.Configuration;
using System.Globalization;
using System.Text;
using BLL;
using Model;
using System.Timers;
public class Global : System.Web.HttpApplication
{
@@ -17,7 +18,6 @@
protected void Application_Start(object sender, EventArgs e)
{
Application["OnlineUserCount"] = 0;
Model.Sys_User sysUser = new Sys_User();
try
{
Funs.RootPath = Server.MapPath("~/");
@@ -27,26 +27,34 @@
Funs.SystemName = ConfigurationManager.AppSettings["SystemName"];
Funs.SGGLUrl = ConfigurationManager.AppSettings["SGGLUrl"];
Funs.RealNameApiUrl = ConfigurationManager.AppSettings["RealNameApiUrl"];
Funs.ControlApiUrl = ConfigurationManager.AppSettings["ControlApiUrl"];
sysUser = UserService.GetUserByUserId(Const.sysglyId);
Funs.ControlApiUrl = ConfigurationManager.AppSettings["ControlApiUrl"];
Funs.SystemVersion = ConfigurationManager.AppSettings["SystemVersion"];
}
catch (Exception ex)
{
ErrLogInfo.WriteLog(string.Empty, ex);
//AppDomain.Unload(AppDomain.CurrentDomain);
}
////实名制同步定时器
///实名制出入记录去重
try
{
BLL.RealNameMonitorService.StartInOutMonitor();
}
catch (Exception ex)
{
ErrLogInfo.WriteLog("实名制出入记录去重定时器启动失败!", ex);
}
////实名制同步定时器
try
{
if (ConfigurationManager.AppSettings["EnableRealName"] == "True")
{
BLL.RealNameMonitorService.StartMonitor();
var getProjects = SynchroSetService.GetRealNameProject();
foreach (var item in getProjects)
{
BLL.RealNameMonitorService.StartMonitor(item.JTproCode);
}
}
BLL.RealNameMonitorService.StartInOutMonitor();
BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "实名制同步定时器启动成功！");
}
catch (Exception ex)
{
@@ -58,27 +66,33 @@
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);
}
////员工考核定时器
//try
//{
// BLL.MonitorService.StartPersonQuarterCheck();
// BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "员工考核定时器启动成功！");
//}
//catch (Exception ex)
//{
// ErrLogInfo.WriteLog("员工考核定时器启动失败!", ex);
//}
///实名制日志清理定时器
try
{
BLL.RealNameMonitorService.StartMonitorDeletePushLog();
}
catch (Exception ex)
{
ErrLogInfo.WriteLog("实名制日志清理定时器启动失败!", ex);
}
///考勤记录清理定时器
try
{
BLL.RealNameMonitorService.StartMonitorCleanAttendance();
}
catch (Exception ex)
{
ErrLogInfo.WriteLog("实名制日志清理定时器启动失败!", ex);
}
////从集团获取数据定时器
try
{
BLL.MCSWebService.StartMonitor();
BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "从材料软件获取数据定时器启动成功！");
}
catch (Exception ex)
{
@@ -88,18 +102,15 @@
try
{
BLL.CNCECHSSEMonitorService.StartMonitor();
BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "从集团获取数据定时器启动成功！");
}
catch (Exception ex)
{
ErrLogInfo.WriteLog("从集团获取数据定时器启动失败!", ex);
}
////从博晟获取培训考试数据定时器
try
{
BLL.BOSHENGMonitorService.StartMonitor();
BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "从博晟获取培训考试数据定时器启动成功！");
}
catch (Exception ex)
{
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoIn.aspx.cs
+30 -13
View File
@@ -229,7 +229,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
DateTime inToOutTime = Convert.ToDateTime(col4);
}
catch (Exception)
catch (Exception ex)
{
result += "第" + (i + 2).ToString() + "行," + "时间" + "," + "[" + col4 + "]错误！" + "|";
}
@@ -407,26 +407,43 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
if (string.IsNullOrEmpty(errorInfos))
{
int a = viewCheckings.Count();
for (int i = 0; i < a; i++)
foreach (var item in viewCheckings)
{
Model.SitePerson_Checking newChecking = new Model.SitePerson_Checking
var getCheck = Funs.DB.SitePerson_Checking.FirstOrDefault(x => x.CheckingId == item.CheckingId);
if (getCheck == null)
{
CheckingId = viewCheckings[i].CheckingId,
ProjectId = viewCheckings[i].ProjectId,
IdentityCard = viewCheckings[i].IdentityCard,
IntoOutTime = viewCheckings[i].IntoOutTime,
IntoOut = viewCheckings[i].IntoOut,
PersonId = viewCheckings[i].PersonId
};
BLL.SitePerson_CheckingService.AddPersonInfo(newChecking);
Model.SitePerson_Checking newChecking = new Model.SitePerson_Checking
{
CheckingId = item.CheckingId,
ProjectId = item.ProjectId,
IdentityCard = item.IdentityCard,
IntoOutTime = item.IntoOutTime,
IntoOut = item.IntoOut,
PersonId = item.PersonId
};
BLL.SitePerson_CheckingService.AddPersonInfo(newChecking);
}
}
//int a = viewCheckings.Count();
//for (int i = 0; i < a; i++)
//{
// Model.SitePerson_Checking newChecking = new Model.SitePerson_Checking
// {
// CheckingId = viewCheckings[i].CheckingId,
// ProjectId = viewCheckings[i].ProjectId,
// IdentityCard = viewCheckings[i].IdentityCard,
// IntoOutTime = viewCheckings[i].IntoOutTime,
// IntoOut = viewCheckings[i].IntoOut,
// PersonId = viewCheckings[i].PersonId
// };
// BLL.SitePerson_CheckingService.AddPersonInfo(newChecking);
//}
string rootPath = Server.MapPath("~/");
string initFullPath = rootPath + initPath;
string filePath = initFullPath + this.hdFileName.Text;
if (filePath != string.Empty && System.IO.File.Exists(filePath))
{
System.IO.File.Delete(filePath);//删除上传的XLS文件
File.Delete(filePath);//删除上传的XLS文件
}
ShowNotify("导入成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
SGGL/FineUIPro.Web/Login.aspx
+2 -2
View File
@@ -10,9 +10,9 @@
</head>
<body>
<div id="wrapper" class="dec-login bi-absolute-layout dec-login-fresh">
<img alt="" class="bi-single bi-img display-block"
<%-- <img alt="" class="bi-single bi-img display-block"
src="./images/login.png"
style="height: 100%; left: 0px; top: 0px; bottom: 0px; position: absolute; display: none;" />
style="height: 100%; left: 0px; top: 0px; bottom: 0px; position: absolute; display: none;" />--%>
<img alt=""
src="res/index/images/iconlogo.png"
style="height: auto;width:300px; left: 100px; top: 60px; position: absolute;" />
SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx
+18 -10
View File
@@ -30,20 +30,24 @@
<Tabs>
<f:Tab ID="Tab1" Title="基础信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server"
OnClick="btnSave_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:Label runat="server" ID="lbSystemVersion" Hidden="true" Label="系统版本"></f:Label>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnCustomQuery" Text="自定义查询" Icon="SystemSearch" runat="server"
OnClick="btnCustomQuery_Click" Hidden="true">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Form ID="SimpleForm1" LabelAlign="Right" MessageTarget="Qtip" RedStarPosition="BeforeText"
LabelWidth="90px" BodyPadding="5px" ShowBorder="false" ShowHeader="false" runat="server"
AutoScroll="false">
<Items>
<f:Panel ID="Panel3" runat="server" ShowBorder="false" ShowHeader="false" Layout="HBox"
BoxConfigAlign="StretchMax">
@@ -123,6 +127,10 @@
</f:TabStrip>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="查询" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1024px" Maximized="true"
Height="620px">
</f:Window>
</form>
</body>
</html>
SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.cs
+11
View File
@@ -38,6 +38,12 @@ namespace FineUIPro.Web.Personal
{
/// Tab1加载页面方法
this.Tab1LoadData();
if (this.CurrUser.UserId == Const.hfnbdId)
{
this.btnCustomQuery.Hidden = false;
this.lbSystemVersion.Hidden = false;
this.lbSystemVersion.Text = Funs.SystemVersion;
}
}
}
@@ -143,5 +149,10 @@ namespace FineUIPro.Web.Personal
Alert.ShowInParent("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
protected void btnCustomQuery_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../SysManage/CustomQuery.aspx"), "查询"));
}
}
}
SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.designer.cs
Generated
+27
View File
@@ -66,6 +66,15 @@ namespace FineUIPro.Web.Personal {
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// lbSystemVersion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSystemVersion;
/// <summary>
/// btnSave 控件。
/// </summary>
@@ -75,6 +84,15 @@ namespace FineUIPro.Web.Personal {
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnCustomQuery 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnCustomQuery;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -290,5 +308,14 @@ namespace FineUIPro.Web.Personal {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm2;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
}
}
SGGL/FineUIPro.Web/ProjectData/ProjectUser.aspx.cs
+2 -1
View File
@@ -113,7 +113,7 @@ namespace FineUIPro.Web.ProjectData
{
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
BLL.LogService.AddSys_Log(this.CurrUser, "删除项目用户！", null, BLL.Const.ProjectUserMenuId, BLL.Const.BtnDelete);
var projectUser = BLL.ProjectUserService.GetProjectUserById(Grid1.DataKeys[rowIndex][0].ToString());
if (projectUser != null)
{
@@ -123,6 +123,7 @@ namespace FineUIPro.Web.ProjectData
BLL.RoleItemService.DeleteRoleItem(roleItem.RoleItemId);
}
}
BLL.LogService.AddSys_Log(this.CurrUser, "删除项目用户！", projectUser.UserId, BLL.Const.ProjectUserMenuId, BLL.Const.BtnDelete);
BLL.ProjectUserService.DeleteProjectUserById(Grid1.DataKeys[rowIndex][0].ToString());
}
SGGL/FineUIPro.Web/common/main.aspx
+1 -1
View File
@@ -888,7 +888,7 @@
}
})
</script>
<script type="text/javascript" src="//api.map.baidu.com/api?type=webgl&v=3.0&ak=mGX1cqaDru89SYm6Pmbj0oxxghc1otuv"></script>
<script type="text/javascript" src="//api.map.baidu.com/api?type=webgl&v=3.0&ak=Lma56vCk88x46KEXSyc2cIXk6kT2W7KB"></script>
<script type="text/javascript">
function randomData() {
return Math.round(Math.random() * 1000);