From 91293cac4b05319e6ed796ce34cb0640311b553b Mon Sep 17 00:00:00 2001 From: wells.liu <wells.liu@broconcentric.com> Date: 星期日, 28 六月 2020 09:32:50 +0800 Subject: [PATCH] 命名修改 --- src/Bro.Device.GTSCard/GTSCardDriver.cs | 18 +++++++++++++++++- src/Bro.M071.Process.Model/BaseModel.cs | 2 +- src/Bro.M071.Process.Model/Migrations/Configuration.cs | 2 +- src/Bro.M071.Process.Model/Model/EventTimeRecords.cs | 2 +- src/Bro.Process.DBManager/ModelManager.cs | 2 +- src/Bro.M071.Process.Model/Model/OperationRecords.cs | 2 +- src/Bro.Process.DBManager/DataBaseContext.cs | 2 +- M071.sln | 4 ++-- src/Bro.Process.DBManager/SQLiteHelper.cs | 2 +- src/Bro.Process.DBManager/Bro.Process.DataBase.csproj | 4 ++-- src/Bro.M071.Process.DBManager/Bro.M071.DBManager.csproj | 4 ++-- src/Bro.M071.Process.DBManager/ProductionDetectionImageRecordsManager.cs | 2 +- src/Bro.M071.Process.Model/App.config | 4 ++-- src/Bro.M071.Process.Model/DBModel.cs | 4 ++-- src/Bro.M071.Process.DBManager/ProductionDetectionRecordsManager.cs | 2 +- src/Bro.M071.Process.Model/Bro.M071.Model.csproj | 0 src/Bro.M071.Process.DBManager/ProductionDetectionRecordsDetailManager.cs | 2 +- src/Bro.M071.Process.Model/Model/ManualDetectionRecords.cs | 2 +- 18 files changed, 38 insertions(+), 22 deletions(-) diff --git a/M071.sln b/M071.sln index 9dc13e4..492559e 100644 --- a/M071.sln +++ b/M071.sln @@ -21,9 +21,9 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bro.Device.GTSCard", "src\Bro.Device.GTSCard\Bro.Device.GTSCard.csproj", "{B536003E-70BA-4701-B8FD-BAFA303AB4E2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bro.M071.Process.DBManager", "src\Bro.M071.Process.DBManager\Bro.M071.Process.DBManager.csproj", "{230B0FFF-F6AF-45FE-AAF7-B4B66250DD58}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bro.M071.DBManager", "src\Bro.M071.Process.DBManager\Bro.M071.DBManager.csproj", "{230B0FFF-F6AF-45FE-AAF7-B4B66250DD58}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bro.M071.Process.Model", "src\Bro.M071.Process.Model\Bro.M071.Process.Model.csproj", "{AD645C48-5811-4B1E-B81F-D35D5E6B577F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bro.M071.Model", "src\Bro.M071.Process.Model\Bro.M071.Model.csproj", "{AD645C48-5811-4B1E-B81F-D35D5E6B577F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bro.Process.DataBase", "src\Bro.Process.DBManager\Bro.Process.DataBase.csproj", "{65302D6E-9918-4E4C-92B4-75C8830C6BA7}" EndProject diff --git a/src/Bro.Device.GTSCard/GTSCardDriver.cs b/src/Bro.Device.GTSCard/GTSCardDriver.cs index 7699c48..a51429e 100644 --- a/src/Bro.Device.GTSCard/GTSCardDriver.cs +++ b/src/Bro.Device.GTSCard/GTSCardDriver.cs @@ -1,4 +1,6 @@ 锘縰sing Bro.Common.Base; +using Bro.Common.Interface; +using Bro.Common.Model; using System; using System.Collections.Generic; using System.Linq; @@ -7,8 +9,11 @@ namespace Bro.Device.GTSCard { - public class GTSCardDriver : DeviceBase, IMotion + public class GTSCardDriver : DeviceBase,IMonitor, IMotion { + public event Action<DateTime, string, IDevice, MonitorSet> OnMonitorInvoke; + public event Action<DateTime, IDevice, WarningSet> OnMonitorAlarm; + public List<AxisInfo> GetCurrentAxisInfo(params string[] axisName) { throw new NotImplementedException(); @@ -199,6 +204,7 @@ } static object lockObj = new object(); + /// <summary> /// 璇诲彇褰撳墠鍊� @@ -233,5 +239,15 @@ else return false; //杩愯涓繑鍥瀎alse } } + + public void Monitor() + { + throw new NotImplementedException(); + } + + public void ResetAlarm() + { + throw new NotImplementedException(); + } } } diff --git a/src/Bro.M071.Process.DBManager/Bro.M071.Process.DBManager.csproj b/src/Bro.M071.Process.DBManager/Bro.M071.DBManager.csproj similarity index 98% rename from src/Bro.M071.Process.DBManager/Bro.M071.Process.DBManager.csproj rename to src/Bro.M071.Process.DBManager/Bro.M071.DBManager.csproj index d036a08..32fb634 100644 --- a/src/Bro.M071.Process.DBManager/Bro.M071.Process.DBManager.csproj +++ b/src/Bro.M071.Process.DBManager/Bro.M071.DBManager.csproj @@ -81,9 +81,9 @@ <Project>{987308DD-8BAA-463A-94E2-77D62E01A5BF}</Project> <Name>Bro.Common.Device</Name> </ProjectReference> - <ProjectReference Include="..\Bro.M071.Process.Model\Bro.M071.Process.Model.csproj"> + <ProjectReference Include="..\Bro.M071.Process.Model\Bro.M071.Model.csproj"> <Project>{AD645C48-5811-4B1E-B81F-D35D5E6B577F}</Project> - <Name>Bro.M071.Process.Model</Name> + <Name>Bro.M071.Model</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/src/Bro.M071.Process.DBManager/ProductionDetectionImageRecordsManager.cs b/src/Bro.M071.Process.DBManager/ProductionDetectionImageRecordsManager.cs index 49f5e9d..65e6fa5 100644 --- a/src/Bro.M071.Process.DBManager/ProductionDetectionImageRecordsManager.cs +++ b/src/Bro.M071.Process.DBManager/ProductionDetectionImageRecordsManager.cs @@ -14,7 +14,7 @@ //using System.Text; //using System.Threading.Tasks; -//namespace Bro.M071.Process.DBManager +//namespace Bro.M071.DBManager //{ // public class ProductionDetectionImageRecordsManager : ModelManager<ProductionDetectionImageRecords> // { diff --git a/src/Bro.M071.Process.DBManager/ProductionDetectionRecordsDetailManager.cs b/src/Bro.M071.Process.DBManager/ProductionDetectionRecordsDetailManager.cs index d12f104..bd40c8a 100644 --- a/src/Bro.M071.Process.DBManager/ProductionDetectionRecordsDetailManager.cs +++ b/src/Bro.M071.Process.DBManager/ProductionDetectionRecordsDetailManager.cs @@ -14,7 +14,7 @@ //using System.Text; //using System.Threading.Tasks; -//namespace Bro.M071.Process.DBManager +//namespace Bro.M071.DBManager //{ // public class ProductionDetectionRecordsDetailManager : ModelManager<ProductionDetectionRecordsDetail> // { diff --git a/src/Bro.M071.Process.DBManager/ProductionDetectionRecordsManager.cs b/src/Bro.M071.Process.DBManager/ProductionDetectionRecordsManager.cs index bd25939..9e2876e 100644 --- a/src/Bro.M071.Process.DBManager/ProductionDetectionRecordsManager.cs +++ b/src/Bro.M071.Process.DBManager/ProductionDetectionRecordsManager.cs @@ -12,7 +12,7 @@ //using System.Text; //using System.Threading.Tasks; -//namespace Bro.M071.Process.DBManager +//namespace Bro.M071.DBManager //{ // public class ProductionDetectionRecordsManager : ModelManager<ProductionDetectionRecords> // { diff --git a/src/Bro.M071.Process.Model/App.config b/src/Bro.M071.Process.Model/App.config index 06783b1..274ca45 100644 --- a/src/Bro.M071.Process.Model/App.config +++ b/src/Bro.M071.Process.Model/App.config @@ -14,8 +14,8 @@ </entityFramework> <connectionStrings> <!--<add name="DBSet" connectionString="data source=(LocalDb)\MSSQLLocalDB;initial catalog=Bro.Process.Model.Model;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />--> - <!--<add name="DBModel" connectionString="data source=(LocalDb)\MSSQLLocalDB;initial catalog=Bro.Process.Model.DBModel;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />--> - <add name="DBModel" connectionString="data source=D:\PROJECTS\M071\DataBase\M071.db;BinaryGUID=False" providerName="System.Data.SQLite" /> + <!--<add name="DataBase" connectionString="data source=(LocalDb)\MSSQLLocalDB;initial catalog=Bro.Process.Model.DBModel;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />--> + <add name="DataBase" connectionString="data source=D:\PROJECTS\M071\DataBase\M071.db;BinaryGUID=False" providerName="System.Data.SQLite" /> </connectionStrings> <system.data> <DbProviderFactories> diff --git a/src/Bro.M071.Process.Model/BaseModel.cs b/src/Bro.M071.Process.Model/BaseModel.cs index 8bcf90b..8fee642 100644 --- a/src/Bro.M071.Process.Model/BaseModel.cs +++ b/src/Bro.M071.Process.Model/BaseModel.cs @@ -7,7 +7,7 @@ //using System.Text; //using System.Threading.Tasks; -//namespace Bro.M071.Process.Model +//namespace Bro.M071.Model //{ // public class BaseModel // { diff --git a/src/Bro.M071.Process.Model/Bro.M071.Process.Model.csproj b/src/Bro.M071.Process.Model/Bro.M071.Model.csproj similarity index 100% rename from src/Bro.M071.Process.Model/Bro.M071.Process.Model.csproj rename to src/Bro.M071.Process.Model/Bro.M071.Model.csproj diff --git a/src/Bro.M071.Process.Model/DBModel.cs b/src/Bro.M071.Process.Model/DBModel.cs index 92ccb4a..d660664 100644 --- a/src/Bro.M071.Process.Model/DBModel.cs +++ b/src/Bro.M071.Process.Model/DBModel.cs @@ -5,7 +5,7 @@ //using System.Data.Entity.ModelConfiguration.Conventions; //using System.Linq; -//namespace Bro.M071.Process.Model +//namespace Bro.M071.Model //{ // public class DBModel : DbContext // { @@ -16,7 +16,7 @@ // //濡傛灉鎮ㄦ兂瑕侀拡瀵瑰叾浠栨暟鎹簱鍜�/鎴栨暟鎹簱鎻愪緵绋嬪簭锛岃鍦ㄥ簲鐢ㄧ▼搴忛厤缃枃浠朵腑淇敼鈥淒BModel鈥� // //杩炴帴瀛楃涓层�� // public DBModel() -// : base("name=DBModel") +// : base("name=DataBase") // { // ////鏁版嵁搴撹縼绉绘鏌ユ殏鏃舵斁鍦ㄦ瀯閫犲嚱鏁颁腑锛屽洖澶翠細鏀惧埌绋嬪簭鍒濆鍖栦腑 // //Database.SetInitializer(new MigrateDatabaseToLatestVersion<DBModel, Configuration>()); diff --git a/src/Bro.M071.Process.Model/Migrations/Configuration.cs b/src/Bro.M071.Process.Model/Migrations/Configuration.cs index 0f2bb06..7fbf72b 100644 --- a/src/Bro.M071.Process.Model/Migrations/Configuration.cs +++ b/src/Bro.M071.Process.Model/Migrations/Configuration.cs @@ -1,4 +1,4 @@ -//namespace Bro.M071.Process.Model.Migrations +//namespace Bro.M071.Model.Migrations //{ // using System; // using System.Data.Entity; diff --git a/src/Bro.M071.Process.Model/Model/EventTimeRecords.cs b/src/Bro.M071.Process.Model/Model/EventTimeRecords.cs index c5fb1bc..4592699 100644 --- a/src/Bro.M071.Process.Model/Model/EventTimeRecords.cs +++ b/src/Bro.M071.Process.Model/Model/EventTimeRecords.cs @@ -2,7 +2,7 @@ //using System; //using System.ComponentModel.DataAnnotations; -//namespace Bro.M071.Process.Model.Model +//namespace Bro.M071.Model.Model //{ // /// <summary> // /// 浜嬩欢鏃堕棿璁板綍 diff --git a/src/Bro.M071.Process.Model/Model/ManualDetectionRecords.cs b/src/Bro.M071.Process.Model/Model/ManualDetectionRecords.cs index b0f221a..2cc54a7 100644 --- a/src/Bro.M071.Process.Model/Model/ManualDetectionRecords.cs +++ b/src/Bro.M071.Process.Model/Model/ManualDetectionRecords.cs @@ -6,7 +6,7 @@ //using System.Text; //using System.Threading.Tasks; -//namespace Bro.M071.Process.Model.Model +//namespace Bro.M071.Model.Model //{ // public class ManualDetectionRecords : BaseModel, INotifyPropertyChanged // { diff --git a/src/Bro.M071.Process.Model/Model/OperationRecords.cs b/src/Bro.M071.Process.Model/Model/OperationRecords.cs index aaad5ac..ce07827 100644 --- a/src/Bro.M071.Process.Model/Model/OperationRecords.cs +++ b/src/Bro.M071.Process.Model/Model/OperationRecords.cs @@ -2,7 +2,7 @@ //using System; //using System.ComponentModel.DataAnnotations; -//namespace Bro.M071.Process.Model.Model +//namespace Bro.M071.Model.Model //{ // public class OperationRecords : BaseModel // { diff --git a/src/Bro.Process.DBManager/Bro.Process.DataBase.csproj b/src/Bro.Process.DBManager/Bro.Process.DataBase.csproj index 2988d92..1d3988a 100644 --- a/src/Bro.Process.DBManager/Bro.Process.DataBase.csproj +++ b/src/Bro.Process.DBManager/Bro.Process.DataBase.csproj @@ -82,9 +82,9 @@ <Project>{987308DD-8BAA-463A-94E2-77D62E01A5BF}</Project> <Name>Bro.Common.Device</Name> </ProjectReference> - <ProjectReference Include="..\Bro.M071.Process.Model\Bro.M071.Process.Model.csproj"> + <ProjectReference Include="..\Bro.M071.Process.Model\Bro.M071.Model.csproj"> <Project>{AD645C48-5811-4B1E-B81F-D35D5E6B577F}</Project> - <Name>Bro.M071.Process.Model</Name> + <Name>Bro.M071.Model</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/src/Bro.Process.DBManager/DataBaseContext.cs b/src/Bro.Process.DBManager/DataBaseContext.cs index 66cdc1e..ae0e8b5 100644 --- a/src/Bro.Process.DBManager/DataBaseContext.cs +++ b/src/Bro.Process.DBManager/DataBaseContext.cs @@ -16,7 +16,7 @@ // //濡傛灉鎮ㄦ兂瑕侀拡瀵瑰叾浠栨暟鎹簱鍜�/鎴栨暟鎹簱鎻愪緵绋嬪簭锛岃鍦ㄥ簲鐢ㄧ▼搴忛厤缃枃浠朵腑淇敼鈥淒BModel鈥� // //杩炴帴瀛楃涓层�� // public DBModel() -// : base("name=DBModel") +// : base("name=DataBase") // { // ////鏁版嵁搴撹縼绉绘鏌ユ殏鏃舵斁鍦ㄦ瀯閫犲嚱鏁颁腑锛屽洖澶翠細鏀惧埌绋嬪簭鍒濆鍖栦腑 // //Database.SetInitializer(new MigrateDatabaseToLatestVersion<DBModel, Configuration>()); diff --git a/src/Bro.Process.DBManager/ModelManager.cs b/src/Bro.Process.DBManager/ModelManager.cs index 20855a6..e4221df 100644 --- a/src/Bro.Process.DBManager/ModelManager.cs +++ b/src/Bro.Process.DBManager/ModelManager.cs @@ -15,7 +15,7 @@ // public class ModelManager<T> where T : BaseModel, new() // { // private PropertyInfo TableProperty = null; -// public static string ConnectionString = ConfigurationManager.ConnectionStrings["DBModel"].ConnectionString; +// public static string ConnectionString = ConfigurationManager.ConnectionStrings["DataBase"].ConnectionString; // public ModelManager() // { // T t = new T(); diff --git a/src/Bro.Process.DBManager/SQLiteHelper.cs b/src/Bro.Process.DBManager/SQLiteHelper.cs index 64e76a9..6da6230 100644 --- a/src/Bro.Process.DBManager/SQLiteHelper.cs +++ b/src/Bro.Process.DBManager/SQLiteHelper.cs @@ -12,7 +12,7 @@ public class SQLiteHelper { //数据库连接字符串 - public static string connectionString = ConfigurationManager.ConnectionStrings["DBModel"].ConnectionString; + public static string connectionString = ConfigurationManager.ConnectionStrings["DataBase"].ConnectionString; public SQLiteHelper() { } -- Gitblit v1.8.0