根据修改的配置文件修改相关代码，连接数据库读取医疗相关数据

Models/SimulationCommon/EditorConfig.cs

@@ -52,7 +52,7 @@ public struct AircraftParameter
     [JsonProperty("任务载荷型号")]
     public TaskLoadType taskLoadType;
     [JsonProperty("任务载荷")]
-    public string[] taskLoad;
+    public TaskLoad taskLoad;
     [JsonProperty("最大起飞重量")]
     public double MaxTakeoffWeight;
     [JsonProperty("最大载油量")]
@@ -71,20 +71,20 @@ public class TaskLoadType
 
 public class TaskLoad
 {
-    [JsonProperty("急救设备")]
-    public bool FirstAid;
+    [JsonProperty("急救装备")]
+    public string[] FirstAid;
     [JsonProperty("搬运和固定装备")]
-    public bool HandlingAndFixing;
+    public string[] HandlingAndFixing;
     [JsonProperty("诊断和监测装备")]
-    public bool DiagnosisAndMonitoring;
+    public string[] DiagnosisAndMonitoring;
     [JsonProperty("外伤装备")]
-    public bool Trauma;
+    public string[] Trauma;
     [JsonProperty("输液装备")]
-    public bool Infusion;
+    public string[] Infusion;
     [JsonProperty("绞车型号")]
-    public string WinchModel;
+    public string[] WinchModel;
     [JsonProperty("医疗药品")]
-    public bool Drug;
+    public string[] Drug;
 }
 
 public class FirePoint

SimulationServer/Component/SJStaticCapacityComponent.cs

@@ -307,7 +307,6 @@ public class SJStaticCapacityComponent : Component
 
         SJStaticCapacity.最大飞行速度 = db.fzdss == null ? "0" : db.fzdss.ToString();
         SJStaticCapacity.最大航程 = db.fzdss == null ? "0" : db.fzdss.ToString();
-        SJStaticCapacity.设备种类与数量 = db.fzdss == null ? "0" : db.fzdss.ToString();
         SJStaticCapacity.设备可靠性 = db.fzdss == null ? "0" : db.fzdss.ToString();
         SJStaticCapacity.信号覆盖范围 = db.fzdss == null ? "0" : db.fzdss.ToString();
         SJStaticCapacity.导航精度 = db.fzdss == null ? "0" : db.fzdss.ToString();
@@ -353,7 +352,6 @@ public class SJStaticCapacityComponent : Component
 
         SJStaticCapacity.最大飞行速度 = db.fzdss == null ? "0" : db.fzdss.ToString();
         SJStaticCapacity.最大航程 = db.fzdss == null ? "0" : db.fzdss.ToString();
-        SJStaticCapacity.设备种类与数量 = db.fzdss == null ? "0" : db.fzdss.ToString();
         SJStaticCapacity.设备可靠性 = db.fzdss == null ? "0" : db.fzdss.ToString();
         SJStaticCapacity.信号覆盖范围 = db.fzdss == null ? "0" : db.fzdss.ToString();
         SJStaticCapacity.导航精度 = db.fzdss == null ? "0" : db.fzdss.ToString();
@@ -398,7 +396,6 @@ public class SJStaticCapacityComponent : Component
 
         SJStaticCapacity.最大飞行速度 = db.fzdss == null ? "0" : db.fzdss.ToString();
         SJStaticCapacity.最大航程 = db.fzdss == null ? "0" : db.fzdss.ToString();
-        SJStaticCapacity.设备种类与数量 = db.fzdss == null ? "0" : db.fzdss.ToString();
         SJStaticCapacity.设备可靠性 = db.fzdss == null ? "0" : db.fzdss.ToString();
         SJStaticCapacity.信号覆盖范围 = db.fzdss == null ? "0" : db.fzdss.ToString();
         SJStaticCapacity.导航精度 = db.fzdss == null ? "0" : db.fzdss.ToString();
@@ -477,7 +474,6 @@ public class SJStaticCapacityComponent : Component
 
         report["静态能力"].Add("最大飞行速度", SJStaticCapacity.最大飞行速度.ToString());
         report["静态能力"].Add("最大航程", SJStaticCapacity.最大航程.ToString());
-        report["静态能力"].Add("设备种类与数量", SJStaticCapacity.设备种类与数量.ToString());
         report["静态能力"].Add("设备可靠性", SJStaticCapacity.设备可靠性.ToString());
         report["静态能力"].Add("信号覆盖范围", SJStaticCapacity.信号覆盖范围.ToString());
         report["静态能力"].Add("导航精度", SJStaticCapacity.导航精度.ToString());
@@ -566,7 +562,6 @@ public class SJStaticCapacityComponent : Component
 
         report["静态能力"].Add("最大飞行速度", SJStaticCapacity.最大飞行速度.ToString());
         report["静态能力"].Add("最大航程", SJStaticCapacity.最大航程.ToString());
-        report["静态能力"].Add("设备种类与数量", SJStaticCapacity.设备种类与数量.ToString());
         report["静态能力"].Add("设备可靠性", SJStaticCapacity.设备可靠性.ToString());
         report["静态能力"].Add("信号覆盖范围", SJStaticCapacity.信号覆盖范围.ToString());
         report["静态能力"].Add("导航精度", SJStaticCapacity.导航精度.ToString());
@@ -661,7 +656,6 @@ public class SJStaticCapacityComponent : Component
 
         report["静态能力"].Add("最大飞行速度", SJStaticCapacity.最大飞行速度.ToString());
         report["静态能力"].Add("最大航程", SJStaticCapacity.最大航程.ToString());
-        report["静态能力"].Add("设备种类与数量", SJStaticCapacity.设备种类与数量.ToString());
         report["静态能力"].Add("设备可靠性", SJStaticCapacity.设备可靠性.ToString());
         report["静态能力"].Add("信号覆盖范围", SJStaticCapacity.信号覆盖范围.ToString());
         report["静态能力"].Add("导航精度", SJStaticCapacity.导航精度.ToString());

SimulationServer/Entity/AircraftEntity.cs

@@ -40,7 +40,7 @@ public class AircraftEntity : Entity
     public void Awake()
     {
         Db = Util.GetAircraftDefine(FlightPlanEditor.aircraftparameter.AircraftType, FlightPlanEditor.aircraftparameter.AircraftSubType, FlightPlanEditor.aircraftparameter.AircraftID);
-        //ylDb = Util.GetYL(FlightPlanEditor.aircraftparameter.AircraftType, FlightPlanEditor.aircraftparameter.AircraftSubType, FlightPlanEditor.aircraftparameter.AircraftID);
+        //ylDb = Util.GetYL("20");
 
         if (Db.f_zdqfzl != null)
             FlightPlanEditor.aircraftparameter.MaxTakeoffWeight = double.Parse(Db.f_zdqfzl.ToString());

SimulationServer/Entity/AircraftXCJJ.cs

@@ -1,4 +1,5 @@
-using KYFramework;
+using BHJD.DEMdll.Entity;
+using KYFramework;
 using MathNet.Numerics.Distributions;
 using Model;
 using MongoDB.Bson;
@@ -20,7 +21,7 @@ public class AircraftXCJJ : AircraftEntity
 
     public Dictionary<string, string> reportInfo = new Dictionary<string, string>();
 
-    public List<string> load = new List<string>();
+    public TaskLoad load;
     public string device;
     public string medicine;
 
@@ -171,25 +172,57 @@ public class AircraftXCJJ : AircraftEntity
                     TurningPoints[i + 1].TurningPointLongitude, TurningPoints[i].TurningPointLatitude, TurningPoints[i + 1].TurningPointLatitude);
         }
         reportInfo.Add("单机导航使用情况", zhc.ToString()); //飞行总距离
-        for (int i = 0; i < load.Count; i++)
+        if(load.FirstAid != null)
         {
-            if (load[i].Split(":")[0].Contains("装备"))
+            for (int i = 0; i < load.FirstAid.Length; i++)
             {
-                device += load[i].Split(":")[1];
-                if (i != load.Count - 1)
-                {
-                    device += "\r\n";
-                }
+                device += load.FirstAid[i];
+                device += "\r\n";
             }
-            else if (load[i].Split(":")[0].Contains("药品"))
+        }
+        if (load.HandlingAndFixing != null)
+        {
+            for (int i = 0; i < load.HandlingAndFixing.Length; i++)
+            {
+                device += load.HandlingAndFixing[i];
+                device += "\r\n";
+            }
+        }
+        if (load.DiagnosisAndMonitoring != null)
+        {
+            for (int i = 0; i < load.DiagnosisAndMonitoring.Length; i++)
+            {
+                device += load.DiagnosisAndMonitoring[i];
+                device += "\r\n";
+            }
+        }
+        if (load.Trauma != null)
+        {
+            for (int i = 0; i < load.Trauma.Length; i++)
+            {
+                device += load.Trauma[i];
+                device += "\r\n";
+            }
+        }
+        if (load.Infusion != null)
+        {
+            for (int i = 0; i < load.Infusion.Length; i++)
+            {
+                device += load.Infusion[i];
+                device += "\r\n";
+            }
+        }
+        if (load.Drug != null)
+        {
+            for (int i = 0; i < load.Drug.Length; i++)
             {
-                medicine += load[i].Split(":")[1] + "\r\n";
-                if (i != load.Count - 1)
-                {
+                medicine += load.Drug[i];
+                if (i != load.Drug.Length - 1)
                     medicine += "\r\n";
-                }
             }
         }
+        char[] cs = { '\r', '\n' };
+        device = device.TrimEnd(cs);
         //Console.WriteLine("医疗任务设备:" + device);
         //Console.WriteLine("医疗药品:" + medicine);
         if (device != null)

SimulationServer/Entity/AircraftYLWPYS.cs

@@ -17,7 +17,7 @@ public class AircraftYLWPYS : AircraftEntity
 
     public Dictionary<string, string> reportInfo = new Dictionary<string, string>();
 
-    public List<string> load = new List<string>();
+    public TaskLoad load;
     public string device;
     public string medicine;
 
@@ -84,25 +84,57 @@ public class AircraftYLWPYS : AircraftEntity
                     TurningPoints[i + 1].TurningPointLongitude, TurningPoints[i].TurningPointLatitude, TurningPoints[i + 1].TurningPointLatitude);
         }
         reportInfo.Add("单机导航使用情况", zhc.ToString());
-        for (int i = 0; i < load.Count; i++)
+        if (load.FirstAid != null)
         {
-            if (load[i].Split(":")[0].Contains("装备"))
+            for (int i = 0; i < load.FirstAid.Length; i++)
             {
-                device += load[i].Split(":")[1];
-                if (i != load.Count - 1)
-                {
-                    device += "\r\n";
-                }
+                device += load.FirstAid[i];
+                device += "\r\n";
             }
-            else if (load[i].Split(":")[0].Contains("药品"))
+        }
+        if (load.HandlingAndFixing != null)
+        {
+            for (int i = 0; i < load.HandlingAndFixing.Length; i++)
+            {
+                device += load.HandlingAndFixing[i];
+                device += "\r\n";
+            }
+        }
+        if (load.DiagnosisAndMonitoring != null)
+        {
+            for (int i = 0; i < load.DiagnosisAndMonitoring.Length; i++)
+            {
+                device += load.DiagnosisAndMonitoring[i];
+                device += "\r\n";
+            }
+        }
+        if (load.Trauma != null)
+        {
+            for (int i = 0; i < load.Trauma.Length; i++)
+            {
+                device += load.Trauma[i];
+                device += "\r\n";
+            }
+        }
+        if (load.Infusion != null)
+        {
+            for (int i = 0; i < load.Infusion.Length; i++)
+            {
+                device += load.Infusion[i];
+                device += "\r\n";
+            }
+        }
+        if (load.Drug != null)
+        {
+            for (int i = 0; i < load.Drug.Length; i++)
             {
-                medicine += load[i].Split(":")[1] + "\r\n";
-                if (i != load.Count - 1)
-                {
+                medicine += load.Drug[i];
+                if (i != load.Drug.Length - 1)
                     medicine += "\r\n";
-                }
             }
         }
+        char[] cs = { '\r', '\n' };
+        device = device.TrimEnd(cs);
         if (device != null)
             reportInfo.Add("医疗任务设备", device);
         else

SimulationServer/Entity/AircraftYLZY.cs

@@ -19,7 +19,7 @@ public class AircraftYLZY : AircraftEntity
 
     public Dictionary<string, string> reportInfo = new Dictionary<string, string>();
 
-    public List<string> load = new List<string>();
+    public TaskLoad load;
     public string device;
     public string medicine;
 
@@ -142,25 +142,57 @@ public class AircraftYLZY : AircraftEntity
                     TurningPoints[i + 1].TurningPointLongitude, TurningPoints[i].TurningPointLatitude, TurningPoints[i + 1].TurningPointLatitude);
         }
         reportInfo.Add("单机导航使用情况", zhc.ToString()); //飞行总距离
-        for (int i = 0; i < load.Count; i++)
+        if (load.FirstAid != null)
         {
-            if (load[i].Split(":")[0].Contains("装备"))
+            for (int i = 0; i < load.FirstAid.Length; i++)
             {
-                device += load[i].Split(":")[1];
-                if (i != load.Count - 1)
-                {
-                    device += "\r\n";
-                }
+                device += load.FirstAid[i];
+                device += "\r\n";
             }
-            else if (load[i].Split(":")[0].Contains("药品"))
+        }
+        if (load.HandlingAndFixing != null)
+        {
+            for (int i = 0; i < load.HandlingAndFixing.Length; i++)
+            {
+                device += load.HandlingAndFixing[i];
+                device += "\r\n";
+            }
+        }
+        if (load.DiagnosisAndMonitoring != null)
+        {
+            for (int i = 0; i < load.DiagnosisAndMonitoring.Length; i++)
+            {
+                device += load.DiagnosisAndMonitoring[i];
+                device += "\r\n";
+            }
+        }
+        if (load.Trauma != null)
+        {
+            for (int i = 0; i < load.Trauma.Length; i++)
+            {
+                device += load.Trauma[i];
+                device += "\r\n";
+            }
+        }
+        if (load.Infusion != null)
+        {
+            for (int i = 0; i < load.Infusion.Length; i++)
+            {
+                device += load.Infusion[i];
+                device += "\r\n";
+            }
+        }
+        if (load.Drug != null)
+        {
+            for (int i = 0; i < load.Drug.Length; i++)
             {
-                medicine += load[i].Split(":")[1] + "\r\n";
-                if (i != load.Count - 1)
-                {
+                medicine += load.Drug[i];
+                if (i != load.Drug.Length - 1)
                     medicine += "\r\n";
-                }
             }
         }
+        char[] cs = { '\r', '\n' };
+        device = device.TrimEnd(cs);
         //Console.WriteLine("医疗任务设备11:" + device);
         //Console.WriteLine("医疗药品11:" + medicine);
         if (device != null)

SimulationServer/EventHandler/CreateTaskEventHandler.cs

@@ -664,10 +664,7 @@ public class CreateLandSJEventHandler : AEvent<CreateLandSXTask>
                 aircraft.taskContent = config.XCJJTask;
                 aircraft.AircraftId = config.XCJJTask.aircraftInfos[i].AircraftId;
                 aircraft.Airport = originBase.BaseName;
-                for (int j = 0; j < aircraftParameter.taskLoad.Length; j++)
-                {
-                    aircraft.load.Add(aircraftParameter.taskLoad[j]);
-                }
+                aircraft.load = aircraftParameter.taskLoad;
                 aircraft.AircraftType = aircraftParameter.AircraftSubType;
                 aircraft.hospitalAirport = config.XCJJTask.missionInformation.Hospital;
                 var hospital = config.EditorConfig.hospitals.Find(t => t.BaseName == config.XCJJTask.missionInformation.Hospital);
@@ -725,10 +722,7 @@ public class CreateLandSJEventHandler : AEvent<CreateLandSXTask>
                 aircraft.taskContent = config.YLZYTask;
                 aircraft.AircraftId = config.YLZYTask.aircraftInfos[i].AircraftId;
                 aircraft.Airport = originBase.BaseName;
-                for (int j = 0; j < aircraftParameter.taskLoad.Length; j++)
-                {
-                    aircraft.load.Add(aircraftParameter.taskLoad[j]);
-                }
+                aircraft.load = aircraftParameter.taskLoad;
                 aircraft.AircraftType = aircraftParameter.AircraftSubType;
                 aircraft.hospitalAirport = config.YLZYTask.missionInformation.Hospital;
                 var hospital = config.EditorConfig.hospitals.Find(t => t.BaseName == config.YLZYTask.missionInformation.Hospital);
@@ -785,10 +779,7 @@ public class CreateLandSJEventHandler : AEvent<CreateLandSXTask>
                 aircraft.taskContent = config.YLWPYSTask;
                 aircraft.AircraftId = config.YLWPYSTask.aircraftInfos[i].AircraftId;
                 aircraft.Airport = originBase.BaseName;
-                for (int j = 0; j < aircraftParameter.taskLoad.Length; j++)
-                {
-                    aircraft.load.Add(aircraftParameter.taskLoad[j]);
-                }
+                aircraft.load = aircraftParameter.taskLoad;
                 aircraft.AircraftType = aircraftParameter.AircraftSubType;
                 foreach (var item in config.YLWPYSTask.YLWPYSParameters)
                 {

SimulationServer/EventHandler/ServerStartEventHandler.cs

@@ -198,23 +198,23 @@ public class ServerStartEventHandler : AEvent<ServerStart>
             //break;
         }
 
-        //医疗转运任务
-        foreach (var YLZYTask in taskConfig.YLZYTasks)
-        {
-            taskSys.missionCount++;
-            Game.EventSystem.Publish(new CreateYLZYTask
-            { EditorConfig = editorConfig, YLZYTask = YLZYTask });
-            //break;
-        }
+        ////医疗转运任务
+        //foreach (var YLZYTask in taskConfig.YLZYTasks)
+        //{
+        //    taskSys.missionCount++;
+        //    Game.EventSystem.Publish(new CreateYLZYTask
+        //    { EditorConfig = editorConfig, YLZYTask = YLZYTask });
+        //    //break;
+        //}
 
-        //医疗物品运送
-        foreach (var YLWPYSTask in taskConfig.YLWPYSTasks)
-        {
-            taskSys.missionCount++;
-            Game.EventSystem.Publish(new CreateYLWPYSTask
-            { EditorConfig = editorConfig, YLWPYSTask = YLWPYSTask });
-            //break;
-        }
+        ////医疗物品运送
+        //foreach (var YLWPYSTask in taskConfig.YLWPYSTasks)
+        //{
+        //    taskSys.missionCount++;
+        //    Game.EventSystem.Publish(new CreateYLWPYSTask
+        //    { EditorConfig = editorConfig, YLWPYSTask = YLWPYSTask });
+        //    //break;
+        //}
 
         ////绞车吊载转运任务
         //foreach (var JCDZZYTask in taskConfig.JCDZZYTasks)

SimulationServer/Utils/HttpInterface.cs

@@ -15,6 +15,6 @@ public class HttpInterface
     public static string fuel = $"{baseUrl}rescue-platform-service/api/v1/tbTables/queryOilConsumeInfo";
 
     // 医疗
-    public static string yl = $"{baseUrl}rescue-platform-service/api/v1/tbTables/querycustom";
+    public static string yl = $"{baseUrl}rescue-platform-service/api/v1/tbTables/queryrealDetail";//rescue-platform-service/api/v1/tbTables/queryreal
 
 }

SimulationServer/Utils/Util.cs

@@ -67,16 +67,16 @@ public class Util
     }
 
     // 医疗
-    public static YLDBData GetYL(string aircraftType, string aircraftSubType, string aircraftID)
+    public static YLDBData GetYL(string id)
     {
         string content = HttpManager.Get(HttpInterface.yl, new List<string>
         {
-            "fType","fSubtype","fName","limit"
+            "fSubtypeId","recordId" //  "fScene","fName","fSubtypeId","limit"
         }, new List<string>
         {
-            "航空医疗",aircraftSubType,aircraftID,"1"
+            "136",id //"航空医疗","","136","10"
         });
-
+        Console.WriteLine("YL:" + content);
         var yl = JsonHelper.FromJson<YLDB>(content);
         var result = JsonHelper.FromJson<YLDBData>(yl.data);
         return result;

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

@@ -36,30 +36,40 @@
             "类型": "飞机",
             "子类型": "直升机",
             "所属机场ID": 1,
-            "任务载荷": [
-                "急救装备: 氧气供应装置",
-                "急救装备: 多功能除颤器",
-                "急救装备: 便携呼吸机",
-                "急救装备: 吸引器",
-                "急救装备: 小型外科手术器械包",
-                "搬运和固定装备: 上车担架",
-                "搬运和固定装备: 担架固定装置",
-                "诊断和监测装备: 听诊器",
-                "诊断和监测装备: 体温计",
-                "诊断和监测装备: 血压计",
-                "诊断和监测装备: 快速血糖检测仪",
-                "外伤装备: 头部固定器",
-                "外伤装备: 颈托",
-                "外伤装备: 脊椎固定器",
-                "外伤装备: 固定夹板",
-                "外伤装备: 牵引装置",
-                "外伤装备: 三角巾",
-                "外伤装备: 止血带",
-                "外伤装备: 绷带卷",
-                "外伤装备: 一次性纱布敷料",
-                "外伤装备: 创口贴",
-                "输液装备: 注射器和输液器"
-            ]
+            "任务载荷": {
+                "急救装备": [
+                    "氧气供应装置",
+                    "多功能除颤器",
+                    "便携呼吸机",
+                    "吸引器",
+                    "小型外科手术器械包"
+                ],
+                "搬运和固定装备": [
+                    "上车担架",
+                    "担架固定装置"
+                ],
+                "诊断和监测装备": [
+                    "听诊器",
+                    "体温计",
+                    "血压计",
+                    "快速血糖检测仪"
+                ],
+                "外伤装备": [
+                    "头部固定器",
+                    "颈托",
+                    "脊椎固定器",
+                    "固定夹板",
+                    "牵引装置",
+                    "三角巾",
+                    "止血带",
+                    "绷带卷",
+                    "一次性纱布敷料",
+                    "创口贴"
+                ],
+                "输液装备": [
+                    "注射器和输液器"
+                ]
+            }
         },
         {
             "机型": "H155",
@@ -67,9 +77,11 @@
             "类型": "飞机",
             "子类型": "直升机",
             "所属机场ID": 1,
-            "任务载荷": [
-                "绞车型号: WHDDJXT-102"
-            ]
+            "任务载荷": {
+                "绞车型号": [
+                    "WHDDJXT-102"
+                ]
+            }
         },
         {
             "机型": "ARJ-21",
@@ -77,31 +89,43 @@
             "类型": "飞机",
             "子类型": "固定翼",
             "所属机场ID": 2,
-            "任务载荷": [
-                "急救装备: 氧气供应装置",
-                "急救装备: 多功能除颤器",
-                "急救装备: 便携呼吸机",
-                "急救装备: 吸引器",
-                "急救装备: 小型外科手术器械包",
-                "搬运和固定装备: 上车担架",
-                "搬运和固定装备: 担架固定装置",
-                "诊断和监测装备: 听诊器",
-                "诊断和监测装备: 体温计",
-                "诊断和监测装备: 血压计",
-                "诊断和监测装备: 快速血糖检测仪",
-                "外伤装备: 头部固定器",
-                "外伤装备: 颈托",
-                "外伤装备: 脊椎固定器",
-                "外伤装备: 固定夹板",
-                "外伤装备: 牵引装置",
-                "外伤装备: 三角巾",
-                "外伤装备: 止血带",
-                "外伤装备: 绷带卷",
-                "外伤装备: 一次性纱布敷料",
-                "外伤装备: 创口贴",
-                "输液装备: 注射器和输液器",
-                "医疗药品: 盐酸肾上腺素注射液"
-            ]
+            "任务载荷": {
+                "急救装备": [
+                    "氧气供应装置",
+                    "多功能除颤器",
+                    "便携呼吸机",
+                    "吸引器",
+                    "小型外科手术器械包"
+                ],
+                "搬运和固定装备": [
+                    "上车担架",
+                    "担架固定装置"
+                ],
+                "诊断和监测装备": [
+                    "听诊器",
+                    "体温计",
+                    "血压计",
+                    "快速血糖检测仪"
+                ],
+                "外伤装备": [
+                    "头部固定器",
+                    "颈托",
+                    "脊椎固定器",
+                    "固定夹板",
+                    "牵引装置",
+                    "三角巾",
+                    "止血带",
+                    "绷带卷",
+                    "一次性纱布敷料",
+                    "创口贴"
+                ],
+                "输液装备": [
+                    "注射器和输液器"
+                ],
+                "医疗药品": [
+                    "盐酸肾上腺素注射液"
+                ]
+            }
         }
     ],
     "医疗物品需求信息": [