diff --git a/Txgy.RBS.DTO/ProjectInfoDTO.cs b/Txgy.RBS.DTO/ProjectInfoDTO.cs index b2a309f..4da561b 100644 --- a/Txgy.RBS.DTO/ProjectInfoDTO.cs +++ b/Txgy.RBS.DTO/ProjectInfoDTO.cs @@ -114,7 +114,8 @@ namespace Txgy.RBS.DTO /// Nullable:False /// public double zmax { get; set; } - + + public double zref { get; set; } /// /// Desc: /// Default:0 diff --git a/Txgy.RBS.DbModel/Models/project_info.cs b/Txgy.RBS.DbModel/Models/project_info.cs index fab34ae..84283a8 100644 --- a/Txgy.RBS.DbModel/Models/project_info.cs +++ b/Txgy.RBS.DbModel/Models/project_info.cs @@ -113,6 +113,7 @@ namespace Txgy.RBS.DbModel.Models /// public double zmax { get; set; } + public double zref { get; set; } /// /// Desc: /// Default:0 diff --git a/Txgy.RBS.Framework/Models/RecvMqttModel.cs b/Txgy.RBS.Framework/Models/RecvMqttModel.cs index 6cd6dbe..82715e4 100644 --- a/Txgy.RBS.Framework/Models/RecvMqttModel.cs +++ b/Txgy.RBS.Framework/Models/RecvMqttModel.cs @@ -15,6 +15,8 @@ namespace Txgy.RBS.Framework.Models public string log_level { get; set; } [JsonProperty("send2server")] //recv配置:Send2Redis public string send2server { get; set; } + [JsonProperty("network")] + public string network { get; set; } [JsonProperty("MQTT.Server")] //recv配置:MqttServer public string Server { get; set; } [JsonProperty("MQTT.Stations")] diff --git a/Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs b/Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs index 672c891..1752c4f 100644 --- a/Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs +++ b/Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs @@ -139,6 +139,7 @@ namespace Txgy.RBS.Server.WebApi.Controllers apm.ymax = (float)curProject.ymax; apm.zmin = (float)curProject.zmin; apm.zmax = (float)curProject.zmax; + apm.zref = (float)curProject.zref; string apmJson = JsonConvert.SerializeObject(apm, Formatting.Indented); System.IO.File.WriteAllText(Path.Combine(path, CommonData.ApmsDefaultPath), apmJson); _processConfig.Apms.ProPath = Path.Combine(path, _processConfig.Apms.ProPath); @@ -151,6 +152,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 51591ba..6fcdd7f 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/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..0bbff91 100644 --- a/program/recvmqtt/gw.recvmqtt.json +++ b/program/recvmqtt/gw.recvmqtt.json @@ -2,6 +2,7 @@ "savepath" : "c:\\mqttdata\\", "log_level":"DEBUG", "send2server":"YES", + "network":"YA", "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",