diff --git a/Common/Cdy.Tag/DatabaseSerise.cs b/Common/Cdy.Tag/DatabaseSerise.cs index 19959362427fe51b392f2a878faf0455ce87d99e..dfa9eca003651c5edec0637e216ad6137b0299ba 100644 --- a/Common/Cdy.Tag/DatabaseSerise.cs +++ b/Common/Cdy.Tag/DatabaseSerise.cs @@ -133,7 +133,12 @@ namespace Cdy.Tag /// 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; } /// @@ -144,6 +149,7 @@ namespace Cdy.Tag private XElement Save(SettingDoc doc) { XElement xe = new XElement("Setting"); + xe.SetAttributeValue("RealDataServerPort", doc.RealDataServerPort); return xe; } diff --git a/Common/Cdy.Tag/SettingDoc.cs b/Common/Cdy.Tag/SettingDoc.cs index 7232d5fa1b277562b1dcb401a7e09305f6042cc2..8efa6d368ef60fb2193a3030651c5933c62645a0 100644 --- a/Common/Cdy.Tag/SettingDoc.cs +++ b/Common/Cdy.Tag/SettingDoc.cs @@ -33,6 +33,11 @@ namespace Cdy.Tag #region ... Properties ... + /// + /// + /// + public int RealDataServerPort { get; set; } = 14330; + #endregion ...Properties... #region ... Methods ... diff --git a/Develop/DBDevelopClientApi/developService.proto b/Develop/DBDevelopClientApi/developService.proto index 6790385a0e7d79a9e69dcb4d4634387cb66cfd3f..705b5d2b4c21e3e229baab07b72d68c6ff9e3c82 100644 --- a/Develop/DBDevelopClientApi/developService.proto +++ b/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 diff --git a/Develop/DBDevelopService/Protos/developService.proto b/Develop/DBDevelopService/Protos/developService.proto index 6790385a0e7d79a9e69dcb4d4634387cb66cfd3f..705b5d2b4c21e3e229baab07b72d68c6ff9e3c82 100644 --- a/Develop/DBDevelopService/Protos/developService.proto +++ b/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 diff --git a/Develop/DBDevelopService/Services/DevelopServerService.cs b/Develop/DBDevelopService/Services/DevelopServerService.cs index ea8d64665b6a2ddd2e192d655d411a9747a8fa1b..93e820e6696926bb81441682d606e738d08a01de 100644 --- a/Develop/DBDevelopService/Services/DevelopServerService.cs +++ b/Develop/DBDevelopService/Services/DevelopServerService.cs @@ -1929,6 +1929,47 @@ namespace DBDevelopService return Task.FromResult(new BoolResultReplay() { Result = true }); } - + + /// + /// + /// + /// + /// + /// + public override Task 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 }); + } + + /// + /// + /// + /// + /// + /// + public override Task 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 }); + } + } } diff --git a/Doc/Image/Develop/CurrentUserManager.png b/Doc/Image/Develop/CurrentUserManager.png new file mode 100644 index 0000000000000000000000000000000000000000..5ae2dfe1038d90f9f25800d33d7745e2bcbd97ea Binary files /dev/null and b/Doc/Image/Develop/CurrentUserManager.png differ diff --git a/Doc/Image/Develop/DatabasePermission.png b/Doc/Image/Develop/DatabasePermission.png new file mode 100644 index 0000000000000000000000000000000000000000..b9276fd35449f1d6a3d92eebf35f15ad57b50903 Binary files /dev/null and b/Doc/Image/Develop/DatabasePermission.png differ diff --git a/Doc/Image/Develop/DatabaseSelect.png b/Doc/Image/Develop/DatabaseSelect.png new file mode 100644 index 0000000000000000000000000000000000000000..a84e32b725020db5f9400248713064684f17406c Binary files /dev/null and b/Doc/Image/Develop/DatabaseSelect.png differ diff --git a/Doc/Image/Develop/DatabaseUser.png b/Doc/Image/Develop/DatabaseUser.png new file mode 100644 index 0000000000000000000000000000000000000000..3cae03f12008d1f3515f1b32b5594e533c4ead47 Binary files /dev/null and b/Doc/Image/Develop/DatabaseUser.png differ diff --git a/Doc/Image/Develop/Login.png b/Doc/Image/Develop/Login.png new file mode 100644 index 0000000000000000000000000000000000000000..16b013497a928452a7da788c0c509583d89f331c Binary files /dev/null and b/Doc/Image/Develop/Login.png differ diff --git a/Doc/Image/Develop/Main2.png b/Doc/Image/Develop/Main2.png new file mode 100644 index 0000000000000000000000000000000000000000..f54a07cf28f9435c43f69a87427084034693abd4 Binary files /dev/null and b/Doc/Image/Develop/Main2.png differ diff --git a/Doc/Image/Develop/ServerUser.png b/Doc/Image/Develop/ServerUser.png new file mode 100644 index 0000000000000000000000000000000000000000..e74be4fab31233d594cecac53c5679f6d55906d2 Binary files /dev/null and b/Doc/Image/Develop/ServerUser.png differ diff --git a/Doc/Image/Develop/TagManager.png b/Doc/Image/Develop/TagManager.png new file mode 100644 index 0000000000000000000000000000000000000000..6bc3e6f24bbe644cc685c51201a762199fab634d Binary files /dev/null and b/Doc/Image/Develop/TagManager.png differ diff --git a/Doc/Image/Develop/main.png b/Doc/Image/Develop/main.png new file mode 100644 index 0000000000000000000000000000000000000000..4e89ec49b8a280946a244943f9ed71310b73b23d Binary files /dev/null and b/Doc/Image/Develop/main.png differ diff --git a/RunTime/DBRuntime/His/SeriseEnginer2.cs b/RunTime/DBRuntime/His/SeriseEnginer2.cs index 9a199bba563c96943284fd44ebd2e7295ca3e73e..f85cb328d267ad152166f8e77386466bc0bb2f94 100644 --- a/RunTime/DBRuntime/His/SeriseEnginer2.cs +++ b/RunTime/DBRuntime/His/SeriseEnginer2.cs @@ -163,7 +163,7 @@ namespace Cdy.Tag /// public void Init() { - DataFileSeriserManager.manager.Init(); + var his = ServiceLocator.Locator.Resolve(); diff --git a/RunTime/DBRuntime/Runner.cs b/RunTime/DBRuntime/Runner.cs index c414703d3686e5fd475320c2a4b2f345517cf4a8..8c5beeab495ca35821a57d3b51a45071362307a7 100644 --- a/RunTime/DBRuntime/Runner.cs +++ b/RunTime/DBRuntime/Runner.cs @@ -166,6 +166,9 @@ namespace Cdy.Tag //娉ㄥ唽绾挎ц浆鎹㈠櫒 ValueConvertManager.manager.Registor(new LinerConvert()); + + DataFileSeriserManager.manager.Init(); + CPUAssignHelper.Helper.Init(); } /// @@ -276,8 +279,6 @@ namespace Cdy.Tag } InitPath(); - CPUAssignHelper.Helper.Init(); - if (CheckDatabaseExist(mDatabaseName)) { LoadDatabase(); @@ -371,7 +372,7 @@ namespace Cdy.Tag /// 鍚姩 /// /// - 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) {