diff --git a/Txgy.RBS.DTO/ProjectUsedDTO.cs b/Txgy.RBS.DTO/ProjectUsedDTO.cs index b53f042..ea7772c 100644 --- a/Txgy.RBS.DTO/ProjectUsedDTO.cs +++ b/Txgy.RBS.DTO/ProjectUsedDTO.cs @@ -16,7 +16,7 @@ namespace Txgy.RBS.DTO } public int id { get; set; } - + public string project_name { set; get; } public int current_project_id { get; set; } diff --git a/Txgy.RBS.Framework/Models/RecvMqttModel.cs b/Txgy.RBS.Framework/Models/RecvMqttModel.cs index 6cd6dbe..e28e326 100644 --- a/Txgy.RBS.Framework/Models/RecvMqttModel.cs +++ b/Txgy.RBS.Framework/Models/RecvMqttModel.cs @@ -23,6 +23,8 @@ namespace Txgy.RBS.Framework.Models public string Send81 { get; set; } [JsonProperty("dirstruct")] public string dirstruct { get; set; } + [JsonProperty("MQTT.Network")] + public string Network { get; set; } [JsonProperty("Help")] public string Help { get; set; } } diff --git a/Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs b/Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs index 672c891..692f501 100644 --- a/Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs +++ b/Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs @@ -151,6 +151,7 @@ namespace Txgy.RBS.Server.WebApi.Controllers rec.savepath = Path.Combine(globalConfig.base_path, curProject.project_name, curProject.save_waves_path); rec.send2server = (curProject.send_redis == 1) ? "YES" : "NO"; rec.Server = curProject.mqtt_server; + rec.Network = curProject.network; List< StationNumVpnDTO> vpnList=new List< StationNumVpnDTO>(); foreach (var item in curProject.stationFile.stations) { diff --git a/Txgy.RBS.Server.WebApi/rbs_server_db.db b/Txgy.RBS.Server.WebApi/rbs_server_db.db index 2196321..1dbd66f 100644 Binary files a/Txgy.RBS.Server.WebApi/rbs_server_db.db and b/Txgy.RBS.Server.WebApi/rbs_server_db.db differ diff --git a/Txgy.RBS.Services/ProcessManagerService.cs b/Txgy.RBS.Services/ProcessManagerService.cs index 50f102e..8fe2abd 100644 --- a/Txgy.RBS.Services/ProcessManagerService.cs +++ b/Txgy.RBS.Services/ProcessManagerService.cs @@ -29,6 +29,7 @@ namespace Txgy.RBS.Services _cache = cache; RedisServer = new ProcessInfo() { + ProPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, CommonData.RedisDefaultPath), ProName = "server", StartTime = DateTime.Now, State = true @@ -40,13 +41,16 @@ namespace Txgy.RBS.Services { foreach (var item in ProjectMonitor) { - _redisList.Publish(CommonData.RedisPublish, Newtonsoft.Json.JsonConvert.SerializeObject(new + int sfServer = FindProcess(RedisServer); + RedisServer.State = sfServer == 0 ? true : false; + var messageRerver = new { projectName = item.Key, ProName = RedisServer.ProName, - RunState = RedisServer.State?1:0, + RunState = RedisServer.State ? 1 :2, RunTime = (DateTime.Now - RedisServer.StartTime).TotalSeconds, - })); + }; + _redisList.Publish(CommonData.RedisPublish, Newtonsoft.Json.JsonConvert.SerializeObject(messageRerver)); foreach (var proValue in item.Value.GetType().GetProperties()) { var pro = proValue.GetValue(item.Value) as ProcessInfo; @@ -68,7 +72,8 @@ namespace Txgy.RBS.Services { projectName=item.Key, ProName = pro.ProName, - RunState = sfp == 0 ? 1 : 0, + //0已停止，1正常启动，2启动失败； + RunState = sfp == 0 ? 1 : 2, RunTime = (DateTime.Now - pro.StartTime).TotalSeconds, })); } @@ -104,8 +109,9 @@ namespace Txgy.RBS.Services { projectName = projectName, ProName = pro.ProName, + //0已停止，1正常启动，2启动失败； RunState = 0, - RunTime = (DateTime.Now - pro.StartTime).TotalSeconds, + RunTime = 0, })); } } @@ -336,14 +342,7 @@ namespace Txgy.RBS.Services else { List pro = null; - if (processInfo.ProName == "server") - { - pro = localByName.Where(p => p.MainModule.FileName.Contains(processInfo.ProName)).ToList(); - } - else - { - pro = localByName.Where(p => p.MainModule.FileName.Contains(processInfo.ProPath)).ToList(); - } + pro = localByName.Where(p => p.MainModule.FileName.Contains(processInfo.ProPath)).ToList(); if (!pro.Any()) { ri = 1; diff --git a/Txgy.RBS.Services/ProjectInfoService.cs b/Txgy.RBS.Services/ProjectInfoService.cs index 8874657..bc28742 100644 --- a/Txgy.RBS.Services/ProjectInfoService.cs +++ b/Txgy.RBS.Services/ProjectInfoService.cs @@ -75,12 +75,22 @@ namespace Txgy.RBS.Services { var curProject = _Client.Queryable().Where(c=>c.client_id== clientName).First(); var projectUse=_iMapper.Map(curProject); + if (projectUse != null) + { + var pro = _Client.Queryable().Where(p => p.project_id == curProject.current_project_id).First(); + projectUse.project_name = pro.project_name; + } return projectUse; } public ProjectUsedDTO GetCurrentProjectUsed(int projectId) { var curProject = _Client.Queryable().Where(c => c.current_project_id == projectId).First(); var projectUse = _iMapper.Map(curProject); + if (projectUse != null) + { + var pro = _Client.Queryable().Where(p => p.project_id == curProject.current_project_id).First(); + projectUse.project_name = pro.project_name; + } return projectUse; } public ApiResult UpdateProjectInfo(ProjectInfoDTO project) diff --git a/program/apms/gw.apms.json b/program/apms/gw.apms.json index 739be36..3f0b350 100644 --- a/program/apms/gw.apms.json +++ b/program/apms/gw.apms.json @@ -18,9 +18,7 @@ "Main.area_id":4, "Main.content":"通知事件", "Main.push_key":"Y3qYFBQPMbfTt6m", - "RServer.host":"127.0.0.1", - "channels":[ - {"network":"YA","station":"N026,N025,N021,N037,N040,N038,N008,N007,N009,N015,N013,N014","location":"06","channels":"SHZ:SHN:SHE"}], + "RServer.host":"127.0.0.1", "channels":[ {"network":"YA","station":"N026,N025,N021,N037,N040,N038,N008,N007,N009,N015,N013,N014","location":"06","channels":"SHZ:SHN:SHE"}], "Group.z0": 0.5, "Locate.log_level" : "DEBUG", "Locate.work_path" :".", diff --git a/program/recvmqtt/gw.recvmqtt.exe b/program/recvmqtt/gw.recvmqtt.exe index 3cd87c5..ff89057 100644 Binary files a/program/recvmqtt/gw.recvmqtt.exe and b/program/recvmqtt/gw.recvmqtt.exe differ diff --git a/program/recvmqtt/gw.recvmqtt.json b/program/recvmqtt/gw.recvmqtt.json index 924a6c3..8df908a 100644 --- a/program/recvmqtt/gw.recvmqtt.json +++ b/program/recvmqtt/gw.recvmqtt.json @@ -5,6 +5,7 @@ "MQTT.Server":"127.0.0.1:1883", "MQTT.Stations":"vpn30,vpn31,vpn32,vpn33,vpn34,vpn35,vpn36,vpn37,vpn38,vpn39,vpn40,vpn41,vpn42,vpn43,vpn44,vpn45,vpn46,vpn47,vpn48,vpn49,vpn50,vpn51,vpn52,vpn53,vpn54,vpn55,vpn56,vpn57,vpn58,vpn59,vpn60,vpn61,vpn62,vpn63,vpn65,vpn66,vpn67,vpn68,vpn69,vpn70,vpn71,vpn72,vpn73,vpn74,vpn75", "MQTT.Send81":"NO", + "MQTT.Network":"GD", "dirstruct": "NMDHM", "Help":"dirstruct=NMDHM,save miniseed file;send2server=YES,send to redis server;MQTT.Send81=YES, send 3A0181 to station" diff --git a/program/recvmqtt/gw.recvmqtt_20240531.exe b/program/recvmqtt/gw.recvmqtt_20240531.exe new file mode 100644 index 0000000..3cd87c5 Binary files /dev/null and b/program/recvmqtt/gw.recvmqtt_20240531.exe differ diff --git a/program/server/server_log.txt b/program/server/server_log.txt index 357c7b8..145d850 100644 --- a/program/server/server_log.txt +++ b/program/server/server_log.txt @@ -98,3 +98,7 @@ [14828] 23 Apr 21:45:11.837 * Running mode=standalone, port=6379. [14828] 23 Apr 21:45:11.837 # Server initialized [14828] 23 Apr 21:45:11.837 * Ready to accept connections +[40004] 11 Sep 23:32:53.493 # oO0OoO0OoO0Oo Redis is starting oO0OoO0OoO0Oo +[40004] 11 Sep 23:32:53.494 # Redis version=5.0.10, bits=64, commit=1c047b68, modified=0, pid=40004, just started +[40004] 11 Sep 23:32:53.494 # Configuration loaded +[40004] 11 Sep 23:32:53.495 # Could not create server TCP listening socket *:6379: bind: ɹɡ