修复总报告输出错误问题

Models/SimulationCommon/FXJHGenenrate.cs

@@ -186,9 +186,9 @@
         {
             MissionEndPoint missionEndPoint = new();
             int length = SC01.Count;
-            missionEndPoint.MissionEndPointLongitude = SC01[length][0];
-            missionEndPoint.MissionEndPointLatitude = SC01[length][1];
-            missionEndPoint.MissionEndPointHeight = SC01[length][2];
+            missionEndPoint.MissionEndPointLongitude = SC01[length - 1][0];
+            missionEndPoint.MissionEndPointLatitude = SC01[length - 1][1];
+            missionEndPoint.MissionEndPointHeight = SC01[length - 1][2];
 
             return missionEndPoint;
         }

SimulationServer/Component/TotalTaskPerformanceComponent.cs

@@ -4,14 +4,14 @@ namespace SimulationServer;
 
 public class TotalTaskPerformance
 {
-    public string 任务响应时间;
-    public string 总任务耗时;
-    public string 任务是否成功;
-    public string 火场面积变化率;
-    public string 蔓延速度变化率;
-    public string 直接灭火面积;
-    public string 过火面积;
-    public string 伤亡人数;
+    public string 任务响应时间 = String.Empty;
+    public string 总任务耗时 = String.Empty;
+    public string 任务是否成功 = String.Empty;
+    public string 火场面积变化率 = String.Empty;
+    public string 蔓延速度变化率 = String.Empty;
+    public string 直接灭火面积 = String.Empty;
+    public string 过火面积 = String.Empty;
+    public string 伤亡人数 = String.Empty;
 }
 
 public class TotalTaskPerformanceComponent : Component

SimulationServer/Entity/AircraftSHJ.cs

@@ -1,5 +1,6 @@
 using KYFramework;
 using Model;
+using MongoDB.Bson;
 using MuShiApp;
 using SimulationServer.Utils;
 using SimulationSingleServer.Utils;
@@ -27,7 +28,6 @@ public class AircraftSHJ : Entity
         }
         
         turningPoints = FXJHGenerate.FromStartToMission(FlightPlanEditor,turningPoints);//生成从起点到任务段起点的航路点
-        
         double resulttime = Cable_slippage.get_result_time_rope(content.H,content.personNumber,content.windspeed,content.vis,content.descendspeed).time;//索滑降模型输出的索滑降时间
         turningPoints = FXJHGenerate.SuoHuaJiang(resulttime, FlightPlanEditor, turningPoints);
         
@@ -39,10 +39,11 @@ public class AircraftSHJ : Entity
 }
 
 [ObjectSystem]
-public class AircraftSHJAwakeSystem : AwakeSystem<AircraftSHJ,FlightPlanEditor>
+public class AircraftSHJAwakeSystem : AwakeSystem<AircraftSHJ,FlightPlanEditor,SHJTask>
 {
-    public override void Awake(AircraftSHJ self,FlightPlanEditor flightPlanEditor)
+    public override void Awake(AircraftSHJ self,FlightPlanEditor flightPlanEditor,SHJTask shjTask)
     {
+        self.content = shjTask;
         self.FlightPlanEditor = flightPlanEditor;
         // 读取数据库
        self.Db = Util.GetAircraftDefine(self.FlightPlanEditor.aircraftparameter.AircraftType,self.FlightPlanEditor.aircraftparameter.AircraftSubType,self.FlightPlanEditor.aircraftparameter.AircraftID);

SimulationServer/Entity/AircraftZC.cs

@@ -1,5 +1,6 @@
 using KYFramework;
 using Model;
+using MongoDB.Bson;
 using QuYuSaoMiao;
 using SimulationServer.Utils;
 
@@ -37,10 +38,11 @@ public class AircraftZC : Entity
 
 
 [ObjectSystem]
-public class AircraftZCAwakeSystem : AwakeSystem<AircraftZC,FlightPlanEditor>
+public class AircraftZCAwakeSystem : AwakeSystem<AircraftZC,FlightPlanEditor,ZCTask>
 {
-    public override void Awake(AircraftZC self,FlightPlanEditor flightPlanEditor)
+    public override void Awake(AircraftZC self,FlightPlanEditor flightPlanEditor,ZCTask zcTask)
     {
+        self.content = zcTask;
         self.FlightPlanEditor = flightPlanEditor;
         // 读取数据库
         self.Db = Util.GetAircraftDefine(self.FlightPlanEditor.aircraftparameter.AircraftType,self.FlightPlanEditor.aircraftparameter.AircraftSubType,self.FlightPlanEditor.aircraftparameter.AircraftID);

SimulationServer/Entity/RescueMission.cs

@@ -179,6 +179,34 @@ public class RescueMission : Entity
                 }
             }
         }
+        
+        var totalPerformance = GetComponent<TotalTaskPerformanceComponent>();
+        totalPerformance.FillData();
+        var totalPerformanceReport = totalPerformance.GetReport();
+        foreach (var kv in totalPerformanceReport)
+        {
+            if(!totalReport.ContainsKey(kv.Key)) totalReport[kv.Key] = new Dictionary<string, List<string>>();
+            
+            foreach (var kv2 in kv.Value)
+            {
+                if (!totalReport[kv.Key].ContainsKey(kv2.Key)) totalReport[kv.Key][kv2.Key] = new List<string>();
+                totalReport[kv.Key][kv2.Key].Add(kv2.Value);
+            }
+        }
+        
+        
+        var TotalEconomical = GetComponent<TotalEconomicalComponent>();
+        TotalEconomical.FillData();
+        var totalEconomicalReport = TotalEconomical.GetReport();
+        foreach (var kv in totalEconomicalReport)
+        {
+            if(!totalReport.ContainsKey(kv.Key)) totalReport[kv.Key] = new Dictionary<string, List<string>>();
+            foreach (var kv2 in kv.Value)
+            {
+                if (!totalReport[kv.Key].ContainsKey(kv2.Key)) totalReport[kv.Key][kv2.Key] = new List<string>();
+                totalReport[kv.Key][kv2.Key].Add(kv2.Value);
+            }
+        }
     }
 
     public void SaveXH()
@@ -219,6 +247,19 @@ public class RescueMission : Entity
                 }
             }
         }
+        
+        var totalPerformance = GetComponent<XHTotalTaskPerformanceComponent>();
+        totalPerformance.FillData();
+        var totalPerformanceReport = totalPerformance.GetReport();
+        foreach (var kv in totalPerformanceReport)
+        {
+            if(!totalXhReport.ContainsKey(kv.Key)) totalXhReport[kv.Key] = new Dictionary<string, List<string>>();
+            foreach (var kv2 in kv.Value)
+            {
+                if (!totalXhReport[kv.Key].ContainsKey(kv2.Key)) totalXhReport[kv.Key][kv2.Key] = new List<string>();
+                totalXhReport[kv.Key][kv2.Key].Add(kv2.Value);
+            }
+        }
     }
 
 
@@ -262,6 +303,7 @@ public class RescueMissionUpdateSystem : UpdateSystem<RescueMission>
         if(!self.IsRunning) return;
         if (self.FireGround.countArea.burnarea <= 0)
         {
+            self.Success = true;
             self.EndMission();
             return;
         }

SimulationServer/EventHandler/ServerStartEventHandler.cs

@@ -1,6 +1,7 @@
 using Cysharp.Threading.Tasks;
 using KYFramework;
 using Model;
+using MongoDB.Bson;
 using Newtonsoft.Json;
 using SimulationServer.Utils;
 
@@ -132,6 +133,7 @@ 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++)
                 {
@@ -149,9 +151,8 @@ public class ServerStartEventHandler : AEvent<ServerStart>
                     flightPlanEditor.cruisesegment = editorConfig.cruiseSegment;
                     flightPlanEditor.cityweather = editorConfig.cityWeather;
 
-                    AircraftSHJ aircraftSHJ = ComponentFactory.Create<AircraftSHJ, FlightPlanEditor>( flightPlanEditor);
+                    AircraftSHJ aircraftSHJ = ComponentFactory.Create<AircraftSHJ, FlightPlanEditor,SHJTask>( flightPlanEditor, shjTask);
                     mission.End += aircraftSHJ.End;
-                    aircraftSHJ.content = shjTask;
                     mission.AircraftSHJs.Add(aircraftSHJ);
                 }
             }
@@ -191,19 +192,19 @@ public class ServerStartEventHandler : AEvent<ServerStart>
                 flightPlanEditor.cruisesegment = editorConfig.cruiseSegment;
                 flightPlanEditor.cityweather = editorConfig.cityWeather;
 
-                AircraftZC aircraft = ComponentFactory.Create<AircraftZC, FlightPlanEditor>( flightPlanEditor);
+                AircraftZC aircraft = ComponentFactory.Create<AircraftZC, FlightPlanEditor,ZCTask>( flightPlanEditor, zcTask);
                 //aircraft.Name = zcTask.missionInformation.AircraftInfos[i];
                 //aircraft.NextMissionId = zcTask.NextTaskId;
                 mission.End += aircraft.End;
-                aircraft.content = zcTask;
                 mission.AircraftZCs.Add(aircraft);
             }
         }
 
         foreach (XHTask xhTask in taskConfig.xHTask)
         {
+            if(xhTask.MissionPoints == null) continue;
             RescueMission mission = ComponentFactory.Create<RescueMission>();
-            mission.AddComponent<EquipmentComponent>();
+            mission.AddComponent<XHEconomicalComponent>();
             mission.AddComponent<XHTotalTaskPerformanceComponent>();
             mission.MissionId = $"巡护任务 {xhTask.missionInformation.MissionId}";
             taskSys.RescueMissions.Add(mission);
@@ -219,12 +220,13 @@ public class ServerStartEventHandler : AEvent<ServerStart>
             if(xhTask.missionInformation.AircraftInfos == null) continue;
             for (int i = 0; i < xhTask.missionInformation.AircraftInfos.Length; i++)
             {
+                
                 FlightPlanEditor? flightPlanEditor = new FlightPlanEditor();
-
                 flightPlanEditor.aircraftparameter = editorConfig.aircraftParameters.Find(a =>
                     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/Utils/Util.cs

@@ -72,7 +72,7 @@ public class Util
         });
         
         var slope = JsonHelper.FromJson<SlopeDb>(content);
-
+        
         return Math.Atan(Math.Abs(slope.average.s1)) * (180.0 / Math.PI);
     }
 }

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

@@ -8,11 +8,11 @@
       "基地海拔": 1100.0
     },
     {
-      "基地名称": null,
-      "基地编号": 0,
-      "基地经度": 0.0,
-      "基地纬度": 0.0,
-      "基地海拔": 0.0
+      "基地名称": "西昌青山机场",
+      "基地编号": 2,
+      "基地经度": 102.193,
+      "基地纬度": 27.989,
+      "基地海拔": 1500.0
     }
   ],
   "飞行器信息": [
@@ -39,7 +39,7 @@
       "所属机场ID": 1
     },
     {
-      "机型": "Mi-171",
+      "机型": "M-171",
       "飞机编号": "1-3",
       "类型": "飞机",
       "子类型": "直升机",
@@ -48,6 +48,50 @@
       "起飞准备时间": 600.0,
       "最大载客数量": 24.0,
       "所属机场ID": 1
+    },
+    {
+      "机型": "M-171",
+      "飞机编号": "1-4",
+      "类型": "飞机",
+      "子类型": "直升机",
+      "最大起飞重量": 13000.0,
+      "最大载油量": 8000.0,
+      "起飞准备时间": 600.0,
+      "最大载客数量": 24.0,
+      "所属机场ID": 1
+    },
+    {
+      "机型": "Ka-32",
+      "飞机编号": "2-1",
+      "类型": "飞机",
+      "子类型": "直升机",
+      "最大起飞重量": 11000.0,
+      "最大载油量": 8000.0,
+      "起飞准备时间": 600.0,
+      "最大载客数量": 16.0,
+      "所属机场ID": 2
+    },
+    {
+      "机型": "M-171",
+      "飞机编号": "2-2",
+      "类型": "飞机",
+      "子类型": "直升机",
+      "最大起飞重量": 13000.0,
+      "最大载油量": 8000.0,
+      "起飞准备时间": 600.0,
+      "最大载客数量": 24.0,
+      "所属机场ID": 2
+    },
+    {
+      "机型": "M-171",
+      "飞机编号": "2-3",
+      "类型": "飞机",
+      "子类型": "直升机",
+      "最大起飞重量": 13000.0,
+      "最大载油量": 8000.0,
+      "起飞准备时间": 600.0,
+      "最大载客数量": 24.0,
+      "所属机场ID": 2
     }
   ],
   "火点": [
@@ -61,9 +105,9 @@
     },
     {
       "火点ID": 2,
-      "火点经度": 0.0,
-      "火点纬度": 0.0,
-      "火点海拔": 0.0,
+      "火点经度": 101.041,
+      "火点纬度": 30.125,
+      "火点海拔": 3000.0,
       "初始火场面积": 30000.0,
       "初始火线长度": 0.0
     }

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

@@ -27,6 +27,30 @@
             }
           ],
           "下一个任务ID": "DMMH1"
+        },
+        {
+          "任务信息": {
+            "任务名称": "吊桶洒水灭火任务1-2",
+            "任务ID": "DTMH1-2",
+            "任务主要类型": "航空灭火",
+            "任务类型": "吊桶洒水灭火",
+            "开始时间": null,
+            "结束时间": null,
+            "应用机型": [
+              "Ka-32"
+            ],
+            "应用飞机编号": [
+              "1-2"
+            ]
+          },
+          "取水点": [
+            {
+              "任务点经度": 120.978,
+              "任务点纬度": 50.327,
+              "任务点海拔": 1600.0
+            }
+          ],
+          "下一个任务ID": ""
         }
       ],
       "机降灭火任务": [
@@ -39,7 +63,7 @@
             "开始时间": null,
             "结束时间": null,
             "应用机型": [
-              "Mi-171"
+              "M-171"
             ],
             "应用飞机编号": [
               "1-3"
@@ -49,8 +73,8 @@
           "机降人数": 10.0,
           "机降点": [
             {
-              "任务点经度": 121.12,
-              "任务点纬度": 50.34,
+              "任务点经度": 121.1,
+              "任务点纬度": 50.3,
               "任务点海拔": 2000.0
             }
           ],
@@ -66,8 +90,12 @@
             "任务类型": "索滑降灭火",
             "开始时间": null,
             "结束时间": null,
-            "应用机型": null,
-            "应用飞机编号": null
+            "应用机型": [
+              "M-171"
+            ],
+            "应用飞机编号": [
+              "1-3"
+            ]
           },
           "索滑降高度": 200.0,
           "投送人数": 180,
@@ -97,14 +125,18 @@
             "任务类型": "吊桶洒水灭火",
             "开始时间": null,
             "结束时间": null,
-            "应用机型": null,
-            "应用飞机编号": null
+            "应用机型": [
+              "Ka-32"
+            ],
+            "应用飞机编号": [
+              "2-1"
+            ]
           },
           "取水点": [
             {
-              "任务点经度": 120.978,
-              "任务点纬度": 50.327,
-              "任务点海拔": 1600.0
+              "任务点经度": 101.008,
+              "任务点纬度": 30.116,
+              "任务点海拔": 3000.0
             }
           ],
           "下一个任务ID": ""
@@ -119,16 +151,20 @@
             "任务类型": "机降灭火",
             "开始时间": null,
             "结束时间": null,
-            "应用机型": null,
-            "应用飞机编号": null
+            "应用机型": [
+              "M-171"
+            ],
+            "应用飞机编号": [
+              "2-2"
+            ]
           },
           "地面部署人数": 10.0,
           "机降人数": 10.0,
           "机降点": [
             {
-              "任务点经度": 0.0,
-              "任务点纬度": 0.0,
-              "任务点海拔": 0.0
+              "任务点经度": 101.0,
+              "任务点纬度": 30.1,
+              "任务点海拔": 3000.0
             }
           ],
           "下一个任务ID": ""
@@ -143,8 +179,12 @@
             "任务类型": "索滑降灭火",
             "开始时间": null,
             "结束时间": null,
-            "应用机型": null,
-            "应用飞机编号": null
+            "应用机型": [
+              "M-171"
+            ],
+            "应用飞机编号": [
+              "2-3"
+            ]
           },
           "索滑降高度": 200.0,
           "投送人数": 180,
@@ -153,14 +193,104 @@
           "索滑降速度": 3.0,
           "索滑降点": [
             {
-              "任务点经度": 0.0,
-              "任务点纬度": 0.0,
-              "任务点海拔": 0.0
+              "任务点经度": 101.02,
+              "任务点纬度": 30.12,
+              "任务点海拔": 3000.0
             }
           ],
           "下一个任务ID": ""
         }
       ]
     }
+  ],
+  "火场侦查任务": [
+    {
+      "任务信息": {
+        "任务名称": "火场侦查任务1",
+        "任务ID": "ZC1",
+        "任务主要类型": "航空灭火",
+        "任务类型": "火场侦查",
+        "开始时间": null,
+        "结束时间": null,
+        "应用机型": [
+          "M-171"
+        ],
+        "应用飞机编号": [
+          "1-3"
+        ]
+      },
+      "矩形侦查区域边界点": [
+        [
+          113.998,
+          39.999
+        ],
+        [
+          114.0,
+          40.0
+        ],
+        [
+          114.002,
+          40.001
+        ],
+        [
+          113.998,
+          40.001
+        ]
+      ],
+      "扫描线间距": 300.0,
+      "侦查飞行真高": 300.0,
+      "是否真实高度": true,
+      "是否环绕模式": true,
+      "环绕圈数": 1,
+      "火点ID": 1,
+      "MissionPoints": [
+        {
+          "任务点经度": 113.998,
+          "任务点纬度": 39.999,
+          "任务点海拔": 1500.0
+        }
+      ],
+      "下一个任务ID": ""
+    }
+  ],
+  "防火巡护任务": [
+    {
+      "任务信息": {
+        "任务名称": "防火巡护任务1",
+        "任务ID": "XH1",
+        "任务主要类型": "航空灭火",
+        "任务类型": "防火巡护",
+        "开始时间": null,
+        "结束时间": null,
+        "应用机型": [
+          "Ka-32"
+        ],
+        "应用飞机编号": [
+          "1-1"
+        ]
+      },
+      "巡护航线参数": [
+        {
+          "巡护航线名称": "Y605",
+          "巡护航线点经度": 0.0,
+          "巡护航线点纬度": 0.0,
+          "巡护航线点海拔": 0.0
+        }
+      ],
+      "火点ID": 1,
+      "下一个任务ID": ""
+    }
   ]
+
+
+
+
+
+
+
+
+
+
+
+
 }