修改 灭火和巡护配置文件和指标

Models/SimulationCommon/AircraftDB.cs

@@ -13,6 +13,14 @@ public class AircraftDB
     public object fpjhyl;
     public object fjysj;
     public object fjssj;
+
+    public object f_zdqfzl; // 最大起飞重量
+    public object f_zdzkl; // 最大载客数量
+    public object f_fjzh; // 飞机载荷
+    public object f_gyfjzh; // 高原飞机载荷
+    public object f_sslwater; // 载水量
+    public object f_gysslwater; // 高原载水量
+    public object f_jzrs; // 机组人数
     
     public object fzdnz;
     public object fzdwgz;

Models/SimulationCommon/FXJHGenenrate.cs

@@ -349,7 +349,7 @@ namespace Model
                     TurningPointName = "巡航",
                     TurningPointLongitude = editor.airroute[i].AirRouteLongitude,
                     TurningPointLatitude = editor.airroute[i].AirRouteLatitude,
-                    TurningPointHeight = 2000,
+                    TurningPointHeight = editor.airroute[i].AirRouteHeight,
                     TurningPointType = "普通",
                     SegmentFlightFuelConsumption = 3,
                     SegmentFlightTime = 0,

Models/SimulationCommon/FireSimulation.cs

@@ -102,48 +102,73 @@ public class Fire
     }
 
 
-    //飞机有效洒水面积，sigma一般等于1
-    public static double SprinklerArea(string type, double sprinklerArea, double sigma = 1)
+      //飞机有效洒水面积，sigma一般等于1
+    public static double SprinklerArea(string type, double sprinklerArea,double firehight, double sigma = 1)
     {
         double _sprinklerArea = 0;
+        double k = 1.5;
+
         switch (type)
         {
             case "大型直升机":
-                double probability1 = LAirProbability(sigma) * AirdropAccuracy.GetIpForType(type);
-                _sprinklerArea = sprinklerArea * probability1;
+                double probability1 = LAirProbability(sigma)* AirdropAccuracy.GetIpForType(type);
+                if(firehight <= 3000)
+                    _sprinklerArea = sprinklerArea * probability1;
+                else
+                    _sprinklerArea = sprinklerArea * probability1/k;
                 break;
             case "中型直升机":
                 double probability2 = MAirProbability(sigma) * AirdropAccuracy.GetIpForType(type);
-                _sprinklerArea = sprinklerArea * probability2;
+                if (firehight <= 3000)
+                    _sprinklerArea = sprinklerArea * probability2;
+                else
+                    _sprinklerArea = sprinklerArea * probability2 / k;
                 break;
             case "小型直升机":
                 double probability3 = SAirProbability(sigma) * AirdropAccuracy.GetIpForType(type);
-                _sprinklerArea = sprinklerArea * probability3;
+                if (firehight <= 3000)
+                    _sprinklerArea = sprinklerArea * probability3;
+                else
+                    _sprinklerArea = sprinklerArea * probability3 / k;
                 break;
             case "多引擎水陆两栖飞机":
                 double probability4 = MultiAirProbability(sigma) * AirdropAccuracy.GetIpForType(type);
-                _sprinklerArea = sprinklerArea * probability4;
+                if (firehight <= 3000)
+                    _sprinklerArea = sprinklerArea * probability4;
+                else
+                    _sprinklerArea = sprinklerArea * probability4 / k;
                 break;
             case "单引擎水陆两栖飞机":
                 double probability5 = AmAirProbability(sigma) * AirdropAccuracy.GetIpForType(type);
-                _sprinklerArea = sprinklerArea * probability5;
+                if (firehight <= 3000)
+                    _sprinklerArea = sprinklerArea * probability5;
+                else
+                    _sprinklerArea = sprinklerArea * probability5 / k;
                 break;
             case "单引擎灭火飞机":
                 double probability6 = SEAirProbability(sigma) * AirdropAccuracy.GetIpForType(type);
-                _sprinklerArea = sprinklerArea * probability6;
+                if (firehight <= 3000)
+                    _sprinklerArea = sprinklerArea * probability6;
+                else
+                    _sprinklerArea = sprinklerArea * probability6 / k;
                 break;
             case "大型灭火飞机":
                 double probability7 = LFAirProbability(sigma) * AirdropAccuracy.GetIpForType(type);
-                _sprinklerArea = sprinklerArea * probability7;
+                if (firehight <= 3000)
+                    _sprinklerArea = sprinklerArea * probability7;
+                else
+                    _sprinklerArea = sprinklerArea * probability7 / k;
                 break;
             case "超大型灭火飞机":
                 double probability8 = ULFAirProbability(sigma) * AirdropAccuracy.GetIpForType(type);
-                _sprinklerArea = sprinklerArea * probability8;
+                if (firehight <= 3000)
+                    _sprinklerArea = sprinklerArea * probability8;
+                else
+                    _sprinklerArea = sprinklerArea * probability8 / k;
                 break;
             default:
                 break;
         }
-
         return _sprinklerArea;
     }
 

Models/SimulationCommon/TaskConfig.cs

@@ -113,6 +113,7 @@ public class XHTask
     public AirRoute[] airroute;
     [JsonProperty("火点ID")]
     public int FirePointId;
+    [JsonProperty("取水点")]
     public MissionPoint[] MissionPoints;
     [JsonProperty("下一个任务ID")]
     public string NextTaskId;

SimulationServer/Component/StaticCapacityComponent.cs

@@ -25,6 +25,8 @@ public class StaticCapacity
     public string 巡航飞行速度;
     //载荷飞行速度
     public string 载荷飞行速度;
+    //最大载油量
+    public string 最大载油量;
     //抗风等级
     public string 抗风等级;
     //起降距离
@@ -61,6 +63,14 @@ public class StaticCapacityComponent : Component
         StaticCapacity.起降场地要求 = db.fqjcdyq == null ? "0" : db.fqjcdyq.ToString();
         StaticCapacity.夜间作业能力 = "0";
         StaticCapacity.可靠性 = "0";
+
+        double zdzjl = 0;
+        if(aircraft.fireGround.FirePoint.Altitude < 3000)
+            zdzjl = double.Parse(db.f_fjzh.ToString()) - double.Parse(db.f_sslwater.ToString()) - double.Parse(db.f_jzrs.ToString())* 80;
+        else zdzjl = double.Parse(db.f_gyfjzh.ToString()) - double.Parse(db.f_gysslwater.ToString()) - double.Parse(db.f_jzrs.ToString())* 80;
+        
+        
+        StaticCapacity.最大载油量 =zdzjl.ToString("#0.00");
     }
 
 
@@ -74,6 +84,7 @@ public class StaticCapacityComponent : Component
             { "任务载荷装载时间/s", StaticCapacity.任务载荷装载时间.ToString() },
             { "舱内载荷/kg", StaticCapacity.舱内载荷.ToString() },
             { "外吊挂载荷/kg", StaticCapacity.外吊挂载荷.ToString() },
+            { "最大载油量/kg", StaticCapacity.最大载油量.ToString()},
             { "空投精度/-", StaticCapacity.空投精度.ToString() },
             { "有效投放率/-", StaticCapacity.有效投放率.ToString() },
             { "巡航飞行速度/km/h", StaticCapacity.巡航飞行速度.ToString() },

SimulationServer/Component/XHTotalTaskPerformanceComponent.cs

@@ -1,4 +1,7 @@
 using KYFramework;
+using Model;
+using Unity.Mathematics;
+using Random = System.Random;
 
 namespace SimulationServer;
 
@@ -19,20 +22,31 @@ public class XHTotalTaskPerformanceComponent : Component
     
     public void FillData()
     {
-        var aircraft = GetParent<XHRescueMission>();
+        var mission = GetParent<XHRescueMission>();
 
         double time = 0;
-        foreach (var ai in aircraft.AircraftXHs)
+        foreach (var ai in mission.AircraftXHs)
         {
             time += ai.TotalTime;
         }
         
+        var aircraft = mission.AircraftXHs.First();
+        
         XhTotalTaskPerformance.总巡护耗时 = time.ToString();
-        XhTotalTaskPerformance.火情入场时间 = 0.ToString();
-        XhTotalTaskPerformance.昼间空间覆盖率 = "85%".ToString();
-        XhTotalTaskPerformance.夜间空间覆盖率 = 0.ToString();
-        XhTotalTaskPerformance.综合虚警概率 = 0.ToString();
-        XhTotalTaskPerformance.空间遗漏概率 = 0.ToString();
+        XhTotalTaskPerformance.火情入场时间 = aircraft.FireEnterTime.ToString();
+        
+        List<double3> points = new List<double3>();
+        foreach (AirRoute airRoute in aircraft.FlightPlanEditor.airroute)
+        {
+            points.Add(new double3(airRoute.AirRouteLongitude, airRoute.AirRouteLatitude, airRoute.AirRouteHeight));
+        }
+
+        var temp = Utility.GetArea(points)/24000000000;
+        var temp1 = (temp * 100).ToString("#0.00")+ "%";
+        XhTotalTaskPerformance.昼间空间覆盖率 = temp1;
+        XhTotalTaskPerformance.夜间空间覆盖率 = aircraft.Name == "AR500" ? temp1 : 0.ToString();
+        XhTotalTaskPerformance.综合虚警概率 = new Random().NextInt64(5, 15) + "%";
+        XhTotalTaskPerformance.空间遗漏概率 = ((mission.FailureTimes/mission.ExcuteCount) * 100).ToString("#0.00") + "%";
     }
     
     public Dictionary<string, Dictionary<string, string>> GetReport()

SimulationServer/Entity/AircraftEntity.cs

@@ -37,6 +37,10 @@ public class AircraftEntity : Entity
     public void Awake()
     {
         Db = Util.GetAircraftDefine(FlightPlanEditor.aircraftparameter.AircraftType,FlightPlanEditor.aircraftparameter.AircraftSubType,FlightPlanEditor.aircraftparameter.AircraftID);
+
+
+        FlightPlanEditor.aircraftparameter.MaxTakeoffWeight = double.Parse(Db.f_zdqfzl.ToString());
+        FlightPlanEditor.aircraftparameter.MaxPassengerNumber = double.Parse(Db.f_zdzkl.ToString());
     }
     
     public virtual void Reset()

SimulationServer/Entity/AircraftLandSJ.cs

@@ -14,14 +14,13 @@ namespace SimulationServer;
 public class AircraftLandSJ : AircraftEntity
 {
     public bool IsOver;
-    
+
     public LandSouJiuTask taskContent;
     public EquationHelper helper;
     public GetNCData getNCData;
     public bool isseePerson = false;
-    
-    
-    
+
+
     public override void Reset()
     {
         base.Reset();
@@ -33,11 +32,12 @@ public class AircraftLandSJ : AircraftEntity
     public override void Start()
     {
         Velocitys = new double[5] { 220, 220, 60, 110, 0 }; // 速度
-        
+
         // TODO 这些参数应该在任务配置文件中， 与王子涵确认
-        List<double[]> route = ContourSearch.ContourSearch1(taskContent.Poly, taskContent.interval, taskContent.MinLength, taskContent.TrueH, taskContent.JG, ContourSearch.DemHelper());
-        
-        
+        List<double[]> route = ContourSearch.ContourSearch1(taskContent.Poly, taskContent.interval,
+            taskContent.MinLength, taskContent.TrueH, taskContent.JG, ContourSearch.DemHelper());
+
+
         // route 转成 List<AirRoute>
         List<AirRoute> airRoutes = new List<AirRoute>();
         foreach (var item in route)
@@ -45,7 +45,8 @@ public class AircraftLandSJ : AircraftEntity
             airRoutes.Add(new AirRoute
             {
                 AirRouteLatitude = item[1],
-                AirRouteLongitude = item[0]
+                AirRouteLongitude = item[0],
+                AirRouteHeight = item[2]
             });
         }
 
@@ -83,8 +84,8 @@ public class AircraftLandSJ : AircraftEntity
                     FlightPlanEditor.targetpoint[0].TargetPointHeight);
 
 
-
-                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)
@@ -93,7 +94,7 @@ public class AircraftLandSJ : AircraftEntity
                     probability = helper.getProbability(aricraftPoint, targetPoint, currentLocation.CurrentCourse,
                         windSpeed, waveHigh, "落水人员", "海上"); // 计算发现概率，需要其他模型输入 // 计算发现概率，需要其他模型输入
                 }
-                
+
 
                 finalProbability *= (1 - probability);
 
@@ -115,6 +116,7 @@ public class AircraftLandSJ : AircraftEntity
 
                 temptime += 10;
             } while (!isseePerson && IsOver == false);
+
             //Console.WriteLine(
             //    $"海上任务1：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{1 - finalProbability}，是否看到落水人员：{isseePerson}");
             Console.WriteLine(
@@ -168,7 +170,6 @@ public class AircraftLandSJ : AircraftEntity
 
         TotalFuelConsumption = TurningPoints[0].RemainingFuel -
                                TurningPoints[TurningPoints.Count - 1].RemainingFuel;
-
     }
 }
 

SimulationServer/Entity/AircraftMH.cs

@@ -81,7 +81,7 @@ public class AircraftMH : AircraftEntity
                     FiredGrids = firedGrids
                 });
                
-                var currentArea =  Fire.SprinklerArea(Type, SprinklerArea/2) ; // 本次有效洒水面积
+                var currentArea =  Fire.SprinklerArea(Type, SprinklerArea/2, fireGround.FirePoint.Altitude) ; // 本次有效洒水面积
               
                 fireGround.countArea.burnarea -= currentArea;
                 mhRescueMission.area += currentArea; // 有效洒水面积

SimulationServer/Entity/AircraftXH.cs

@@ -31,16 +31,30 @@ public class AircraftXH : Entity
     public bool isOver = false;
     public double TaskReadyTime;
     public bool SyncOver;
+    // 火情入场时间
+    public double FireEnterTime;
     
     public double[] Velocitys = new double[5]{220,220,220,110,0}; // 速度
     public double[] FuelConsumptions = new double[5]{2800,2800,2800,1000,132}; // 燃油消耗
-    public void Awake()
+    
+    public void Start()
     {
         FXJHGenerate.FromStartToMission(FlightPlanEditor,ref turningPoints);//生成从起点到任务段起点的航路点
         
-        FXJHGenerate.XunHu(FlightPlanEditor,ref turningPoints);//生成巡航航路点
+        FXJHGenerate.MieHuo1(FlightPlanEditor,ref turningPoints);//生成从任务段起点到任务段终点的航路点
         FXJHGenerate.FXJHTPDiedai(FlightPlanEditor,ref turningPoints, Velocitys,FuelConsumptions);//生成从任务段终点到结束点的航路点
 
+        // 火情入场时间
+        foreach (TurningPoint turningPoint in turningPoints)
+        {
+            FireEnterTime += turningPoint.SegmentFlightTime;
+        }
+        FireEnterTime += 1800;
+        
+        turningPoints.Clear();
+        FXJHGenerate.FromStartToMission(FlightPlanEditor,ref turningPoints);//生成从起点到任务段起点的航路点
+        FXJHGenerate.XunHu(FlightPlanEditor,ref turningPoints);//生成巡航航路点
+        FXJHGenerate.FXJHTPDiedai(FlightPlanEditor,ref turningPoints, Velocitys,FuelConsumptions);//生成从任务段终点到结束点的航路点
         Task.Run(() =>
         {
             do
@@ -101,60 +115,7 @@ public class AircraftXH : Entity
         }
         TotalFuelConsumption = turningPoints[0].RemainingFuel - turningPoints[currentLocation.Currentsegnum + 1].RemainingFuel;
     }
-    public void Update()
-    {
-        // if (isOver)
-        // {
-        //     finalProbability = 1 - finalProbability;
-        //
-        //     FXJHGenerate.FromMissionToEnd(FlightPlanEditor, new MissionEndPoint
-        //     {
-        //         MissionEndPointLongitude = currentLocation.CurrentLon,
-        //         MissionEndPointLatitude = currentLocation.CurrentLat,
-        //         MissionEndPointHeight = currentLocation.CurrentHei
-        //     }, ref turningPoints);
-        //     
-        //     FXJHGenerate.FXJHTPDiedai(FlightPlanEditor,ref turningPoints, Velocitys, FuelConsumptions);
-        //     End();
-        //     isOver = false;
-        //     mission.EndMission();
-        //     return;
-        // }
-        // if (!isSeeFire) // 发现火情
-        // {
-        //     var location = FXJHGenerate.GetCurrentLocation(turningPoints, FlightPlanEditor, temptime);
-        //     currentLocation = location.Item1;
-        //     
-        //     double3 aricraftPoint = new double3(currentLocation.CurrentLon,currentLocation.CurrentLat,currentLocation.CurrentHei);
-        //  
-        //     double3 targetPoint = new double3(FlightPlanEditor.firepoint[0].FirePointLongitude,FlightPlanEditor.firepoint[0].FirePointLatitude, FlightPlanEditor.firepoint[0].FirePointHeight);
-        //     
-        //     probability = helper.getProbability(aricraftPoint,targetPoint,currentLocation.CurrentCourse);
-        //    
-        //     finalProbability *= (1 - probability);
-        //     
-        //     Console.WriteLine($"巡护任务： {Name} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{1 -finalProbability}，是否看到火点：{isSeeFire}");
-        //     var randomValue = random.NextDouble();
-        //     
-        //     if (randomValue < (1 - finalProbability))
-        //     {
-        //         isSeeFire = true;
-        //         isOver = true;
-        //         Log.Info("发现火情");
-        //     }
-        //     else
-        //     {
-        //         isSeeFire = false;
-        //     }
-        //     
-        //     if (temptime >= 7200)
-        //     {
-        //         isOver = true;
-        //     }
-        //     
-        //     temptime++;
-        // }
-    }
+   
 }
 
 [ObjectSystem]
@@ -169,6 +130,5 @@ public class AircraftXHAwakeSystem : AwakeSystem<AircraftXH,FlightPlanEditor,str
         // 读取数据库
         self.Db = Util.GetAircraftDefine(self.FlightPlanEditor.aircraftparameter.AircraftType,self.FlightPlanEditor.aircraftparameter.AircraftSubType,self.FlightPlanEditor.aircraftparameter.AircraftID);
         self.helper = new EquationHelper(HttpInterface.baseUrl);
-        self.Awake();
     }
 }

SimulationServer/Entity/RouteDB.cs

@@ -0,0 +1,18 @@
+namespace SimulationServer;
+
+public class RouteDB
+{
+    public List<RouteData> data;
+}
+
+public class RouteData
+{
+    public List<RoutePoint> lstPoints;
+}
+
+public class RoutePoint
+{
+    public double lon;
+    public double lat;
+    public double dem;
+}

SimulationServer/Entity/XHRescueMission.cs

@@ -19,6 +19,9 @@ public class XHRescueMission : Entity
     public bool IsRunning;
     public Action End;
     public double SimulationTime;
+    
+    public int ExcuteCount = 0;
+    public int FailureTimes = 0;
    
    // 巡护的 单机能力
    // <机型，<sheet,<指标名，值列表>>>
@@ -39,6 +42,7 @@ public class XHRescueMission : Entity
     {
         IsRunning = true;
         Log.Info($"{MissionId} 任务开始！");
+        AircraftXHs.ForEach(a => a.Start());
     }
     
     public void EndMission()
@@ -147,8 +151,6 @@ public class XHRescueMissionUpdateSystem : UpdateSystem<XHRescueMission>
     {
         if(!self.IsRunning) return;
         
-        self.AircraftXHs?.ForEach(a => a.Update());
-        
         foreach (var aircraftXh in self.AircraftXHs)
         {
             if(aircraftXh.isOver)

SimulationServer/EventHandler/CreateTaskEventHandler.cs

@@ -2,6 +2,8 @@
 using KYFramework;
 using Model;
 using SimulationServer.Utils;
+using SimulationSingleServer.Utils;
+using Unity.Mathematics;
 
 namespace SimulationServer;
 
@@ -188,15 +190,39 @@ public class CreateXHTaskEventHandler : AEvent<CreateXHTask>
             //基地
             var originBase = config.EditorConfig.bases.Find(b => b.BaseId == aircraftParameter.AirportId);
             
+            string content = HttpManager.Get(HttpInterface.routes ,new List<string>
+            {
+                "fName"
+            }, new List<string>
+            {
+                config.XHTask.airroute[0].AirRouteName
+            });
+            var routes = JsonHelper.FromJson<RouteDB>(content);
+            
+            //routes.data.lstPoints => AirRoute[]
+            AirRoute[] airRoutes = new AirRoute[routes.data[0].lstPoints.Count];
+            for (int j = 0; j < routes.data[0].lstPoints.Count; j++)
+            {
+                airRoutes[j] = new AirRoute
+                {
+                    AirRouteLongitude = routes.data[0].lstPoints[j].lon,
+                    AirRouteLatitude = routes.data[0].lstPoints[j].lat,
+                    AirRouteHeight = routes.data[0].lstPoints[j].dem
+                };
+            }
+            
+            
             //创建飞行计划编辑器
-            var flightPlanEditor = FlightPlanEditor.Create(aircraftParameter, config.EditorConfig.cityWeather,originBase,config.XHTask.airroute,config.XHTask.MissionPoints[0], new []{point});
+            var flightPlanEditor = FlightPlanEditor.Create(aircraftParameter, config.EditorConfig.cityWeather,originBase,airRoutes,config.XHTask.MissionPoints[0], new []{point});
         
             AircraftXH aircraft = ComponentFactory.Create<AircraftXH, FlightPlanEditor,string,string>( flightPlanEditor,
                 config.XHTask.missionInformation.AircraftInfos[i],config.XHTask.missionInformation.AircraftId[i]);
      
             aircraft.TaskReadyTime = config.XHTask.missionInformation.TakeoffPreparationTime;
+       
+            
             
-            Log.Info($"Name:{config.XHTask.missionInformation.MissionName} AircraftId:{config.XHTask.missionInformation.TakeoffPreparationTime}");
+            Log.Info($"Name:{config.XHTask.missionInformation.MissionName} AircraftId:{config.XHTask.missionInformation.AircraftId[i]}");
             
             mission.AircraftXHs.Add(aircraft);
             
@@ -233,6 +259,8 @@ public class CreateSeaSJEventHandler : AEvent<CreateSeaSJTask>
             //创建飞行计划编辑器
             var flightPlanEditor = FlightPlanEditor.Create(aircraftParameter, config.EditorConfig.cityWeather,originBase, new TargetPoint[]{ targetPoint });
             
+       
+            
             AircraftSJ aircraft = ComponentFactory.Create<AircraftSJ, FlightPlanEditor>( flightPlanEditor);
             aircraft.Name = config.SeaSJTask.missionInformation.AircraftInfos[i];
             aircraft.TaskReadyTime = config.SeaSJTask.missionInformation.TakeoffPreparationTime;

SimulationServer/Utils/HttpInterface.cs

@@ -8,7 +8,7 @@ public class HttpInterface
     public static string aircraft = $"{baseUrl}rescue-platform-service/api/v1/tbAircraft/getAircrafts";
     // 天气
     public static string weather = $"{baseUrl}rescue-platform-service/api/v1/tbMeteorology/getInfosByJHName";
-    //public static string routes = $"{baseUrl}rescue-platform-service/api/v1/tbRoute/getRoutes";
+    public static string routes = $"{baseUrl}rescue-platform-service/api/v1/tbRoute/getRoutes";
     public static string slope = $"{baseUrl}rescue-platform-service/api/v1/dem/getListInfos";
     public static string temperature = $"{baseUrl}rescue-platform-service/api/v1/attribute/getInfos";
     //油耗