Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

xcd

2020-06-28 dcc8995c3fa58135ec766f590b8079f4f003682d

Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

 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

 src/Bro.Device.GTSCard/GTSCardDriver.cs

@@ -1,4 +1,6 @@
using 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;              //运行中返回false
            }
        }

        public void Monitor()
        {
            throw new NotImplementedException();
        }

        public void ResetAlarm()
        {
            throw new NotImplementedException();
        }
    }
}

 src/Bro.M071.Process.DBManager/Bro.M071.DBManager.csproj

File was renamed from src/Bro.M071.Process.DBManager/Bro.M071.Process.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>

 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>
//    {

 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>
//    {

 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>
//    {

 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>

 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
//    {

 src/Bro.M071.Process.Model/Bro.M071.Model.csproj

 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 @@
//        //如果您想要针对其他数据库和/或数据库提供程序，请在应用程序配置文件中修改“DBModel”
//        //连接字符串。
//        public DBModel()
//            : base("name=DBModel")
//            : base("name=DataBase")
//        {
//            ////数据库迁移检查暂时放在构造函数中，回头会放到程序初始化中
//            //Database.SetInitializer(new MigrateDatabaseToLatestVersion<DBModel, Configuration>());

 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;

 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>
//    /// 事件时间记录

 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
//    {

 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
//    {

 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>

 src/Bro.Process.DBManager/DataBaseContext.cs

@@ -16,7 +16,7 @@
//        //如果您想要针对其他数据库和/或数据库提供程序，请在应用程序配置文件中修改“DBModel”
//        //连接字符串。
//        public DBModel()
//            : base("name=DBModel")
//            : base("name=DataBase")
//        {
//            ////数据库迁移检查暂时放在构造函数中，回头会放到程序初始化中
//            //Database.SetInitializer(new MigrateDatabaseToLatestVersion<DBModel, Configuration>());

 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();

 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() { }