Bug 修改

Common/Cdy.Tag/His/CompressUnitManager2.cs

@@ -126,6 +126,7 @@ namespace Cdy.Tag
         /// </summary>
         public void Init()
         {
+            mCompressUnit.Clear();
             string cfgpath = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(this.GetType().Assembly.Location), "Config", "Compress.cfg");
             if (System.IO.File.Exists(cfgpath))
             {

Common/Cdy.Tag/His/DataFileSeriserManager.cs

@@ -71,6 +71,7 @@ namespace Cdy.Tag
         /// </summary>
         public void Init()
         {
+            mDataFiles.Clear();
             string cfgpath = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(this.GetType().Assembly.Location), "Config", "DataFileSerise.cfg");
             if (System.IO.File.Exists(cfgpath))
             {

RunTime/DBInRun/Properties/launchSettings.json

@@ -2,8 +2,7 @@
   "profiles": {
     "DBInRun": {
       "commandName": "Executable",
-      "executablePath": "C:\\Users\\chongdaoyang\\source\\repos\\mars\\Output\\DBInRun.exe",
-      "commandLineArgs": "start test1 37000"
+      "executablePath": "C:\\Users\\cdy81\\source\\repos\\mars\\Output\\DBInRun.exe"
     }
   }
 }
\ No newline at end of file

RunTime/DBRuntime/His/Compress/CompressEnginer2.cs

@@ -84,6 +84,8 @@ namespace Cdy.Tag
         /// </summary>
         public void Init()
         {
+            CompressUnitManager2.Manager.Init();
+
             mHisTagService = ServiceLocator.Locator.Resolve<IHisEngine2>();
             CompressMemory2.TagCountPerMemory = TagCountOneFile;
 

RunTime/DBRuntime/His/LogManager2.cs

@@ -66,6 +66,8 @@ namespace Cdy.Tag
 
         #region ... Properties ...
 
+        public IHisEngine2 Parent { get; set; }
+
         /// <summary>
         /// 文件时长
         /// </summary>
@@ -100,7 +102,7 @@ namespace Cdy.Tag
         /// </summary>
         public void InitHeadData()
         {
-            HisDataMemoryBlockCollection mtags = ServiceLocator.Locator.Resolve<IHisEngine2>().CurrentMemory;
+            HisDataMemoryBlockCollection mtags = Parent.CurrentMemory;
 
             if (memory != null)
             {

RunTime/DBRuntime/His/SeriseEnginer2.cs

@@ -164,7 +164,7 @@ namespace Cdy.Tag
         public void Init()
         {
             DataFileSeriserManager.manager.Init();
-            CompressUnitManager2.Manager.Init();
+          
 
             var his = ServiceLocator.Locator.Resolve<IHisEngine2>();
             var histag = his.ListAllTags().OrderBy(e => e.Id);

RunTime/DBRuntime/Runner.cs

@@ -270,15 +270,22 @@ namespace Cdy.Tag
                 var task = mHisFileManager.Int();
                 realEnginer = new RealEnginer(mRealDatabase);
                 realEnginer.Init();
+                ServiceLocator.Locator.Registor<IRealData>(realEnginer);
+                ServiceLocator.Locator.Registor<IRealDataNotify>(realEnginer);
+                ServiceLocator.Locator.Registor<IRealDataNotifyForProducter>(realEnginer);
+                ServiceLocator.Locator.Registor<IRealTagConsumer>(realEnginer);
+                ServiceLocator.Locator.Registor<IRealTagProduct>(realEnginer);
 
                 hisEnginer = new HisEnginer2(mHisDatabase, realEnginer);
                 hisEnginer.MergeMemoryTime = mHisDatabase.Setting.DataBlockDuration * 60;
-                hisEnginer.LogManager = new LogManager2() { Database = mDatabaseName };
+                hisEnginer.LogManager = new LogManager2() { Database = mDatabaseName,Parent=hisEnginer };
                 hisEnginer.Init();
+                ServiceLocator.Locator.Registor<IHisEngine2>(hisEnginer);
 
                 compressEnginer = new CompressEnginer2();
                 compressEnginer.TagCountOneFile = mHisDatabase.Setting.TagCountOneFile;
                 compressEnginer.Init();
+                ServiceLocator.Locator.Registor<IDataCompress2>(compressEnginer);
 
                 seriseEnginer = new SeriseEnginer2() { DatabaseName = database };
                 seriseEnginer.FileDuration = mHisDatabase.Setting.FileDataDuration;
@@ -286,6 +293,7 @@ namespace Cdy.Tag
                 seriseEnginer.TagCountOneFile = mHisDatabase.Setting.TagCountOneFile;
                 seriseEnginer.DataSeriser = mHisDatabase.Setting.DataSeriser;
                 seriseEnginer.Init();
+                ServiceLocator.Locator.Registor<IDataSerialize2>(seriseEnginer);
 
                 querySerivce = new QuerySerivce(this.mDatabaseName);
 
@@ -315,16 +323,7 @@ namespace Cdy.Tag
         /// </summary>
         private void RegistorInterface()
         {
-            ServiceLocator.Locator.Registor<IRealData>(realEnginer);
-            ServiceLocator.Locator.Registor<IRealDataNotify>(realEnginer);
-            ServiceLocator.Locator.Registor<IRealDataNotifyForProducter>(realEnginer);
-            ServiceLocator.Locator.Registor<IRealTagConsumer>(realEnginer);
-            ServiceLocator.Locator.Registor<IRealTagProduct>(realEnginer);
-
-            ServiceLocator.Locator.Registor<IHisEngine2>(hisEnginer);
-            ServiceLocator.Locator.Registor<IDataCompress2>(compressEnginer);
-            ServiceLocator.Locator.Registor<IDataSerialize2>(seriseEnginer);
-
+           
             ServiceLocator.Locator.Registor<IHisQuery>(querySerivce);
 
             ServiceLocator.Locator.Registor<ITagManager>(mRealDatabase);