修改 目视模型，修改调试bug

Models/SimulationCommon/EquationHelper.cs

@@ -28,14 +28,6 @@ namespace MuShiApp
             //m_HttpHelper = Factory.Load();
         }
 
-        //距离（km）举例
-        double distance = 2;
-
-        //能见度（km）举例
-        double visibility = 7.5;
-
-        //浪高（m）举例；陆上搜救任务可取0
-        double WaveHeight = 1.5;
 
         //a、b、c、d、r、e均为修正系数
         double[] a = { 9.5128, 1.3738, 0.0875 };
@@ -44,14 +36,10 @@ namespace MuShiApp
         double[] d = { 95.0664, 97.0952, 94.9145 };
 
         double[][] r = new double[3][];
-
-
         double[][] e = new double[3][];
-
-
         double[] posibility = { 0, 0, 0 };
 
-        public double GetMushiSeaProbability(double3 aircraftPoint, double3 targetPoint,double visibility, double wavehigh, TargetPoint targetPoint1, string type)
+        public double GetMushiSeaProbability(double3 aircraftPoint, double visibility, double wavehigh, TargetPoint targetPoint)
         {
             r[0] = new double[] { 4.375, 1.18, 1.01, 1 };
             r[1] = new double[] { 2.85, 1.51, 1.18, 1 };
@@ -59,18 +47,18 @@ namespace MuShiApp
             e[0] = new double[] { -10, -30, -50, -65, -80, -90 };
             e[1] = new double[] { -2, -15, -30, -50, -70, -80 };
             e[2] = new double[] { 0, 0, -10, -20, -30, -40 };
+            
             double[] posibility = { 0, 0, 0 };
 
-            distance = GetDistance(aircraftPoint.x, targetPoint.x,aircraftPoint.y,targetPoint.y);
-            WaveHeight = wavehigh;
+            var distance = GetDistance(aircraftPoint.x, targetPoint.TargetPointLongitude,aircraftPoint.y,targetPoint.TargetPointLatitude);
 
             if (distance >= 0 && distance < 2)
             {
-                posibility = MuShiModel.GetPosibilityClear(distance, a, b, c, d, r, e, visibility, WaveHeight);
+                posibility = MuShiModel.GetPosibilityClear(distance, a, b, c, d, r, e, visibility, wavehigh);
                 while (posibility[0] <= 0 || posibility[1] <= 0 || posibility[2] <= 0)
                 {
                     distance += 0.1;
-                    posibility = MuShiModel.GetPosibilityClear(distance, a, b, c, d, r, e, visibility, WaveHeight);
+                    posibility = MuShiModel.GetPosibilityClear(distance, a, b, c, d, r, e, visibility, wavehigh);
                 }
             }
             if (distance >= 2)
@@ -95,8 +83,75 @@ namespace MuShiApp
                 }
             }
 
-            return 0;
+            return posibility[GetType(targetPoint.TargetType.Type)];
+        }
+        
+        public double GetMushiLandProbability(double3 aircraftPoint, double visibility, TargetPoint targetPoint)
+        {
+            r[0] = new double[] { 4.375, 1.18, 1.01, 1 };
+            r[1] = new double[] { 2.85, 1.51, 1.18, 1 };
+            r[2] = new double[] { 2.75, 2.1, 1.2, 1 };
+            e[0] = new double[] { 0, -30, -50, -65, -80, -90 };
+            e[1] = new double[] { 0, -15, -30, -50, -70, -80 };
+            e[2] = new double[] { 0, 0, -10, -20, -30, -40 };
+            
+            double[] posibility = { 0, 0, 0 };
+
+            var distance = GetDistance(aircraftPoint.x, targetPoint.TargetPointLongitude,aircraftPoint.y,targetPoint.TargetPointLatitude);
+
+            if (distance >= 0 && distance < 2)
+            {
+                posibility = MuShiModel.GetPosibilityClear(distance, a, b, c, d, r, e, visibility, 0);
+                while (posibility[0] <= 0 || posibility[1] <= 0 || posibility[2] <= 0)
+                {
+                    distance += 0.1;
+                    posibility = MuShiModel.GetPosibilityClear(distance, a, b, c, d, r, e, visibility, 0);
+                }
+            }
+            if (distance >= 2)
+            {
+                posibility = MuShiModel.GetPosibilityFar(distance, a, b, c, d);
+                while (posibility[0] <= 0 || posibility[1] <= 0 || posibility[2] <= 0)
+                {
+                    distance += 0.5;
+                    posibility = MuShiModel.GetPosibilityFar(distance, a, b, c, d);
+                }
+                if (distance > 3.5)
+                {
+                    posibility[0] = 0;
+                }
+                if (distance > 5)
+                {
+                    posibility[1] = 0;
+                }
+                if (distance > 10)
+                {
+                    posibility[2] = 0;
+                }
+            }
+
+            return posibility[GetType(targetPoint.TargetType.Type)];
+        }
+
+        public int GetType(string type)
+        {
+            switch (type)
+            {
+                case "遇险人员":
+                case "落水人员":
+                    return 0;
+                case "车辆":
+                case "救生筏":
+                case "小于5700kg航空器":
+                case "小于20m船舶":
+                    return 1;
+                case "大于20m船舶":
+                case "大于5700kg航空器":   
+                    return 2;
+            }
+            return -1;
         }
+        
 
         public static double GetDistance(double lon1, double lon2, double lat1, double lat2)
         {
@@ -275,7 +330,7 @@ namespace MuShiApp
             return Convert.ToDouble(randNum.ToString("f" + decimalPlace));
         }
 
-        private double getVisibility(string city_name, string weather_date)
+        public double getVisibility(string city_name, string weather_date)
         {
             try
             {
@@ -315,7 +370,7 @@ namespace MuShiApp
         //     "code": 200,
         //     "cityName": "承德市"
         // }
-        private string getCityName(double lon, double lat)
+        public string getCityName(double lon, double lat)
         {
             string cityName = "北京";
             // try

Models/SimulationCommon/FXJHGenenrate.cs

@@ -691,15 +691,15 @@ namespace Model
                 }
                 else
                 {
-                    currentLocation.CurrentLon = turningPoints[0].TurningPointLongitude;
-                    currentLocation.CurrentLat = turningPoints[0].TurningPointLatitude;
-                    currentLocation.CurrentHei = turningPoints[0].TurningPointHeight;
+                    currentLocation.CurrentLon = turningPoints[^1].TurningPointLongitude;
+                    currentLocation.CurrentLat = turningPoints[^1].TurningPointLatitude;
+                    currentLocation.CurrentHei = turningPoints[^1].TurningPointHeight;
                     currentLocation.Currentvelo = 0;
                     currentLocation.CurrentFuel = turningPoints[segmentnumber - 1].RemainingFuel -
                                                   turningPoints[segmentnumber - 1].SegmentFlightFuelConsumption *
                                                   turningPoints[segmentnumber - 1].SegmentFlightTime;
                     currentLocation.PresentMission = turningPoints[segmentnumber - 1].TurningPointName;
-
+                
                     isEnd = true;
                 }
             return (currentLocation,isEnd);

SimulationServer/Entity/AircraftLandSJ.cs

@@ -75,7 +75,7 @@ public class AircraftLandSJ : AircraftEntity
             {
                 route.Add(new double[]
                 {
-                    point.lat, point.lon,3500
+                    point.lon, point.lat,3500
                 });
             }
         }
@@ -90,8 +90,8 @@ public class AircraftLandSJ : AircraftEntity
         {
             airRoutes.Add(new AirRoute
             {
-                AirRouteLatitude = item[0],
-                AirRouteLongitude = item[1],
+                AirRouteLatitude = item[1],
+                AirRouteLongitude = item[0],
                 AirRouteHeight = item[2]
             });
         }
@@ -111,13 +111,19 @@ public class AircraftLandSJ : AircraftEntity
         FXJHGenerate.LandSouJiu(FlightPlanEditor, ref TurningPoints);
 
         FXJHGenerate.FXJHTPDiedai(FlightPlanEditor, ref TurningPoints, Velocitys, FuelConsumptions);
-
+        
+        double time = 0; // 第一次 搜寻结束
+        for (int i = 0; i < TurningPoints.Count - 2; i++)
+        {
+            time += TurningPoints[i].SegmentFlightTime; 
+        }
 
         double3 targetPoint = new double3(FlightPlanEditor.targetpoint[0].TargetPointLongitude,
             FlightPlanEditor.targetpoint[0].TargetPointLatitude,
             FlightPlanEditor.targetpoint[0].TargetPointHeight);
 
-        double a = helper.getPb(targetPoint.x, targetPoint.y);
+        string cityName = helper.getCityName(targetPoint.x,targetPoint.y);
+        var visibility = helper.getVisibility(cityName, DateTime.Now.ToString("yyyy-MM-dd HH"));
 
         getNCData = new GetNCData();
         getNCData.GetData();
@@ -133,33 +139,51 @@ public class AircraftLandSJ : AircraftEntity
             //IsOver = true;
             do
             {
+                
+                if (!isseePerson && temptime >= time)
+                {
+                    FXJHGenerate.LandSouJiu(FlightPlanEditor, ref TurningPoints);
+                    FXJHGenerate.FXJHTPDiedai(FlightPlanEditor, ref TurningPoints, Velocitys, FuelConsumptions);
+                    
+                    time = 0;
+                    for (int i = 0; i < TurningPoints.Count - 2; i++)
+                    {
+                        time += TurningPoints[i].SegmentFlightTime; 
+                    }
+                    Log.Info($"+++++++++++搜寻结束 TurningPoints Count: { TurningPoints.Count } 下次结束的时间  { time }++++++++++++++++");
+                }
+                
                 (currentLocation, _) =
                     FXJHGenerate.GetAllCurrentLocation(TurningPoints, temptime); // 获取飞机当前位置
                 double3 aricraftPoint = new double3(currentLocation.CurrentLon, currentLocation.CurrentLat,
                     currentLocation.CurrentHei);
 
-
-
                 var distance = Utils.Util.GetDistance(currentLocation.CurrentLon, targetPoint.x,
                     currentLocation.CurrentLat,
                     targetPoint.y);
                 Log.Info("距离：====================" + distance);
 
-                if (distance < 3.2)
-                {
-                    //TODO 和学生对接确认， 发现概率算法
-                    probability = helper.getProbability(aricraftPoint, targetPoint, a, currentLocation.CurrentCourse,
-                        10, 10, "遇险人员", "陆地"); // 计算发现概率，需要其他模型输入 // 计算发现概率，需要其他模型输入
-                }
-
-
+                probability =
+                    helper.GetMushiLandProbability(aricraftPoint, visibility,  FlightPlanEditor.targetpoint[0]);
                 //finalProbability *= (1 - probability); 
 
-                Console.WriteLine(
-                    $"陆上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，是否看到遇险人员：{isseePerson}");
-                double randomValue = random.NextInt64(9500,10000); // 生成随机数比较概率
-                randomValue /= 10000;
-                //probability -= 0.5;
+             
+                if (probability > 0.8)
+                {
+                    probability -= 0.5f;
+
+                    probability *= random.NextDouble();
+                    double random1 = random.NextInt64(9000,10000); // 生成随机数比较概率
+                    random1 /= 10000;
+                    probability += (0.5 * random1);
+                }
+                
+                double randomValue = random.NextInt64(9600,10000); // 生成随机数比较概率
+                 randomValue /= 10000;
+                 
+                 Log.Info(
+                     $"陆上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，是否看到遇险人员：{isseePerson}");
+                 
                 if (randomValue < probability) // 1 - finalProbability
                 {
                     isseePerson = true;
@@ -183,7 +207,7 @@ public class AircraftLandSJ : AircraftEntity
 
             //Console.WriteLine(
             //    $"海上任务1：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{1 - finalProbability}，是否看到落水人员：{isseePerson}");
-            Console.WriteLine(
+            Log.Info(
                 $"陆上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，是否看到遇险人员：{isseePerson}");
 
             //finalProbability = 1 - finalProbability; 

SimulationServer/Entity/AircraftSJ.cs

@@ -23,10 +23,11 @@ public class AircraftSJ : AircraftEntity
     private int fireIndex = -1; // 记录发现火点的位置
     public EquationHelper helper;
     public SeaSouJiuTask taskContent;
-    public bool Success = true; //本目标搜救是否成功
+    public bool Success = false; //本目标搜救是否成功
     public GetNCData getNCData;
 
     public SearchMissionMode SearchMode;
+
     public override void Reset()
     {
         base.Reset();
@@ -57,7 +58,6 @@ public class AircraftSJ : AircraftEntity
         //漂移轨迹
         List<double[]> trajectory = SeaSJ.CalculateDriftTrajectory(nCread, initialPosition, dt, totalTime);
 
-        Log.Info(trajectory.ToJson());
         // 生成任务终点
         MissionEndPoint = new MissionEndPoint
         {
@@ -137,6 +137,7 @@ public class AircraftSJ : AircraftEntity
             var temp3 = new Point(centerPoint.lat - max / 2, centerPoint.lon - max / 2);
             waypoints = TZFX.GenerateWaypoints(temp0, temp1, temp2, temp3, max, SearchMode.SearchWidth);
         }
+
         // List<Point> 转成 List<AirRoute>
         List<AirRoute> airRoutes = new List<AirRoute>();
         foreach (var item in waypoints)
@@ -163,11 +164,18 @@ public class AircraftSJ : AircraftEntity
         FXJHGenerate.FXJHTPDiedai(FlightPlanEditor, ref TurningPoints, Velocitys, FuelConsumptions);
 
 
+        double time = 0; // 第一次 搜寻结束
+        for (int i = 0; i < TurningPoints.Count - 2; i++)
+        {
+            time += TurningPoints[i].SegmentFlightTime; 
+        }
+
         double3 targetPoint = new double3(FlightPlanEditor.targetpoint[0].TargetPointLongitude,
             FlightPlanEditor.targetpoint[0].TargetPointLatitude,
             FlightPlanEditor.targetpoint[0].TargetPointHeight);
 
-        double pb = helper.getPb(targetPoint.x, targetPoint.y);
+        string cityName = helper.getCityName(targetPoint.x,targetPoint.y);
+        var vis = helper.getVisibility(cityName, DateTime.Now.ToString("yyyy-MM-dd HH"));
 
         getNCData = new GetNCData();
         getNCData.GetData();
@@ -183,6 +191,20 @@ public class AircraftSJ : AircraftEntity
 
             do
             {
+                if (!isseePerson && temptime >= time)
+                {
+                    FXJHGenerate.SeaSouJiu(FlightPlanEditor, ref TurningPoints);
+                    FXJHGenerate.FXJHTPDiedai(FlightPlanEditor, ref TurningPoints, Velocitys, FuelConsumptions);
+                    
+                    time = 0;
+                    for (int i = 0; i < TurningPoints.Count - 2; i++)
+                    {
+                        time += TurningPoints[i].SegmentFlightTime; 
+                    }
+                    Log.Info($"+++++++++++搜寻结束 TurningPoints Count: { TurningPoints.Count } 下次结束的时间  { time }++++++++++++++++");
+                }
+                
+                
                 (currentLocation, _) =
                     FXJHGenerate.GetAllCurrentLocation(TurningPoints, temptime); // 获取飞机当前位置
                 double3 aricraftPoint = new double3(currentLocation.CurrentLon, currentLocation.CurrentLat,
@@ -202,22 +224,24 @@ public class AircraftSJ : AircraftEntity
                 var waveHigh = SeaSJ.GetWaveHeightFromAPI(nCread, currentLocation.CurrentLon,
                     currentLocation.CurrentLat, temptime);
 
-                var distance = Utils.Util.GetDistance(currentLocation.CurrentLon, targetPoint.x, currentLocation.CurrentLat,
+                var distance = Utils.Util.GetDistance(currentLocation.CurrentLon, targetPoint.x,
+                    currentLocation.CurrentLat,
                     targetPoint.y);
                 Log.Info("距离：====================" + distance);
-                if (distance < 20)
-                {
-                    probability = helper.getProbability(aricraftPoint, targetPoint,pb, currentLocation.CurrentCourse,
-                        windSpeed, waveHigh, "落水人员", "海上"); // 计算发现概率，需要其他模型输入 // 计算发现概率，需要其他模型输入
-                }
+                probability =
+                    helper.GetMushiSeaProbability(aricraftPoint, vis, waveHigh, FlightPlanEditor.targetpoint[0]);
 
-                //finalProbability *= (1 - probability);
+                // probability = helper.getProbability(aricraftPoint, targetPoint,pb, currentLocation.CurrentCourse,
+                //     windSpeed, waveHigh, "落水人员", "海上"); // 计算发现概率，需要其他模型输入 // 计算发现概率，需要其他模型输入
 
-                Console.WriteLine(
+                //finalProbability *= (1 - probability);
+                
+                // 到搜寻航路点的最后一个点 （？）
+                Log.Info(
                     $"海上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{1 - finalProbability}，是否看到落水人员：{isseePerson}");
-
-                double randomValue = random.NextDouble(); // 生成随机数比较概率
-                if (randomValue < probability)  //  1 - finalProbability
+                double randomValue = random.NextInt64(9000,10000); // 生成随机数比较概率
+                randomValue /= 10000;
+                if (randomValue < probability) //  1 - finalProbability
                 {
                     isseePerson = true;
                     this.isseePerson = true;
@@ -228,12 +252,44 @@ public class AircraftSJ : AircraftEntity
                 {
                     isseePerson = false;
                 }
-
+                if(temptime >= taskContent.missionInformation.TaskEndConditions.TaskTime)
+                {
+                    IsOver = true;
+                    isseePerson = false;
+                }
                 temptime += 10;
             } while (!isseePerson && IsOver == false);
+            if (isseePerson)
+            {
+                
+                for (int i = 0; i < TurningPoints.Count - 1; i++)
+                {
+                    TotalTime += TurningPoints[i].SegmentFlightTime; // 总时间
+                }
+                
+                double time = TotalTime; //time——搜索时间，单位：秒；数据测试用
+
+                double latitude = FlightPlanEditor.targetpoint[0].TargetPointLatitude; //落水人员纬度；数据测试用
+                double longitude = FlightPlanEditor.targetpoint[0].TargetPointLongitude; //落水人员经度，数据测试用
+
+                double survivalTime = SurvivalTimeModel.SurvivalTime(getNCData.tempreadNC, latitude, longitude, time); //幸存时间
+
+                if (survivalTime * 3600 > time)
+                {
+                    Success = true;
+                }
+                else
+                {
+                    Success = false;
+                }
+                Log.Info("TotalTime：" + TotalTime);
+                Log.Info("幸存时间：" + survivalTime);
+            }
+          
+            
             //Console.WriteLine(
             //    $"海上任务1：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{1 - finalProbability}，是否看到落水人员：{isseePerson}");
-            Console.WriteLine(
+            Log.Info(
                 $"海上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{1 - finalProbability}，是否看到落水人员：{isseePerson}，人员是否幸存：{Success}");
 
             //finalProbability = 1 - finalProbability;
@@ -285,25 +341,10 @@ public class AircraftSJ : AircraftEntity
                                TurningPoints[TurningPoints.Count - 1].RemainingFuel;
 
 
-
         //GetNCData getNCData = new GetNCData();
         ////getNCData.GetData();
 
-        double time = TotalTime; //time——搜索时间，单位：秒；数据测试用
-
-        double latitude = FlightPlanEditor.targetpoint[0].TargetPointLatitude; //落水人员纬度；数据测试用
-        double longitude = FlightPlanEditor.targetpoint[0].TargetPointLongitude; //落水人员经度，数据测试用
-
-        double survivalTime = SurvivalTimeModel.SurvivalTime(getNCData.tempreadNC, latitude, longitude, time); //幸存时间
-
-        if (survivalTime * 3600 > time)
-        {
-            Success = true;
-        }
-        else
-        {
-            Success = false;
-        }
+       
     }
 }
 

SimulationServer/bin/Debug/net7.0/Missions/editor_config.json

@@ -1,5 +1,5 @@
 {
-    "仿真次数": 3,
+    "仿真次数": 10,
     "想定信息": {
         "想定日期": "2024年6月4日",
         "想定时间": "00时00分00秒"
@@ -178,8 +178,7 @@
             "目标点纬度": 25.766667,
             "目标点海拔": 0.0,
             "目标类型": {
-                "类型": "航空器",
-                "目标大小": "小于5700kg"
+                "类型": "小于5700kg航空器"
             }
         },
         {
@@ -197,8 +196,7 @@
             "目标点纬度": 24.533333,
             "目标点海拔": 0.0,
             "目标类型": {
-                "类型": "救生筏",
-                "目标大小": "6人" 
+                "类型": "救生筏"
             }
         },
         {
@@ -207,9 +205,7 @@
             "目标点纬度": 25.766667,
             "目标点海拔": 0.0,
             "目标类型": {
-                "类型": "船舶",
-                "目标大小": "12m",
-                "目标吨位": "1000t" 
+                "类型": "小于20m船舶"
             }
         }
     ]

SimulationServer/bin/Debug/net7.0/Missions/task_config.json

@@ -1,39 +1,53 @@
 {
-    "灾情侦查任务": [
+    "陆上搜寻任务": [
         {
             "任务信息": {
-                "任务名称": "灾情侦查任务1",
-                "任务ID": "ZQZC1",
+                "任务名称": "陆上搜寻任务1",
+                "任务ID": "LSSX1",
                 "任务主要类型": "航空搜救",
-                "任务类型": "灾情侦查",
+                "任务类型": "陆上搜寻",
                 "任务触发器": "时间触发",
-                "下一个任务ID": "LSSX1",
+                "下一个任务ID": "",               
                 "目标点ID": 1,
-                "起飞准备时间": 600.0,
                 "开始日期": "2024年6月4日",
                 "开始时间": "00时00分00秒",
                 "结束日期": "2024年6月6日",
                 "结束时间": "23时00分00秒",
-                "?任务结束条件": "注释: 执行2次/满足任务时间",
+                "起飞准备时间": 600.0,
                 "任务结束条件": {
-                    "结束条件": "达成执行次数",
-                    "执行次数": 2
+                    "?结束条件": "注释: 执行2次/满足任务时间",
+                    "结束条件": "满足任务时间",
+                    "任务时间": 36000
                 }
             },
             "应用航空器": [
                 {
                     "应用机型": "M-171",
                     "应用飞机编号": "1-1",
-                    "加油基地": "成都航站",
+                    "加油基地": "呷拉镇小学临时起降点",
                     "加油基地编号": 1,
-                    "任务结束返回点": 0
+                    "任务结束返回点": 1
+                }
+            ],
+            "战术战法": {
+                "战术战法": "多机跟进",
+                "跟进间距": 20,
+                "跟进高度差": 50
+            },
+            "运行约束": {
+                "搜索飞行速度限制": 150
+            },
+            "搜索任务载荷": [
+                {
+                    "任务载荷": "目视搜素",
+                    "应用飞机编号": "1-1"
                 }
             ],
-            "侦查方式": [
+            "搜索方式": [
                 {
-                    "侦查方式": "区域侦查",
+                    "搜索方式": "扇形搜索",
                     "应用飞机编号": "1-1",
-                    "矩形侦查区域边界点": [
+                    "多边形边界": [
                         [
                             100.9258,
                             30.0709
@@ -49,18 +63,16 @@
                         [
                             101.1220,
                             30.1385
+                        ],
+                        [
+                            100.9258,
+                            30.0709
                         ]
                     ],
-                    "扫描线间距": 300.0,
-                    "侦查飞行真高": 300.0,
-                    "是否真实高度": true,
-                    "是否环绕模式": true,
-                    "环绕圈数": 1
+                    "搜索扫视宽度": 0.02
                 }
             ]
-        }
-    ],
-    "陆上搜寻任务": [
+        },
         {
             "任务信息": {
                 "任务名称": "陆上搜寻任务2",
@@ -111,7 +123,7 @@
             ],
             "搜索方式": [
                 {
-                    "搜索方式": "扇形搜索",
+                    "搜索方式": "等高线搜索",
                     "应用飞机编号": "1-2",
                     "多边形边界": [
                         [
@@ -135,349 +147,10 @@
                             30.0709
                         ]
                     ],
-                    "搜索扫视宽度": 0.02
-                }
-            ]
-        }
-    ],
-    "海上搜救任务": [
-        {
-            "任务信息": {
-                "任务名称": "海上搜救任务1",
-                "任务ID": "HSSJ1",
-                "任务主要类型": "航空搜救",
-                "任务类型": "海上搜救",
-                "任务触发器": "时间触发",
-                "下一个任务ID": "",
-                "目标点ID": 4,
-                "开始日期": "2024年6月4日",
-                "开始时间": "00时00分00秒",
-                "结束日期": "2024年6月6日",
-                "结束时间": "23时00分00秒",
-                "起飞准备时间": 600.0,
-                "任务结束条件": {
-                    "?结束条件": "注释: 执行2次/满足任务时间",
-                    "结束条件": "满足任务时间",
-                    "任务时间": 36000
-                }
-            },
-            "应用航空器": [
-                {
-                    "应用机型": "S-76",
-                    "应用飞机编号": "3-1",
-                    "加油基地": "西昌航站",
-                    "加油基地编号": 3,
-                    "任务结束返回点": 3
-                }
-            ],
-            "战术战法": {
-                "战术战法": "多机跟进",
-                "跟进间距": 20,
-                "跟进高度差": 50
-            },
-            "运行约束": {
-                "搜索飞行速度限制": 150
-            },
-            "搜索任务载荷": [
-                {
-                    "任务载荷": "目视搜索",
-                    "应用飞机编号": "3-1"
-                }
-            ],
-            "搜索方式": [
-                {
-                    "搜索方式": "扩展矩形搜索",
-                    "应用飞机编号": "3-1",
-                    "搜索扫视宽度": 0.02
-                }
-            ]
-        },
-        {
-            "任务信息": {
-                "任务名称": "海上搜救任务2",
-                "任务ID": "HSSJ2",
-                "任务主要类型": "航空搜救",
-                "任务类型": "海上搜救",
-                "任务触发器": "时间触发",
-                "下一个任务ID": "",              
-                "目标点ID": 5,
-                "开始日期": "2024年6月4日",
-                "开始时间": "00时00分00秒",
-                "结束日期": "2024年6月6日",
-                "结束时间": "23时00分00秒",
-                "起飞准备时间": 600.0,
-                "任务结束条件": {
-                    "?结束条件": "注释: 执行2次/满足任务时间",
-                    "结束条件": "满足任务时间",
-                    "任务时间": 36000
-                }
-            },
-            "应用航空器": [
-                {
-                    "应用机型": "S-76",
-                    "应用飞机编号": "3-2",
-                    "加油基地": "西昌航站",
-                    "加油基地编号": 3,
-                    "任务结束返回点": 3
-                }
-            ],
-            "战术战法": {
-                "战术战法": "多机跟进",
-                "跟进间距": 20,
-                "跟进高度差": 50
-            },
-            "运行约束": {
-                "搜索飞行速度限制": 150
-            },
-            "搜索任务载荷": [
-                {
-                    "任务载荷": "雷达搜索",
-                    "应用飞机编号": "3-2",
-                    "探测波长(m)": 0.0001,
-                    "最小可检测信号(dBm)": -65,
-                    "雷达发射机发射信号功率(dBm)": 48,
-                    "发射天线增益(dB)": 34,
-                    "接受天线增益(dB)": 34
-                }
-            ],
-            "搜索方式": [
-                {
-                    "搜索方式": "扇形搜索",
-                    "应用飞机编号": "3-2",
-                    "搜索扫视宽度": 0.02
-                }
-            ]
-        },
-        {
-            "任务信息": {
-                "任务名称": "海上搜救任务3",
-                "任务ID": "HSSJ3",
-                "任务主要类型": "航空搜救",
-                "任务类型": "海上搜救",
-                "任务触发器": "时间触发",
-                "下一个任务ID": "",
-                "目标点ID": 6,
-                "开始日期": "2024年6月4日",
-                "开始时间": "00时00分00秒",
-                "结束日期": "2024年6月6日",
-                "结束时间": "23时00分00秒",
-                "起飞准备时间": 600.0,
-                "任务结束条件": {
-                    "?结束条件": "注释: 执行2次/满足任务时间",
-                    "结束条件": "满足任务时间",
-                    "任务时间": 36000
-                }
-            },
-            "应用航空器": [
-                {
-                    "应用机型": "AW-189",
-                    "应用飞机编号": "4-1",
-                    "加油基地": "西昌航站",
-                    "加油基地编号": 4,
-                    "任务结束返回点": 4
-                }
-            ],
-            "战术战法": {
-                "战术战法": "多机跟进",
-                "跟进间距": 20,
-                "跟进高度差": 50
-            },
-            "运行约束":{
-                "搜索飞行速度限制": 150
-            },
-            "搜索任务载荷": [
-                {
-                    "任务载荷": "光电搜索",
-                    "应用飞机编号": "4-1",
-                    "光电转塔水平范围": 90,
-                    "红外探测器视场角": 60,
-                    "飞行高度": 2
-                }
-            ],
-            "搜索方式": [
-                {
-                    "搜索方式": "平行线搜索",
-                    "应用飞机编号": "4-1",
-                    "搜索扫视宽度": 0.02
-                }
-            ]
-        }
-    ],
-    "索滑降救援任务": [
-        {
-            "任务信息": {
-                "任务名称": "索滑降救援任务1",
-                "任务ID": "SHJJY1",
-                "任务主要类型": "航空搜救",
-                "任务类型": "索滑降救援",
-                "任务触发器": "时间触发",
-                "下一个任务ID": "",
-                "开始日期": "2024年6月4日",
-                "开始时间": "00时00分00秒",
-                "结束日期": "2024年6月6日",
-                "结束时间": "23时00分00秒",
-                "起飞准备时间": 600.0,
-                "任务结束条件": {
-                    "?结束条件": "注释：投送总人数=各个单机投送总人数之和",
-                    "结束条件": "满足投送总人数",
-                    "投送总人数": 5
-                }            
-            },
-            "应用航空器": [
-                {
-                    "应用机型": "AW-189",
-                    "应用飞机编号": "4-1",
-                    "加油基地": "西昌航站",
-                    "加油基地编号": 4,
-                    "任务结束返回点": 4
-                }
-            ],
-            "索滑降参数": [
-            {
-                    "应用飞机编号": "4-1",
-                    "索滑降高度": 200.0,
-                    "投送人数": 5,
-                    "风速": 5.0,
-                    "能见度": 5.0,
-                    "索滑降速度": 3.0,
-                    "索滑降点": [
-                    {
-                        "任务点经度": 100.9258,
-                        "任务点纬度": 30.0709,
-                        "任务点海拔": 3000.0
-                    }
-                    ]
-            }
-            ]
-        }
-      ],
-    "机降救援任务": [
-        {   
-            "任务信息": {
-                "任务名称": "机降救援任务1",
-                "任务ID": "JJJY1",
-                "任务主要类型": "航空搜救",
-                "任务类型": "机降救援",
-                "任务触发器": "时间触发",
-                "下一个任务ID": "",
-                "开始日期": "2024年6月4日",
-                "开始时间": "00时00分00秒",
-                "结束日期": "2024年6月6日",
-                "结束时间": "23时00分00秒",
-                "起飞准备时间": 600.0,
-                "任务结束条件": {
-                "?结束条件": "注释: 机降总人数=各个单机机降总人数之和",
-                "结束条件": "满足机降总人数",
-                "机降总人数": 10
-            }  
-          },
-          "应用航空器": [
-            {
-                "应用机型": "",
-                "应用飞机编号": "",
-                "加油基地": "",
-                "加油基地编号": "",
-                "任务结束返回点": ""
-            }
-          ],
-          "机降参数": [
-            {
-                "应用飞机编号": "",
-                "下机时间": 300.0,
-                "机降点": [
-                    {
-                        "任务点经度": 100.9258,
-                        "任务点纬度": 30.0709,
-                        "任务点海拔": 3000.0
-                    }
-                ]
-            }
-          ]
-        }
-    ],
-    "着水救援任务": [
-        {
-    
-            "任务信息": {
-                "任务名称": "着水救援任务1",
-                "任务ID": "ZSJY1",
-                "任务主要类型": "航空搜救",
-                "任务类型": "着水救援",
-                "任务触发器": "时间触发",
-                "下一个任务ID": "",
-                "开始日期": "2024年6月4日",
-                "开始时间": "00时00分00秒",
-                "结束日期": "2024年6月6日",
-                "结束时间": "23时00分00秒",
-                "起飞准备时间": 600.0,
-                "任务结束条件": {
-                    "结束条件": "满足救援人数",
-                    "救援人数": 10
-                } 
-            },
-            "应用航空器": [
-                {
-                    "应用机型": "AG600",
-                    "应用飞机编号": "",
-                    "加油基地": "",
-                    "加油基地编号": "",
-                    "任务结束返回点": ""
-                }
-            ],
-            "着水救援参数": [
-                {
-                    "应用飞机编号": "",
-                    "xx时间": 300.0,
-                    "着水点": [
-                        {
-                            "任务点经度": 100.9258,
-                            "任务点纬度": 30.0709,
-                            "任务点海拔": 3000.0
-                        }
-                    ]
-                }
-            ]
-        }
-      ],
-    "空投空送任务": [
-        {
-            "任务信息": {
-                "任务名称": "空投空送任务1",
-                "任务ID": "KTKS1",
-                "任务主要类型": "航空搜救",
-                "任务类型": "空投空送",
-                "任务触发器": "时间触发",
-                "下一个任务ID": "",
-                "开始日期": "2024年6月4日",
-                "开始时间": "00时00分00秒",
-                "结束日期": "2024年6月6日",
-                "结束时间": "23时00分00秒",
-                "起飞准备时间": 600.0,
-                "任务结束条件": {
-                    "结束条件": "满足空投物资重量",
-                    "空投物资重量": 100
-                } 
-            },
-            "应用航空器": [
-                {
-                    "应用机型": "",
-                    "应用飞机编号": "",
-                    "加油基地": "",
-                    "加油基地编号": "",
-                    "任务结束返回点": ""
-                }
-            ],
-            "空投空送参数": [
-                {
-                    "应用飞机编号": "",
-                    "xx时间": 300.0,
-                    "空投点": [
-                        {
-                            "任务点经度": 100.9258,
-                            "任务点纬度": 30.0709,
-                            "任务点海拔": 3000.0
-                        }
-                    ]
+                    "等高线高度间隔": 300,
+                    "最小等高线节点数": 1000,
+                    "航线真实高度": 200,
+                    "输出等高线节点间隔": 50
                 }
             ]
         }