From 0f71990dc60af6e96c9f4c2f2095ca6711e2c870 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期一, 06 七月 2020 11:29:37 +0800
Subject: [PATCH] merge
---
src/Bro.M071.Process.Model/DBModel.cs | 108 +++++++++++++++++++++++------------------------------
1 files changed, 47 insertions(+), 61 deletions(-)
diff --git a/src/Bro.M071.Process.Model/DBModel.cs b/src/Bro.M071.Process.Model/DBModel.cs
index d660664..bdf5f07 100644
--- a/src/Bro.M071.Process.Model/DBModel.cs
+++ b/src/Bro.M071.Process.Model/DBModel.cs
@@ -1,67 +1,53 @@
-锘�//using Bro.Process.Model.Migrations;
-//using Bro.Process.Model.Model;
-//using System;
-//using System.Data.Entity;
-//using System.Data.Entity.ModelConfiguration.Conventions;
-//using System.Linq;
+锘縰sing Bro.M071.Model.Migrations;
+using Bro.M071.Model.Model;
+using System.Data.Entity;
+using System.Data.Entity.ModelConfiguration.Conventions;
-//namespace Bro.M071.Model
-//{
-// public class DBModel : DbContext
-// {
-// //鎮ㄧ殑涓婁笅鏂囧凡閰嶇疆涓轰粠鎮ㄧ殑搴旂敤绋嬪簭鐨勯厤缃枃浠�(App.config 鎴� Web.config)
-// //浣跨敤鈥淒BModel鈥濊繛鎺ュ瓧绗︿覆銆傞粯璁ゆ儏鍐典笅锛屾杩炴帴瀛楃涓查拡瀵规偍鐨� LocalDb 瀹炰緥涓婄殑
-// //鈥淏ro.Process.Model.DBModel鈥濇暟鎹簱銆�
-// //
-// //濡傛灉鎮ㄦ兂瑕侀拡瀵瑰叾浠栨暟鎹簱鍜�/鎴栨暟鎹簱鎻愪緵绋嬪簭锛岃鍦ㄥ簲鐢ㄧ▼搴忛厤缃枃浠朵腑淇敼鈥淒BModel鈥�
-// //杩炴帴瀛楃涓层��
-// public DBModel()
-// : base("name=DataBase")
-// {
-// ////鏁版嵁搴撹縼绉绘鏌ユ殏鏃舵斁鍦ㄦ瀯閫犲嚱鏁颁腑锛屽洖澶翠細鏀惧埌绋嬪簭鍒濆鍖栦腑
-// //Database.SetInitializer(new MigrateDatabaseToLatestVersion<DBModel, Configuration>());
-// }
+namespace Bro.M071.Model
+{
+ public class DBModel : DbContext
+ {
+ //鎮ㄧ殑涓婁笅鏂囧凡閰嶇疆涓轰粠鎮ㄧ殑搴旂敤绋嬪簭鐨勯厤缃枃浠�(App.config 鎴� Web.config)
+ //浣跨敤鈥淒BModel鈥濊繛鎺ュ瓧绗︿覆銆傞粯璁ゆ儏鍐典笅锛屾杩炴帴瀛楃涓查拡瀵规偍鐨� LocalDb 瀹炰緥涓婄殑
+ //鈥淏ro.Process.Model.DBModel鈥濇暟鎹簱銆�
+ //
+ //濡傛灉鎮ㄦ兂瑕侀拡瀵瑰叾浠栨暟鎹簱鍜�/鎴栨暟鎹簱鎻愪緵绋嬪簭锛岃鍦ㄥ簲鐢ㄧ▼搴忛厤缃枃浠朵腑淇敼鈥淒BModel鈥�
+ //杩炴帴瀛楃涓层��
+ public DBModel()
+ : base("name=DataBase")
+ {
+ ////鏁版嵁搴撹縼绉绘鏌ユ殏鏃舵斁鍦ㄦ瀯閫犲嚱鏁颁腑锛屽洖澶翠細鏀惧埌绋嬪簭鍒濆鍖栦腑
+ //Database.SetInitializer(new MigrateDatabaseToLatestVersion<DBModel, Configuration>());
+ }
-// //涓烘偍瑕佸湪妯″瀷涓寘鍚殑姣忕瀹炰綋绫诲瀷閮芥坊鍔� DbSet銆傛湁鍏抽厤缃拰浣跨敤 Code First 妯″瀷
-// //鐨勮缁嗕俊鎭紝璇峰弬闃� http://go.microsoft.com/fwlink/?LinkId=390109銆�
-
-// // public virtual DbSet<MyEntity> MyEntities { get; set; }
-// //public virtual DbSet<PRODUCTION_SECRETKEY> PRODUCTION_SECRETKEY { get; set; }
-// //public virtual DbSet<PRODUCTION_CONFIG> PRODUCTION_CONFIG { get; set; }
+ //涓烘偍瑕佸湪妯″瀷涓寘鍚殑姣忕瀹炰綋绫诲瀷閮芥坊鍔� DbSet銆傛湁鍏抽厤缃拰浣跨敤 Code First 妯″瀷
+ //鐨勮缁嗕俊鎭紝璇峰弬闃� http://go.microsoft.com/fwlink/?LinkId=390109銆�
-// public virtual DbSet<ProductionDetectionRecords> ProductionDetectionRecords { get; set; }
-// public virtual DbSet<ProductionDetectionRecordsDetail> ProductionDetectionRecordsDetail { get; set; }
-// public virtual DbSet<OperationRecords> OperationRecords { get; set; }
-// public virtual DbSet<ProductionDetectionImageRecords> ProductionDetectionImageRecords { get; set; }
-// public virtual DbSet<ManualDetectionRecords> ManualDetectionRecords { get; set; }
-// public virtual DbSet<EventTimeRecords> EventTimeRecords { get; set; }
+ public virtual DbSet<KeyUnitData> KeyUnitData { get; set; }
+ public virtual DbSet<MeasurementAndKeyDataRelation> MeasurementAndKeyDataRelation { get; set; }
+ public virtual DbSet<MeasurementUnitResult> MeasurementUnitResult { get; set; }
+ public virtual DbSet<ProductionMeasurementRecords> ProductionMeasurementRecords { get; set; }
-// protected override void OnModelCreating(DbModelBuilder modelBuilder)
-// {
-// //base.OnModelCreating(modelBuilder);
+ protected override void OnModelCreating(DbModelBuilder modelBuilder)
+ {
+ //base.OnModelCreating(modelBuilder);
+ #region for sqlite db
+ modelBuilder.Conventions.Remove<PluralizingTableNameConvention>();
+ modelBuilder.Configurations.AddFromAssembly(typeof(DBModel).Assembly);
+ #endregion
+ }
+ }
-// #region for sqlite db
-// modelBuilder.Conventions.Remove<PluralizingTableNameConvention>();
-// modelBuilder.Configurations.AddFromAssembly(typeof(DBModel).Assembly);
-// #endregion
-// }
-// }
-
-// public static class DatabaseInitialize
-// {
-// public static void Initialize()
-// {
-// Database.SetInitializer(new MigrateDatabaseToLatestVersion<DBModel, Configuration>());
-// using (DbContext dbContext = new DBModel())
-// {
-// dbContext.Database.Initialize(true);
-// }
-// }
-// }
-// //public class MyEntity
-// //{
-// // public int Id { get; set; }
-// // public string Name { get; set; }
-// //}
-//}
\ No newline at end of file
+ public static class DatabaseInitialize
+ {
+ public static void Initialize()
+ {
+ Database.SetInitializer(new MigrateDatabaseToLatestVersion<DBModel, Configuration>());
+ using (DbContext dbContext = new DBModel())
+ {
+ dbContext.Database.Initialize(true);
+ }
+ }
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0