Browse Source

appConfig 不同项目区分不同的DB库

jiangjy 1 month ago
parent
commit
348f4ccd66

+ 1 - 1
FrameworkLocal/Common/DBCore/DatabaseManager.cs

@@ -19,7 +19,7 @@ namespace Aitex.Core.RT.DBCore
         FixSizeQueue<string> _sqlQueue = new FixSizeQueue<string>(1500);
         PostgresqlDB _db = new PostgresqlDB();
         DatabaseCleaner _cleaner = new DatabaseCleaner();
-        private string _dbName;
+        public string _dbName;
 
         public void Initialize(string connectionString, string dbName, string sqlFile)
         {

+ 2 - 1
Furnace/FurnaceRT/App.config

@@ -7,9 +7,10 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
   </startup>
   <connectionStrings>
-    <add name="PostgreSQL" connectionString="Server=localhost;Port=5432;User Id=postgres;Password=123456;Database=postgres;Enlist=true;Preload Reader = true;"/>
+    <add name="PostgreSQL"  connectionString="Server=localhost;Port=5432;User Id=postgres;Password=123456;Database=postgres;Enlist=true;Preload Reader = true;"/>
   </connectionStrings>
   <appSettings>
+    <add key="dbName" value="elk02_db"/>
     <add key="IsSimulationMode" value="false"/>
 
     <add key="RobotAddress" value="127.0.0.1:10110"/>

BIN
Furnace/FurnaceRT/Config/VIDs/Equipment_VIDs_20250519.xlsx


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

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

+ 3 - 3
Furnace/FurnaceRT/Instances/ToolLoader.cs

@@ -41,7 +41,7 @@ using DocumentFormat.OpenXml.Drawing.Charts;
 
 namespace FurnaceRT.Instances
 {
-    class ToolLoader : IRtLoader
+    public class ToolLoader : IRtLoader
     {
         public void Initialize()
         {
@@ -55,7 +55,7 @@ namespace FurnaceRT.Instances
 
             Singleton<DatabaseManager>.Instance.Initialize(
                 System.Configuration.ConfigurationManager.ConnectionStrings["PostgreSQL"].ConnectionString
-                , RtInstance.DatabaseName
+                , RtInstance.GetDbName()
                 , PathManager.GetCfgDir() + "DBModel.sql");
 
 
@@ -141,7 +141,7 @@ namespace FurnaceRT.Instances
 
             VIDManager2.Instance.Initialize(RtInstance.SystemName, true, true);
             //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)