From 93370f87a441e83c01ae615cd03975113313684b Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 10 9月 2024 09:25:40 +0800
Subject: [PATCH] 增加
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs | 72 ++++++++++++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/sys_log_ex.cs | 37 +++++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/sys_log_op.cs | 55 +++++++++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/sys_log_vis.cs | 39 +++++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/iWare_SCADA_Model.csproj | 6 +
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/sys_log_audit.cs | 32 ++++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/test/Model199.cs | 21 ++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/DbModel.cs | 5 +
8 files changed, 266 insertions(+), 1 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
index 4bbc8c8..61666c7 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
@@ -298,6 +298,78 @@
OP2002B = 521,
OP2002C = 522,
+ //鏂板NOOK 銆怑ditby shaocx,2024-09-09銆�
+ /// <summary>
+ /// OP1004
+ /// </summary>
+ OP1004 = 530,
+
+ /// <summary>
+ /// OP2003
+ /// </summary>
+ OP2003 = 531,
+
+ /// <summary>
+ /// OP3003
+ /// </summary>
+ OP3003 = 532,
+
+ /// <summary>
+ /// OP3503
+ /// </summary>
+ OP3503 = 533,
+
+ /// <summary>
+ /// OP6003A
+ /// </summary>
+ OP6003A = 534,
+
+ /// <summary>
+ /// OP6003B
+ /// </summary>
+ OP6003B = 535,
+
+ /// <summary>
+ /// OP6003C
+ /// </summary>
+ OP6003C = 536,
+
+ /// <summary>
+ /// OP6003D
+ /// </summary>
+ OP6003D = 537,
+
+ //SPC
+ /// <summary>
+ /// OP2004
+ /// </summary>
+ OP2004 = 538,
+
+ /// <summary>
+ /// OP3004
+ /// </summary>
+ OP3004 = 539,
+
+ /// <summary>
+ /// OP3504
+ /// </summary>
+ OP3504 = 540,
+
+ /// <summary>
+ /// OP5004A
+ /// </summary>
+ OP5004A = 541,
+
+ /// <summary>
+ /// OP5004B
+ /// </summary>
+ OP5004B = 542,
+
+ /// <summary>
+ /// OP6004
+ /// </summary>
+ OP6004 = 543,
+
}
public enum WorkingProcedureForHMI
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/DbModel.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/DbModel.cs
index 419bd7f..30468f5 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/DbModel.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/DbModel.cs
@@ -1,4 +1,5 @@
using iWare_SCADA_Model.TableModel;
+using iWare_SCADA_Model.test;
using System.Data.Entity;
namespace iWare_SCADA_Model
@@ -10,6 +11,10 @@
{
}
+ public virtual DbSet<sys_log_audit> sys_log_audit { get; set; }
+ public virtual DbSet<sys_log_ex> sys_log_ex { get; set; }
+ public virtual DbSet<sys_log_op> sys_log_op { get; set; }
+ public virtual DbSet<sys_log_vis> sys_log_vis { get; set; }
public virtual DbSet<AccessInterfaceLogForRequest> AccessInterfaceLogForRequest { get; set; }
public virtual DbSet<DataCaptureColumnConfig> DataCaptureColumnConfig { get; set; }
public virtual DbSet<DataCaptureConfig> DataCaptureConfig { get; set; }
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/sys_log_audit.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/sys_log_audit.cs
new file mode 100644
index 0000000..87353d6
--- /dev/null
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/sys_log_audit.cs
@@ -0,0 +1,32 @@
+namespace iWare_SCADA_Model
+{
+ using System;
+ using System.Collections.Generic;
+ using System.ComponentModel.DataAnnotations;
+ using System.ComponentModel.DataAnnotations.Schema;
+ using System.Data.Entity.Spatial;
+
+ public partial class sys_log_audit
+ {
+ public int Id { get; set; }
+
+ [StringLength(50)]
+ public string TableName { get; set; }
+
+ [StringLength(50)]
+ public string ColumnName { get; set; }
+
+ public string NewValue { get; set; }
+
+ public string OldValue { get; set; }
+
+ public DateTimeOffset? CreatedTime { get; set; }
+
+ public long UserId { get; set; }
+
+ [StringLength(50)]
+ public string UserName { get; set; }
+
+ public int Operate { get; set; }
+ }
+}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/sys_log_ex.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/sys_log_ex.cs
new file mode 100644
index 0000000..7cd52d5
--- /dev/null
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/sys_log_ex.cs
@@ -0,0 +1,37 @@
+namespace iWare_SCADA_Model
+{
+ using System;
+ using System.Collections.Generic;
+ using System.ComponentModel.DataAnnotations;
+ using System.ComponentModel.DataAnnotations.Schema;
+ using System.Data.Entity.Spatial;
+
+ public partial class sys_log_ex
+ {
+ public int Id { get; set; }
+
+ [StringLength(50)]
+ public string Account { get; set; }
+
+ [StringLength(100)]
+ public string Name { get; set; }
+
+ [StringLength(100)]
+ public string ClassName { get; set; }
+
+ [StringLength(100)]
+ public string MethodName { get; set; }
+
+ public string ExceptionName { get; set; }
+
+ public string ExceptionMsg { get; set; }
+
+ public string ExceptionSource { get; set; }
+
+ public string StackTrace { get; set; }
+
+ public string ParamsObj { get; set; }
+
+ public DateTimeOffset? ExceptionTime { get; set; }
+ }
+}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/sys_log_op.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/sys_log_op.cs
new file mode 100644
index 0000000..fbd170f
--- /dev/null
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/sys_log_op.cs
@@ -0,0 +1,55 @@
+namespace iWare_SCADA_Model
+{
+ using System;
+ using System.Collections.Generic;
+ using System.ComponentModel.DataAnnotations;
+ using System.ComponentModel.DataAnnotations.Schema;
+ using System.Data.Entity.Spatial;
+
+ public partial class sys_log_op
+ {
+ public int Id { get; set; }
+
+ [StringLength(100)]
+ public string Name { get; set; }
+
+ public int Success { get; set; }
+
+ public string Message { get; set; }
+
+ [StringLength(20)]
+ public string Ip { get; set; }
+
+ [StringLength(1024)]
+ public string Location { get; set; }
+
+ [StringLength(100)]
+ public string Browser { get; set; }
+
+ [StringLength(100)]
+ public string Os { get; set; }
+
+ [StringLength(100)]
+ public string Url { get; set; }
+
+ [StringLength(100)]
+ public string ClassName { get; set; }
+
+ [StringLength(100)]
+ public string MethodName { get; set; }
+
+ [StringLength(10)]
+ public string ReqMethod { get; set; }
+
+ public string Param { get; set; }
+
+ public string Result { get; set; }
+
+ public long ElapsedTime { get; set; }
+
+ public DateTimeOffset? OpTime { get; set; }
+
+ [StringLength(50)]
+ public string Account { get; set; }
+ }
+}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/sys_log_vis.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/sys_log_vis.cs
new file mode 100644
index 0000000..2328e80
--- /dev/null
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/sys_log_vis.cs
@@ -0,0 +1,39 @@
+namespace iWare_SCADA_Model
+{
+ using System;
+ using System.Collections.Generic;
+ using System.ComponentModel.DataAnnotations;
+ using System.ComponentModel.DataAnnotations.Schema;
+ using System.Data.Entity.Spatial;
+
+ public partial class sys_log_vis
+ {
+ public int Id { get; set; }
+
+ [StringLength(100)]
+ public string Name { get; set; }
+
+ public int Success { get; set; }
+
+ public string Message { get; set; }
+
+ [StringLength(20)]
+ public string Ip { get; set; }
+
+ [StringLength(1024)]
+ public string Location { get; set; }
+
+ [StringLength(100)]
+ public string Browser { get; set; }
+
+ [StringLength(100)]
+ public string Os { get; set; }
+
+ public int VisType { get; set; }
+
+ public DateTimeOffset? VisTime { get; set; }
+
+ [StringLength(50)]
+ public string Account { get; set; }
+ }
+}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/iWare_SCADA_Model.csproj b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/iWare_SCADA_Model.csproj
index 156303a..1619265 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/iWare_SCADA_Model.csproj
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/iWare_SCADA_Model.csproj
@@ -100,6 +100,11 @@
<Compile Include="TableModel\WorkPieceProcess.cs" />
<Compile Include="TableModel\ThreadStatusMonitor.cs" />
<Compile Include="TableModel\AccessInterfaceLogForRequest.cs" />
+ <Compile Include="test\Model199.cs" />
+ <Compile Include="TableModel\sys_log_audit.cs" />
+ <Compile Include="TableModel\sys_log_ex.cs" />
+ <Compile Include="TableModel\sys_log_op.cs" />
+ <Compile Include="TableModel\sys_log_vis.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.Config" />
@@ -110,7 +115,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="GatewayTableTable\" />
- <Folder Include="test\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/test/Model199.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/test/Model199.cs
new file mode 100644
index 0000000..551cd30
--- /dev/null
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/test/Model199.cs
@@ -0,0 +1,21 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Data.Entity;
+using System.Linq;
+
+namespace iWare_SCADA_Model.test
+{
+ public partial class Model199 : DbContext
+ {
+ public Model199()
+ : base("name=Model199")
+ {
+ }
+
+
+
+ protected override void OnModelCreating(DbModelBuilder modelBuilder)
+ {
+ }
+ }
+}
--
Gitblit v1.9.3