1.APMS增加"Locate.zref"配置;

2.recvmqtt增加""network"配置;
3.取消层段、次数唯一判断;
master^2
mzhifa 4 months ago
parent 42c5b8149b
commit 4686b8834a

@ -115,6 +115,7 @@ namespace Txgy.RBS.DTO
/// </summary> /// </summary>
public double zmax { get; set; } public double zmax { get; set; }
public double zref { get; set; }
/// <summary> /// <summary>
/// Desc: /// Desc:
/// Default:0 /// Default:0

@ -113,6 +113,7 @@ namespace Txgy.RBS.DbModel.Models
/// </summary> /// </summary>
public double zmax { get; set; } public double zmax { get; set; }
public double zref { get; set; }
/// <summary> /// <summary>
/// Desc: /// Desc:
/// Default:0 /// Default:0

@ -15,6 +15,8 @@ namespace Txgy.RBS.Framework.Models
public string log_level { get; set; } public string log_level { get; set; }
[JsonProperty("send2server")] //recv配置Send2Redis [JsonProperty("send2server")] //recv配置Send2Redis
public string send2server { get; set; } public string send2server { get; set; }
[JsonProperty("network")]
public string network { get; set; }
[JsonProperty("MQTT.Server")] //recv配置MqttServer [JsonProperty("MQTT.Server")] //recv配置MqttServer
public string Server { get; set; } public string Server { get; set; }
[JsonProperty("MQTT.Stations")] [JsonProperty("MQTT.Stations")]

@ -139,6 +139,7 @@ namespace Txgy.RBS.Server.WebApi.Controllers
apm.ymax = (float)curProject.ymax; apm.ymax = (float)curProject.ymax;
apm.zmin = (float)curProject.zmin; apm.zmin = (float)curProject.zmin;
apm.zmax = (float)curProject.zmax; apm.zmax = (float)curProject.zmax;
apm.zref = (float)curProject.zref;
string apmJson = JsonConvert.SerializeObject(apm, Formatting.Indented); string apmJson = JsonConvert.SerializeObject(apm, Formatting.Indented);
System.IO.File.WriteAllText(Path.Combine(path, CommonData.ApmsDefaultPath), apmJson); System.IO.File.WriteAllText(Path.Combine(path, CommonData.ApmsDefaultPath), apmJson);
_processConfig.Apms.ProPath = Path.Combine(path, _processConfig.Apms.ProPath); _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.savepath = Path.Combine(globalConfig.base_path, curProject.project_name, curProject.save_waves_path);
rec.send2server = (curProject.send_redis == 1) ? "YES" : "NO"; rec.send2server = (curProject.send_redis == 1) ? "YES" : "NO";
rec.Server = curProject.mqtt_server; rec.Server = curProject.mqtt_server;
rec.network=curProject.network;
List< StationNumVpnDTO> vpnList=new List< StationNumVpnDTO>(); List< StationNumVpnDTO> vpnList=new List< StationNumVpnDTO>();
foreach (var item in curProject.stationFile.stations) foreach (var item in curProject.stationFile.stations)
{ {

Binary file not shown.

@ -2,6 +2,7 @@
"savepath" : "c:\\mqttdata\\", "savepath" : "c:\\mqttdata\\",
"log_level":"DEBUG", "log_level":"DEBUG",
"send2server":"YES", "send2server":"YES",
"network":"YA",
"MQTT.Server":"127.0.0.1:1883", "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.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.Send81":"NO",

Loading…
Cancel
Save