Browse Source

elk01 添加dbName配置项

jiangjy 1 day ago
parent
commit
410be7c043

+ 1 - 1
Furnace/FurnaceRT/App.config

@@ -11,7 +11,7 @@
   </connectionStrings>
   </connectionStrings>
   <appSettings>
   <appSettings>
     <add key="IsSimulationMode" value="false" />
     <add key="IsSimulationMode" value="false" />
-
+	  <add key="dbName" value="elk01_db"/>
     <add key="RobotAddress" value="127.0.0.1:10110" />
     <add key="RobotAddress" value="127.0.0.1:10110" />
     <add key="AlignerAddress" value="127.0.0.1:10111" />
     <add key="AlignerAddress" value="127.0.0.1:10111" />
     <add key="WIDReaderAddress" value="127.0.0.1:23" />
     <add key="WIDReaderAddress" value="127.0.0.1:23" />

+ 14 - 5
Furnace/FurnaceRT/Instances/RtInstance.cs

@@ -10,10 +10,10 @@ namespace SorterRT.Modules
     class RtInstance : IRtInstance
     class RtInstance : IRtInstance
     {
     {
         string IRtInstance.SystemName => SystemName;
         string IRtInstance.SystemName => SystemName;
- 
+
         public bool EnableNotifyIcon => true;
         public bool EnableNotifyIcon => true;
 
 
- 
+
         public bool KeepRunningAfterUnknownException => false;
         public bool KeepRunningAfterUnknownException => false;
 
 
         public ImageSource TrayIcon => _trayIcon;
         public ImageSource TrayIcon => _trayIcon;
@@ -22,13 +22,12 @@ namespace SorterRT.Modules
 
 
         public IRtLoader Loader => _loader;
         public IRtLoader Loader => _loader;
 
 
-        string IRtInstance.DatabaseName => DatabaseName;
+        string IRtInstance.DatabaseName => GetDbName();
 
 
         public const string SystemName = "Furnace";
         public const string SystemName = "Furnace";
 
 
-        public const string DatabaseName = "thermaldb";
 
 
- 
+
         public const string DeviceModelFileName = "DeviceModelFurnace.xml";
         public const string DeviceModelFileName = "DeviceModelFurnace.xml";
 
 
         private ImageSource _trayIcon;
         private ImageSource _trayIcon;
@@ -40,5 +39,15 @@ namespace SorterRT.Modules
             _loader = new ToolLoader();
             _loader = new ToolLoader();
 
 
         }
         }
+        public static string GetDbName()
+        {
+            var appDbName = System.Configuration.ConfigurationManager.AppSettings["dbName"];
+            if (!string.IsNullOrEmpty(appDbName))
+            {
+                return appDbName.ToLower();
+            }
+            return "thermaldb";
+
+        }
     }
     }
 }
 }

+ 4 - 7
Furnace/FurnaceRT/Instances/ToolLoader.cs

@@ -52,12 +52,9 @@ namespace FurnaceRT.Instances
 
 
             Singleton<ConfigManager>.Instance.Initialize();
             Singleton<ConfigManager>.Instance.Initialize();
 
 
-            Singleton<DatabaseManager>.Instance.Initialize(
-                System.Configuration.ConfigurationManager.ConnectionStrings["PostgreSQL"].ConnectionString
-                , RtInstance.DatabaseName
-                , PathManager.GetCfgDir() + "DBModel.sql");
+            Singleton<DatabaseManager>.Instance.Initialize(System.Configuration.ConfigurationManager.ConnectionStrings["PostgreSQL"].ConnectionString, RtInstance.GetDbName(), PathManager.GetCfgDir() + "DBModel.sql");
+
 
 
-          
             Singleton<OperationManager>.Instance.Initialize();
             Singleton<OperationManager>.Instance.Initialize();
 
 
             Singleton<DataManager>.Instance.Initialize();
             Singleton<DataManager>.Instance.Initialize();
@@ -127,9 +124,9 @@ namespace FurnaceRT.Instances
 
 
             Singleton<EventManager>.Instance.FireEvent += InstanceOnEvent;
             Singleton<EventManager>.Instance.FireEvent += InstanceOnEvent;
 
 
-           //VIDManager2.Instance.Initialize(RtInstance.SystemName, true, true);
+            //VIDManager2.Instance.Initialize(RtInstance.SystemName, true, true);
             //Singleton<EventManager>.Instance.Serialize();
             //Singleton<EventManager>.Instance.Serialize();
-            DataCollectionManager.Instance.Initialize(new string[] { "System", "PM1" }, RtInstance.DatabaseName);
+            DataCollectionManager.Instance.Initialize(new string[] { "System", "PM1" }, RtInstance.GetDbName());
         }
         }
 
 
         private void InstanceOnEvent(EventItem obj)
         private void InstanceOnEvent(EventItem obj)