完成灭火单次

SimulationServer/Entity/AircraftMH.cs

@@ -43,6 +43,9 @@ public class AircraftMH : Entity ,IAircraft
 
     public void Awake()
     {
+        EffMisTime = 0;
+        FirstTime = 0;
+        turningPoints = new TurningPoint[2000];
         for (int i = 0; i < turningPoints.Length; i++)
         {
             turningPoints[i] = new TurningPoint();
@@ -53,8 +56,6 @@ public class AircraftMH : Entity ,IAircraft
         waterTimes = 1;
         turningPoints = FXJHGenerate.FromStartToMission(FlightPlanEditor,turningPoints);//生成从起点到任务段起点的航路点
         
-  
-        
         // 计算出第一次洒水的时间
         turningPoints = FXJHGenerate.MieHuo1(FlightPlanEditor, turningPoints, PointNumberIcon);
             
@@ -90,10 +91,10 @@ public class AircraftMH : Entity ,IAircraft
         var wind_temp = Weather.day_wind_comp.Replace("级", "").Split('-');
         
         wind = double.Parse(wind_temp[0]);
-        
-        Log.Info("风速：" + wind);
-        Log.Info("Type:" + Type);
-        Log.Info("SprinklerArea:" + SprinklerArea);
+        waterInterval = 4;
+        // Log.Info("风速：" + wind);
+        // Log.Info("Type:" + Type);
+        // Log.Info("SprinklerArea:" + SprinklerArea);
     }
 
     public void End()
@@ -121,12 +122,12 @@ public class AircraftMH : Entity ,IAircraft
                 _fireGround.countArea = Fire.burnCalculate(wind, slope, T, _fireGround.countArea.burnarea, T, _rescueMission.tn , _fireGround.countArea.burnarea);
                 var currentArea =  Fire.SprinklerArea(Type, SprinklerArea) ; // 本次有效洒水面积
               
-                Log.Info("fireGround.countArea.burnarea: " + _fireGround.countArea.burnarea);
-                Log.Info("currentArea: " + currentArea);
+                // Log.Info("fireGround.countArea.burnarea: " + _fireGround.countArea.burnarea);
+                // Log.Info("currentArea: " + currentArea);
                 
                 _fireGround.countArea.burnarea -= currentArea;
                 area += currentArea; // 有效洒水面积
-                Log.Info($"任务 {TaskName }  {Name} 洒水{waterTimes} 次  本次有效洒水面积 {currentArea}  用时 {T}  area {area}  burnarea {_fireGround.countArea.burnarea}");
+                //Log.Info($"任务 {TaskName }  {Name} 洒水{waterTimes} 次  本次有效洒水面积 {currentArea}  用时 {T}  area {area}  burnarea {_fireGround.countArea.burnarea}");
                 
                 _rescueMission.tn = T;
                 PointNumberIcon += 2;

SimulationServer/Entity/AircraftMHWithPersion.cs

@@ -76,20 +76,20 @@ public class AircraftMHWithPersion : Entity ,IAircraft
         double distance = GetDistance(FlightPlanEditor.missionpoint.MissionPointLongitude, FlightPlanEditor.firepoint[0].FirePointLongitude, FlightPlanEditor.missionpoint.MissionPointLatitude, FlightPlanEditor.firepoint[0].FirePointLatitude);
         double TravelTime = distance / TravelSpeed * 3600;
         
-        Log.Info("距离：" + distance);
+        //Log.Info("距离：" + distance);
         
-        Log.Info($"起飞准备时间： {FlightPlanEditor.aircraftparameter.TakeoffPreparationTime}");
+        //Log.Info($"起飞准备时间： {FlightPlanEditor.aircraftparameter.TakeoffPreparationTime}");
         InterventionTime = FlightPlanEditor.aircraftparameter.TakeoffPreparationTime + TravelTime ;
         
-        Log.Info($"人走到火场的时间： {InterventionTime}");
+        //Log.Info($"人走到火场的时间： {InterventionTime}");
         
         for (int i = 0;i < TransportNumber;i ++)
         {
-            Log.Info($"飞行时间{i}： {turningPoints[i].SegmentFlightTime}");
+            //Log.Info($"飞行时间{i}： {turningPoints[i].SegmentFlightTime}");
             InterventionTime += turningPoints[i].SegmentFlightTime;
         }
         
-        Log.Info($"介入时间 {InterventionTime}");
+        //Log.Info($"介入时间 {InterventionTime}");
 
         InterventionNumber = LandingPersonnel + GroundPersonnel;
         T = InterventionTime;
@@ -121,17 +121,17 @@ public class AircraftMHWithPersion : Entity ,IAircraft
             //Log.Info(T.ToString());
             if (time > T)
             {
-                Log.Info("洒水之前火场面积：" + _fireGround.countArea.burnarea);
-                Log.Info("时间差：" + (_rescueMission.tn - T));
+                //Log.Info("洒水之前火场面积：" + _fireGround.countArea.burnarea);
+                //Log.Info("时间差：" + (_rescueMission.tn - T));
                 // 开始洒水
                 _fireGround.countArea = Fire.burnCalculate(wind, slope, T, _fireGround.countArea.burnarea, T, _rescueMission.tn, _fireGround.countArea.burnarea);
                 var currentArea = Fire.groundPersonnelWater(InterventionNumber);
-                Log.Info("洒水之后火场面积：" + _fireGround.countArea.burnarea);
+                //Log.Info("洒水之后火场面积：" + _fireGround.countArea.burnarea);
                 _fireGround.countArea.burnarea -= currentArea;
                 _rescueMission.tn = T;
                 area += currentArea; // 有效洒水面积
             
-                Log.Info($"任务 {TaskName} 地面灭火 洒水{waterTimes} 次  本次有效洒水面积 {currentArea}   用时 {T}  area {area} burnarea {_fireGround.countArea.burnarea}");
+                //Log.Info($"任务 {TaskName} 地面灭火 洒水{waterTimes} 次  本次有效洒水面积 {currentArea}   用时 {T}  area {area} burnarea {_fireGround.countArea.burnarea}");
                 waterTimes++;
                 
                 T +=  Frequency;//飞机开始飞到火场 需要多少时间 t

SimulationServer/Entity/AircraftXH.cs

@@ -74,7 +74,7 @@ public class AircraftXH : Entity
             }, turningPoints, currentLocation.Currentsegnum);
             
             turningPoints = FXJHGenerate.FXJHTPDiedai(FlightPlanEditor, turningPoints, currentLocation.Currentsegnum + 2);
-            
+            isOver = false;
             return;
         }
         if (!isSeeFire) // 发现火情

SimulationServer/Entity/FireGround.cs

@@ -4,22 +4,9 @@ namespace SimulationServer;
 
 public class FireGround : Entity
 {
-    public Fire.CountArea countArea;
+    public Fire.CountArea countArea = new Fire.CountArea();
     //火点列表
     public DVector FirePoint;
-
-    public void Awake()
-    {
-        countArea = new Fire.CountArea();
-    }
 }
 
-[ObjectSystem]
-public class FireGroundAwakeSystem : AwakeSystem<FireGround>
-{
-    public override void Awake(FireGround self)
-    {
-       self.Awake();
-    }
-}
 

SimulationServer/Entity/RescueMission.cs

@@ -12,10 +12,11 @@ public class RescueMission : Entity
     public double SimTime;
     // 倍速
     public double Speed = 1000;
-    
+
+    public double InitArea;
     //执行次数
     public int ExecuteCount = 2;
-    private int currentExecuteCount = 0;
+    private int currentExecuteCount = 1;
     
     public string MissionType; // 任务类型
     
@@ -39,8 +40,6 @@ public class RescueMission : Entity
    Dictionary<string,Dictionary<string,Dictionary<string,List<string>>>> singleReport =
         new Dictionary<string, Dictionary<string, Dictionary<string, List<string>>>>();
    
-   
-   
    // 巡护的 单机能力
    // <机型，<sheet,<指标名，值列表>>>
    Dictionary<string,Dictionary<string,Dictionary<string,List<string>>>> singleXHReport =
@@ -57,20 +56,24 @@ public class RescueMission : Entity
     public void Start()
     {
         IsRunning = true;
+        SimTime = 0;
         Aircrafts?.ForEach(a => a.Start(FireGround, this));
         AircraftWithPersions?.ForEach(a => a.Start(FireGround,this));
-        
-        Log.Info($"{MissionId} 任务开始！");
-        
-        
+        aircrafts.Clear();
         aircrafts.AddRange(Aircrafts);
         aircrafts.AddRange(AircraftWithPersions);
+
+        if (FireGround != null)
+        {
+            FireGround.countArea = new Fire.CountArea() { burnarea = InitArea};
+        }
+        Log.Info($"{MissionId} 任务开始！");
     }
     
     public void EndMission()
     {
         IsRunning = false;
-        Log.Info($"任务结束！");
+        Log.Info($"{MissionId} 任务结束！");
         // 灭火完成 任务结束
         End?.Invoke();
         
@@ -82,14 +85,16 @@ public class RescueMission : Entity
         else
         {
             SaveXH();
+            ReportXH();
         }
         
-        // // 输出或保存报告
-        // if(currentExecuteCount < ExecuteCount)
+        // 输出或保存报告
+        // if(currentExecuteCount <= ExecuteCount)
         // {
         //     if(MissionType == "灭火")
         //     {
         //         SaveMH();
+        //         Log.Info("保存任务数据");
         //     }
         //     else
         //     {
@@ -106,7 +111,6 @@ public class RescueMission : Entity
         //     {
         //         ReportXH();
         //     }
-        //     
         //     return;
         // }
         
@@ -143,8 +147,7 @@ public class RescueMission : Entity
             {
                 singleReport[aircraftMh.Name] = new Dictionary<string, Dictionary<string, List<string>>>();
             }
-
-            // 1次的报告
+           
             Dictionary<string, Dictionary<string, string>> staticReport = staticCapacity.GetReport();
             foreach (var kv in staticReport)
             {
@@ -267,14 +270,17 @@ public class RescueMission : Entity
     public void ReportMH()
     {
         string data = DateTime.Now.ToString("yyyy-MM-dd");
-        if(Directory.Exists("Reports/MH")) Directory.CreateDirectory("Reports/MH");
-        Directory.CreateDirectory("Reports/MH/" + data);
+        
+        string path = $"Reports/MH/{data}/{MissionId}";
+        
+        if(!Directory.Exists(path)) Directory.CreateDirectory(path);
+       
         foreach (var kv in singleReport)
         {
-            string path = $"Reports/MH/{data}/{kv.Key}灭火任务单机指标报告.xls";
-            DataTableExtensions.SaveToExcel(path, kv.Value);
+            string filePath = $"{path}/{kv.Key}灭火任务单机指标报告.xls";
+            DataTableExtensions.SaveToExcel(filePath, kv.Value);
         }
-        string totalPath = $"Reports/MH/{data}/{"灭火任务总体指标报告"}.xls";
+        string totalPath = $"{path}/{"灭火任务总体指标报告"}.xls";
         // TODO 算出 成功率
         
         DataTableExtensions.SaveToExcel(totalPath, totalReport);
@@ -283,14 +289,14 @@ public class RescueMission : Entity
     public void ReportXH()
     {
         string data = DateTime.Now.ToString("yyyy-MM-dd");
-        if(Directory.Exists("Reports/XH")) Directory.CreateDirectory("Reports/XH");
-        Directory.CreateDirectory("Reports/XH/" + data);
+        string path = $"Reports/XH/{data}/{MissionId}";
+        if(!Directory.Exists(path)) Directory.CreateDirectory(path);
         foreach (var kv in singleReport)
         {
-            string path = $"Reports/XH/{data}/{kv.Key}巡护任务单机指标报告.xls";
-            DataTableExtensions.SaveToExcel(path, kv.Value);
+            string filePath = $"{path}/{kv.Key}巡护任务单机指标报告.xls";
+            DataTableExtensions.SaveToExcel(filePath, kv.Value);
         }
-        string totalPath = $"Reports/{data}/{"巡护任务总体指标报告"}.xls";
+        string totalPath = $"{path}/{"巡护任务总体指标报告"}.xls";
         DataTableExtensions.SaveToExcel(totalPath, totalXhReport);
     }
 }
@@ -301,6 +307,7 @@ public class RescueMissionUpdateSystem : UpdateSystem<RescueMission>
     public override void Update(RescueMission self)
     {
         if(!self.IsRunning) return;
+        if(self.FireGround == null) return;
         if (self.FireGround.countArea.burnarea <= 0)
         {
             self.Success = true;

SimulationServer/EventHandler/ServerStartEventHandler.cs

@@ -57,12 +57,12 @@ public class ServerStartEventHandler : AEvent<ServerStart>
             double slope = Util.GetSlope(editorConfig.firePoints[mHTaskConfig.FirePointId - 1].FirePointLongitude,
                 editorConfig.firePoints[mHTaskConfig.FirePointId - 1].FirePointLatitude, 30);
             FireGround fireGround = ComponentFactory.Create<FireGround>();
-            fireGround.countArea.burnarea = editorConfig.firePoints[mHTaskConfig.FirePointId - 1].InitialArea;
-            
+            mission.FireGround = fireGround;
+            mission.InitArea = editorConfig.firePoints[mHTaskConfig.FirePointId - 1].InitialArea;
             Log.Info("初始火场面积：" + fireGround.countArea.burnarea);
             fireGround.FirePoint = new DVector { Latitude = editorConfig.firePoints[mHTaskConfig.FirePointId - 1].FirePointLatitude,
                 Longitude = editorConfig.firePoints[mHTaskConfig.FirePointId - 1].FirePointLongitude,Altitude = editorConfig.firePoints[mHTaskConfig.FirePointId - 1].FirePointHeight};
-            mission.FireGround = fireGround;
+            
             
             foreach (MHTask mhTask in mHTaskConfig.mHTask)
             {
@@ -133,7 +133,6 @@ public class ServerStartEventHandler : AEvent<ServerStart>
 
             foreach (SHJTask shjTask in mHTaskConfig.sHJTask)
             {
-                Log.Info(shjTask.ToJson());
                 if(shjTask.missionInformation.AircraftInfos == null) continue;
                 for (int i = 0; i < shjTask.missionInformation.AircraftInfos.Length; i++)
                 {
@@ -173,7 +172,7 @@ public class ServerStartEventHandler : AEvent<ServerStart>
                 Longitude = editorConfig.firePoints[zcTask.FirePointId - 1].FirePointLongitude,
                 Altitude = editorConfig.firePoints[zcTask.FirePointId - 1].FirePointHeight
             };
-            mission.FireGround = fireGround;
+            mission.InitArea = editorConfig.firePoints[zcTask.FirePointId - 1].InitialArea;
             if(zcTask.missionInformation.AircraftInfos == null) continue;
             for (int i = 0; i < zcTask.missionInformation.AircraftInfos.Length; i++)
             {
@@ -209,14 +208,14 @@ public class ServerStartEventHandler : AEvent<ServerStart>
             mission.MissionId = $"巡护任务 {xhTask.missionInformation.MissionId}";
             taskSys.RescueMissions.Add(mission);
             FireGround fireGround = ComponentFactory.Create<FireGround>();
-            fireGround.countArea.burnarea = editorConfig.firePoints[xhTask.FirePointId - 1].InitialArea;
+            mission.FireGround = fireGround;
+            mission.InitArea = editorConfig.firePoints[xhTask.FirePointId - 1].InitialArea;
             fireGround.FirePoint = new DVector
             {
                 Latitude = editorConfig.firePoints[xhTask.FirePointId - 1].FirePointLatitude,
                 Longitude = editorConfig.firePoints[xhTask.FirePointId - 1].FirePointLongitude,
                 Altitude = editorConfig.firePoints[xhTask.FirePointId - 1].FirePointHeight
             };
-            mission.FireGround = fireGround;
             if(xhTask.missionInformation.AircraftInfos == null) continue;
             for (int i = 0; i < xhTask.missionInformation.AircraftInfos.Length; i++)
             {
@@ -226,7 +225,6 @@ public class ServerStartEventHandler : AEvent<ServerStart>
                     a.AircraftID == xhTask.missionInformation.AircraftInfos[i]);
                 flightPlanEditor.firepoint = new FirePoint[1];
                 flightPlanEditor.firepoint[0] = editorConfig.firePoints[xhTask.FirePointId - 1];
-                Log.Info("==============================" + xhTask.ToJson());
                 flightPlanEditor.missionpoint = xhTask.MissionPoints[0];
                 flightPlanEditor.originbase =
                     editorConfig.bases.Find(b => b.BaseId == flightPlanEditor.aircraftparameter.AirportId);

SimulationServer/Init.cs

@@ -6,11 +6,6 @@ namespace SimulationServer;
 
 public static class Init
 {
-    /// <summary>
-    /// 运行速度
-    /// </summary>
-    public static int Speed = 1;
-    
     public static void Start()
     {
         try

SimulationServer/Utils/DataTableExtensions.cs

@@ -84,11 +84,6 @@ public static class DataTableExtensions
             
             var headerCell = headerRow.CreateCell(0);
             headerCell.SetCellValue("指标名");
-            // for (int i = 1; i < kv.Value.Count; i++)
-            // {
-            //     var headerCell1 = headerRow.CreateCell(i);
-            //     headerCell1.SetCellValue($"数值{i}");
-            // }
             
             // 遍历字典，将数据写入Excel
             int rowIndex = 1;
@@ -99,7 +94,7 @@ public static class DataTableExtensions
                 for (int i = 0; i < kv1.Value.Count; i++)
                 {
                     var headerCell1 = headerRow.CreateCell(i + 1);
-                    headerCell1.SetCellValue($"数值{i}");
+                    headerCell1.SetCellValue($"数值{i+1}");
                     row.CreateCell(i + 1).SetCellValue(kv1.Value[i]);
                 }
                 rowIndex++;
@@ -111,9 +106,6 @@ public static class DataTableExtensions
         {
             workbook.Write(fs);
         }
-        
-        
-        
     }
     public static void SaveToExcel(string path , Dictionary<string, Dictionary<string,string>> report)
     {

SimulationServer/Utils/Util.cs

@@ -33,7 +33,7 @@ public class Util
             aircraftType,aircraftSubType,aircraftID,"1"
         });
         
-        Log.Debug($"Type = {aircraftType}, SubType = {aircraftSubType}, ID = {aircraftID}");
+        //Log.Debug($"Type = {aircraftType}, SubType = {aircraftSubType}, ID = {aircraftID}");
         var define = JsonHelper.FromJson<AircraftDefine>(content);
 
         if (define.zs.Count == 0)