From d87b2d5be970b6458ecb7250f51541cb82167d61 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Tue, 2 Apr 2024 14:28:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E7=A7=8D=E8=AE=BE=E5=A4=87=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E7=AE=A1=E7=90=86=E5=90=88=E5=B9=B6=EF=BC=8C=E8=80=83?= =?UTF-8?q?=E8=AF=95=E6=8E=A5=E5=8F=A3=E5=88=9B=E5=BB=BA=E8=AF=95=E5=8D=B7?= =?UTF-8?q?=E5=92=8C=E7=AD=94=E9=A2=98=E4=BD=BF=E7=94=A8redis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/SGGL_CD/v17/.wsuo | Bin 116224 -> 120832 bytes .../版本日志/SGGLDB_CD_V2024-04-02-001.sql | 81 + SGGL/BLL/API/HSSE/APITestRecordService.cs | 62 +- SGGL/BLL/BLL.csproj | 46 +- .../Common => BLL/Common/Redis}/ICache.cs | 9 +- .../Common => BLL/Common/Redis}/Redis.cs | 11 +- SGGL/BLL/Common/Redis/RedisHelper.cs | 2069 +++++++++++++++++ SGGL/BLL/DropListService.cs | 24 +- .../HSSE/Administrative/CarManagerService.cs | 8 +- .../EquipmentInItemService.cs | 21 +- SGGL/BLL/SysManage/SysHttplogService.cs | 41 +- SGGL/BLL/SysManage/SysMenuService.cs | 49 +- SGGL/FineUIPro.Web/ErrLog.txt | 55 + SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 24 + .../HSSE/Administrative/CarManager.aspx | 11 + .../HSSE/Administrative/CarManager.aspx.cs | 2 +- .../HSSE/Administrative/CarManagerEdit.aspx | 19 +- .../Administrative/CarManagerEdit.aspx.cs | 8 +- .../CarManagerEdit.aspx.designer.cs | 75 +- .../HSSE/Administrative/CarManagerView.aspx | 29 +- .../Administrative/CarManagerView.aspx.cs | 3 + .../CarManagerView.aspx.designer.cs | 73 +- .../HSSE/InApproveManager/EquipmentIn.aspx | 30 +- .../HSSE/InApproveManager/EquipmentIn.aspx.cs | 2 +- .../InApproveManager/EquipmentInEdit.aspx | 29 +- .../InApproveManager/EquipmentInItemEdit.aspx | 14 +- .../EquipmentInItemEdit.aspx.cs | 16 + .../EquipmentInItemEdit.aspx.designer.cs | 28 +- SGGL/FineUIPro.Web/SysManage/HttpLog.aspx | 17 +- SGGL/FineUIPro.Web/SysManage/HttpLog.aspx.cs | 67 + .../SysManage/HttpLog.aspx.designer.cs | 18 + SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx | 3 + .../SysManage/SysConstSet.aspx.cs | 6 + .../SysManage/SysConstSet.aspx.designer.cs | 9 + .../SysManage/SystemMenuSet.aspx | 91 + .../SysManage/SystemMenuSet.aspx.cs | 224 ++ .../SysManage/SystemMenuSet.aspx.designer.cs | 116 + .../SysManage/SystemMenuSetEdit.aspx | 61 + .../SysManage/SystemMenuSetEdit.aspx.cs | 97 + .../SystemMenuSetEdit.aspx.designer.cs | 107 + .../SysManage/SystemMenuSetMove.aspx | 60 + .../SysManage/SystemMenuSetMove.aspx.cs | 175 ++ .../SystemMenuSetMove.aspx.designer.cs | 89 + SGGL/FineUIPro.Web/Web.config | 12 + SGGL/Model/Model.cs | 240 ++ SGGL/WebAPI/Common/PersonKqSocketServices.cs | 10 +- .../Controllers/HSSE/TestRecordController.cs | 110 + SGGL/WebAPI/Global.asax.cs | 1 + SGGL/WebAPI/WebAPI.csproj | 2 - 49 files changed, 4175 insertions(+), 179 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_CD_V2024-04-02-001.sql rename SGGL/{WebAPI/Common => BLL/Common/Redis}/ICache.cs (97%) rename SGGL/{WebAPI/Common => BLL/Common/Redis}/Redis.cs (98%) create mode 100644 SGGL/BLL/Common/Redis/RedisHelper.cs create mode 100644 SGGL/FineUIPro.Web/SysManage/SystemMenuSet.aspx create mode 100644 SGGL/FineUIPro.Web/SysManage/SystemMenuSet.aspx.cs create mode 100644 SGGL/FineUIPro.Web/SysManage/SystemMenuSet.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/SysManage/SystemMenuSetEdit.aspx create mode 100644 SGGL/FineUIPro.Web/SysManage/SystemMenuSetEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/SysManage/SystemMenuSetEdit.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/SysManage/SystemMenuSetMove.aspx create mode 100644 SGGL/FineUIPro.Web/SysManage/SystemMenuSetMove.aspx.cs create mode 100644 SGGL/FineUIPro.Web/SysManage/SystemMenuSetMove.aspx.designer.cs diff --git a/.vs/SGGL_CD/v17/.wsuo b/.vs/SGGL_CD/v17/.wsuo index d0ca065ed61ef7221967c27b8e1ac9cdae048de6..7f123c3c68764a4659054060be6b48cbcfa8b57a 100644 GIT binary patch delta 6098 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 IFU7v!0Fn5bl>h($ diff --git a/DataBase/版本日志/SGGLDB_CD_V2024-04-02-001.sql b/DataBase/版本日志/SGGLDB_CD_V2024-04-02-001.sql new file mode 100644 index 00000000..8a7d30c5 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_CD_V2024-04-02-001.sql @@ -0,0 +1,81 @@ + + +alter table dbo.InApproveManager_EquipmentInItem + add InDate datetime +go + +exec sp_addextendedproperty 'MS_Description', N'进场时间', 'SCHEMA', 'dbo', 'TABLE', 'InApproveManager_EquipmentInItem', + 'COLUMN', 'InDate' +go + +alter table dbo.InApproveManager_EquipmentInItem + add EququalityExpireDate datetime +go + +exec sp_addextendedproperty 'MS_Description', N'设备资质有效期', 'SCHEMA', 'dbo', 'TABLE', + 'InApproveManager_EquipmentInItem', 'COLUMN', 'EququalityExpireDate' +go + +alter table dbo.InApproveManager_EquipmentInItem + add InsuredAmount decimal +go + +exec sp_addextendedproperty 'MS_Description', N'保额', 'SCHEMA', 'dbo', 'TABLE', 'InApproveManager_EquipmentInItem', + 'COLUMN', 'InsuredAmount' +go + +alter table dbo.InApproveManager_EquipmentInItem + add OperatorName nvarchar(50) +go + +exec sp_addextendedproperty 'MS_Description', N'操作人员姓名', 'SCHEMA', 'dbo', 'TABLE', + 'InApproveManager_EquipmentInItem', 'COLUMN', 'OperatorName' +go + +alter table dbo.InApproveManager_EquipmentInItem + add OperatorIdentityCard nvarchar(50) +go + +exec sp_addextendedproperty 'MS_Description', N'操作人员身份证号', 'SCHEMA', 'dbo', 'TABLE', + 'InApproveManager_EquipmentInItem', 'COLUMN', 'OperatorIdentityCard' +go + +alter table dbo.InApproveManager_EquipmentInItem + add OperatorQualityExpireDate datetime +go + +exec sp_addextendedproperty 'MS_Description', N'操作人员资质有效期', 'SCHEMA', 'dbo', 'TABLE', + 'InApproveManager_EquipmentInItem', 'COLUMN', 'OperatorQualityExpireDate' +go + +alter table dbo.InApproveManager_EquipmentInItem + add CertificationDepartment nvarchar(50) +go + +exec sp_addextendedproperty 'MS_Description', N'发证部门', 'SCHEMA', 'dbo', 'TABLE', 'InApproveManager_EquipmentInItem', + 'COLUMN', 'CertificationDepartment' +go + +alter table dbo.Administrative_CarManager + add DriverName nvarchar(50) +go +alter table dbo.Administrative_CarManager + add DriverCode nvarchar(50) +go + +alter table dbo.Administrative_CarManager + add DrivingDate datetime +go + + +exec sp_addextendedproperty 'MS_Description', N' 姓名', 'SCHEMA', 'dbo', 'TABLE', 'Administrative_CarManager', 'COLUMN', + 'DriverName' +go + +exec sp_addextendedproperty 'MS_Description', N'驾驶证号', 'SCHEMA', 'dbo', 'TABLE', 'Administrative_CarManager', + 'COLUMN', 'DriverCode' +go + +exec sp_addextendedproperty 'MS_Description', N'发证日期', 'SCHEMA', 'dbo', 'TABLE', 'Administrative_CarManager', + 'COLUMN', 'DrivingDate' +go \ No newline at end of file diff --git a/SGGL/BLL/API/HSSE/APITestRecordService.cs b/SGGL/BLL/API/HSSE/APITestRecordService.cs index 0bb7ffd0..029aa537 100644 --- a/SGGL/BLL/API/HSSE/APITestRecordService.cs +++ b/SGGL/BLL/API/HSSE/APITestRecordService.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading.Tasks; using EmitMapper; using EmitMapper.MappingConfiguration; +using Model; namespace BLL { @@ -253,7 +254,9 @@ namespace BLL }; db.Training_TestRecordItem.InsertAllOnSubmit(getItems); - db.SubmitChanges(); + db.SubmitChanges(); + BLL.RedisHelper redis = new BLL.RedisHelper(); + redis.SetObjString(testRecordId, getItems); } } } @@ -615,33 +618,40 @@ namespace BLL /// 考试人员 public static List geTestRecordItemListByTestRecordId(string testRecordId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + BLL.RedisHelper redis = new BLL.RedisHelper(); + var getDataLists= redis.GetObjString>(testRecordId); //先从redis取数据,不存在再从数据库取 + if (getDataLists.Count==0) { - var getDataLists = (from x in db.Training_TestRecordItem - where x.TestRecordId == testRecordId - orderby x.TestType, x.TrainingItemCode - select new Model.TestRecordItemItem - { - TestRecordItemId = x.TestRecordItemId, - TestRecordId = x.TestRecordId, - TrainingItemCode = x.TrainingItemCode, - TrainingItemName = x.TrainingItemName, - Abstracts = x.Abstracts, - AttachUrl = x.AttachUrl.Replace("\\", "/") ?? "", - TestType = x.TestType, - TestTypeName = x.TestType == "1" ? "单选题" : (x.TestType == "2" ? "多选题" : "判断题"), - AItem = x.AItem ?? "", - BItem = x.BItem ?? "", - CItem = x.CItem ?? "", - DItem = x.DItem ?? "", - EItem = x.EItem ?? "", - AnswerItems = x.AnswerItems ?? "", - Score = x.Score ?? 0, - SubjectScore = x.SubjectScore ?? 0, - SelectedItem = x.SelectedItem ?? "", - }).ToList(); - return getDataLists; + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + getDataLists = (from x in db.Training_TestRecordItem + where x.TestRecordId == testRecordId + orderby x.TestType, x.TrainingItemCode + select new Model.TestRecordItemItem + { + TestRecordItemId = x.TestRecordItemId, + TestRecordId = x.TestRecordId, + TrainingItemCode = x.TrainingItemCode, + TrainingItemName = x.TrainingItemName, + Abstracts = x.Abstracts, + AttachUrl = x.AttachUrl.Replace("\\", "/") ?? "", + TestType = x.TestType, + TestTypeName = x.TestType == "1" ? "单选题" : (x.TestType == "2" ? "多选题" : "判断题"), + AItem = x.AItem ?? "", + BItem = x.BItem ?? "", + CItem = x.CItem ?? "", + DItem = x.DItem ?? "", + EItem = x.EItem ?? "", + AnswerItems = x.AnswerItems ?? "", + Score = x.Score ?? 0, + SubjectScore = x.SubjectScore ?? 0, + SelectedItem = x.SelectedItem ?? "", + }).ToList(); + } + } + + return getDataLists; } #endregion diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 133a65d1..4522a72c 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -21,6 +21,8 @@ + + true @@ -55,11 +57,14 @@ False ..\FineUIPro\FineUIPro.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\netstandard2.0\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Fleck.1.2.0\lib\net45\Fleck.dll - - ..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + + ..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll False @@ -83,12 +88,18 @@ ..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXmlFormats.dll + + ..\packages\Pipelines.Sockets.Unofficial.2.2.8\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\Quartz.3.7.0\lib\netstandard2.0\Quartz.dll ..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll + + ..\packages\StackExchange.Redis.2.7.33\lib\net461\StackExchange.Redis.dll + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -105,6 +116,14 @@ + + ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll + True + True + + + ..\packages\System.IO.Pipelines.5.0.1\lib\net461\System.IO.Pipelines.dll + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll @@ -117,6 +136,11 @@ ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll + True + True + @@ -136,6 +160,9 @@ ..\packages\System.Text.Json.7.0.2\lib\netstandard2.0\System.Text.Json.dll + + ..\packages\System.Threading.Channels.5.0.0\lib\net461\System.Threading.Channels.dll + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -255,6 +282,9 @@ + + + @@ -1044,7 +1074,15 @@ + + + + + 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 + + +