修改陆上搜寻任务读取配置文件功能

Models/SimulationCommon/EditorConfig.cs

@@ -5,6 +5,8 @@ public class Base
 {
     [JsonProperty("基地名称")]
     public string BaseName;
+    [JsonProperty("数据库读取")]
+    public string isReadDB;
     [JsonProperty("基地编号")]
     public int BaseId;
     [JsonProperty("基地经度")]
@@ -61,8 +63,8 @@ public class TargetPoint//搜救目标点初始坐标
     public double TargetPointLatitude;
     [JsonProperty("目标点海拔")]
     public double TargetPointHeight;
-    //[JsonProperty("目标类型")]
-    //public string TargetType;
+    [JsonProperty("目标类型")]
+    public string TargetType;
 
 }
 

Models/SimulationCommon/TaskConfig.cs

@@ -175,23 +175,10 @@ public class SeaSouJiuTask
     public string NextTaskId;
 }
 
-public class LandSouJiuTask
+public class SearchMissionPayload //搜索任务载荷
 {
-    [JsonProperty("任务信息")]
-    public MissionInformation missionInformation;
-    [JsonProperty("目标点ID")]
-    public int TargetPointId;
-    //搜索任务载荷
-    [JsonProperty("搜索任务载荷")]
+    [JsonProperty("任务载荷")]
     public string SearchPayload;
-
-    //搜索方式
-    [JsonProperty("搜索方式")]
-    public string SearchMode;
-    //搜索扫视宽度
-    [JsonProperty("搜索扫视宽度")]
-    public double SearchWidth;
-
     //探测波长(m)
     [JsonProperty("探测波长(m)")]
     public double DetectionWavelength;
@@ -216,6 +203,68 @@ public class LandSouJiuTask
     //飞行高度
     [JsonProperty("飞行高度")]
     public double FlightHeight;
+}
+
+public class SearchMissionMode //搜索方式
+{
+    [JsonProperty("搜索方式")]
+    public string SearchMode;
+    //搜索扫视宽度
+    [JsonProperty("搜索扫视宽度")]
+    public double SearchWidth;
+    [JsonProperty("多边形边界")]
+    public double ContourHeightInterval;
+    [JsonProperty("等高线高度间隔")]
+    public double PolygonalBoundary;
+    [JsonProperty("最小等高线节点数")]
+    public double MinimumContourNodes;
+    [JsonProperty("航线真实高度")]
+    public double RouteActualHeight;
+    [JsonProperty("输出等高线节点间隔")]
+    public double OutputContourNodeInterval;
+}
+
+public class LandSouXunTask
+{
+    [JsonProperty("任务信息")]
+    public MissionInformation missionInformation;
+    [JsonProperty("目标点ID")]
+    public int TargetPointId;
+    //搜索任务载荷
+    [JsonProperty("搜索任务载荷")]
+    public SearchMissionPayload missionSearchPayload;
+
+    //搜索方式
+    [JsonProperty("搜索方式")]
+    public SearchMissionMode SearchMode;
+    ////搜索扫视宽度
+    //[JsonProperty("搜索扫视宽度")]
+    //public double SearchWidth;
+
+    ////探测波长(m)
+    //[JsonProperty("探测波长(m)")]
+    //public double DetectionWavelength;
+    ////最小可检测信号(dBm)
+    //[JsonProperty("最小可检测信号(dBm)")]
+    //public double MinDetectionSignal;
+    ////雷达发射机发射信号功率(dBm)
+    //[JsonProperty("雷达发射机发射信号功率(dBm)")]
+    //public double RadarTransmitterPower;
+    ////发射天线增益(dB)
+    //[JsonProperty("发射天线增益(dB)")]
+    //public double TransmitAntennaGain;
+    ////接受天线增益(dB)
+    //[JsonProperty("接受天线增益(dB)")]
+    //public double ReceiveAntennaGain;
+    ////光电转塔水平范围
+    //[JsonProperty("光电转塔水平范围")]
+    //public double OpticalTowerHorizontalRange;
+    ////红外探测器视场角
+    //[JsonProperty("红外探测器视场角")]
+    //public double InfraredDetectorFieldAngle;
+    ////飞行高度
+    //[JsonProperty("飞行高度")]
+    //public double FlightHeight;
 
     [JsonProperty("下一个任务ID")]
     public string NextTaskId;
@@ -247,6 +296,6 @@ public class TaskConfig
     public List<XHTask> xHTask = new List<XHTask>();
     [JsonProperty("海上搜救任务")]
     public List<SeaSouJiuTask> seaSouJiuTasks = new List<SeaSouJiuTask>();
-    [JsonProperty("陆上搜救任务")]
-    public List<LandSouJiuTask> LandSouJiuTasks = new List<LandSouJiuTask>();
+    [JsonProperty("陆上搜寻任务")]
+    public List<LandSouXunTask> LandSouJiuTasks = new List<LandSouXunTask>();
 }

SimulationServer/Entity/AircraftLandSJ.cs

@@ -15,7 +15,7 @@ public class AircraftLandSJ : AircraftEntity
 {
     public bool IsOver;
 
-    public LandSouJiuTask taskContent;
+    public LandSouXunTask taskContent;
     public EquationHelper helper;
     public GetNCData getNCData;
     public bool isseePerson = false;

SimulationServer/EventHandler/EventStruct.cs

@@ -28,7 +28,7 @@ public struct CreateSeaSJTask
 public struct CreateLandSJTask
 {
     public EditorConfig EditorConfig;
-    public LandSouJiuTask LandSJTask;
+    public LandSouXunTask LandSJTask;
 }
 
 public struct CreateXHTask