文档截图，增加服务器实时数据端口配置功能

Common/Cdy.Tag/DatabaseSerise.cs

@@ -133,7 +133,12 @@ namespace Cdy.Tag
         /// <returns></returns>
         private SettingDoc LoadSetting(XElement xe)
         {
-            return null;
+            SettingDoc doc = new SettingDoc();
+            if (xe.Attribute("RealDataServerPort") != null)
+            {
+                doc.RealDataServerPort = int.Parse(xe.Attribute("RealDataServerPort").Value);
+            }
+            return doc;
         }
 
         /// <summary>
@@ -144,6 +149,7 @@ namespace Cdy.Tag
         private XElement Save(SettingDoc doc)
         {
             XElement xe = new XElement("Setting");
+            xe.SetAttributeValue("RealDataServerPort", doc.RealDataServerPort);
             return xe;
         }
 

Common/Cdy.Tag/SettingDoc.cs

@@ -33,6 +33,11 @@ namespace Cdy.Tag
 
         #region ... Properties ...
 
+        /// <summary>
+        /// 
+        /// </summary>
+        public int RealDataServerPort { get; set; } = 14330;
+
         #endregion ...Properties...
 
         #region ... Methods    ...

Develop/DBDevelopClientApi/developService.proto

@@ -187,8 +187,44 @@ service DevelopServer {
 
    rpc IsDatabaseRunning(DatabasesRequest) returns (BoolResultReplay);
 
+   //
+   rpc GetRealDataServerPort(DatabasesRequest) returns (IntResultReplay);
+
+   //
+   rpc SetRealDataServerPort(SetRealDataServerPortRequest) returns  (BoolResultReplay);
+
+   //
+   rpc GetDriverSetting(GetDriverSettingRequest) returns (GetDriverSettingReplay);
+
+   //
+   rpc UpdateDrvierSetting(UpdateDrvierSettingRequest) returns  (BoolResultReplay);
+
+}
+
+//
+message GetDriverSettingRequest
+{
+    string LoginId=1;
+    string Driver=2;
 }
 
+//
+message GetDriverSettingReplay
+{
+    bool Result =1;
+    string ErroMessage=2;
+    string Drivers=3;
+    string SettingString=4;
+}
+
+message UpdateDrvierSettingRequest
+{
+ string LoginId=1;
+ string Driver=2;
+ string SettingString=4;
+}
+
+
 //获取驱动列表返回消息
 message GetRegisteDriversReplay
 {
@@ -575,6 +611,13 @@ message GetTagByGroupRequest
     repeated FilterMessageItem Filters=5;
 }
 
+message SetRealDataServerPortRequest
+{
+    string LoginId=1;
+    int32 Port=2;
+    string Database=3;
+}
+
 message FilterMessageItem
 {
     string key=1;
@@ -589,6 +632,12 @@ message BoolResultReplay
 }
 
 
+message IntResultReplay
+{
+    bool Result =1;
+    int32 value=2;
+    string ErroMessage=3;
+}
 
 //获取变量配置
 message GetTagMessageReply

Develop/DBDevelopService/Protos/developService.proto

@@ -187,8 +187,44 @@ service DevelopServer {
 
    rpc IsDatabaseRunning(DatabasesRequest) returns (BoolResultReplay);
 
+   //
+   rpc GetRealDataServerPort(DatabasesRequest) returns (IntResultReplay);
+
+   //
+   rpc SetRealDataServerPort(SetRealDataServerPortRequest) returns  (BoolResultReplay);
+
+   //
+   rpc GetDriverSetting(GetDriverSettingRequest) returns (GetDriverSettingReplay);
+
+   //
+   rpc UpdateDrvierSetting(UpdateDrvierSettingRequest) returns  (BoolResultReplay);
+
+}
+
+//
+message GetDriverSettingRequest
+{
+    string LoginId=1;
+    string Driver=2;
 }
 
+//
+message GetDriverSettingReplay
+{
+    bool Result =1;
+    string ErroMessage=2;
+    string Drivers=3;
+    string SettingString=4;
+}
+
+message UpdateDrvierSettingRequest
+{
+ string LoginId=1;
+ string Driver=2;
+ string SettingString=4;
+}
+
+
 //获取驱动列表返回消息
 message GetRegisteDriversReplay
 {
@@ -575,6 +611,13 @@ message GetTagByGroupRequest
     repeated FilterMessageItem Filters=5;
 }
 
+message SetRealDataServerPortRequest
+{
+    string LoginId=1;
+    int32 Port=2;
+    string Database=3;
+}
+
 message FilterMessageItem
 {
     string key=1;
@@ -589,6 +632,12 @@ message BoolResultReplay
 }
 
 
+message IntResultReplay
+{
+    bool Result =1;
+    int32 value=2;
+    string ErroMessage=3;
+}
 
 //获取变量配置
 message GetTagMessageReply

Develop/DBDevelopService/Services/DevelopServerService.cs

@@ -1929,6 +1929,47 @@ namespace DBDevelopService
             return Task.FromResult(new BoolResultReplay() { Result = true });
         }
 
-        
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public override Task<BoolResultReplay> SetRealDataServerPort(SetRealDataServerPortRequest request, ServerCallContext context)
+        {
+            if (!CheckLoginId(request.LoginId, request.Database))
+            {
+                return Task.FromResult(new BoolResultReplay() { Result = false });
+            }
+            var db = DbManager.Instance.GetDatabase(request.Database);
+            if(db!=null)
+            {
+                db.Setting.RealDataServerPort = request.Port;
+                return Task.FromResult(new BoolResultReplay() { Result = true });
+            }
+            return Task.FromResult(new BoolResultReplay() { Result = false });
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public override Task<IntResultReplay> GetRealDataServerPort(DatabasesRequest request, ServerCallContext context)
+        {
+            if (!CheckLoginId(request.LoginId, request.Database))
+            {
+                return Task.FromResult(new IntResultReplay() { Result = false });
+            }
+            var db = DbManager.Instance.GetDatabase(request.Database);
+            if (db != null)
+            {
+                return Task.FromResult(new IntResultReplay() { Result = true,Value= db.Setting.RealDataServerPort });
+            }
+            return Task.FromResult(new IntResultReplay() { Result = false });
+        }
+
     }
 }

RunTime/DBRuntime/His/SeriseEnginer2.cs

@@ -163,7 +163,7 @@ namespace Cdy.Tag
         /// </summary>
         public void Init()
         {
-            DataFileSeriserManager.manager.Init();
+            
           
 
             var his = ServiceLocator.Locator.Resolve<IHisEngine2>();

RunTime/DBRuntime/Runner.cs

@@ -166,6 +166,9 @@ namespace Cdy.Tag
 
             //注册线性转换器
             ValueConvertManager.manager.Registor(new LinerConvert());
+
+            DataFileSeriserManager.manager.Init();
+            CPUAssignHelper.Helper.Init();
         }
 
         /// <summary>
@@ -276,8 +279,6 @@ namespace Cdy.Tag
             }
             InitPath();
 
-            CPUAssignHelper.Helper.Init();
-
             if (CheckDatabaseExist(mDatabaseName))
             {
                 LoadDatabase();
@@ -371,7 +372,7 @@ namespace Cdy.Tag
         /// 启动
         /// </summary>
         /// <param name="database"></param>
-        public async void StartAsync(string database,int port = 14330)
+        public async void StartAsync(string database,int port = -1)
         {
             LoggerService.Service.EnableLogger = true;
             LoggerService.Service.Info("Runner", " 数据库 " + database+" 开始启动");
@@ -385,7 +386,14 @@ namespace Cdy.Tag
             {
                 return;
             }
-            DBRuntime.Api.DataService.Service.Start(port);
+
+            int pt = port;
+            if(pt<1)
+            {
+                pt = mDatabase.Setting.RealDataServerPort;
+            }
+
+            DBRuntime.Api.DataService.Service.Start(pt);
 
             if (RDDCManager.Manager.CurrentState == WorkState.Primary)
             {