修改能见度离线获取功能

Models/SimulationCommon/EquationHelper.cs

@@ -370,10 +370,12 @@ namespace MuShiApp
                 HttpCmd cmd = new HttpCmd
                 {
                     m_RequestType = HttpRequestType.GET,
-                    m_Addr = "http://127.0.0.1:7785//rescue-platform-service/api/v1/attribute/getVisibility", //10.130.100.5
+                    m_Addr = "http://10.130.100.5:7785//rescue-platform-service/api/v1/attribute/getVisibility", //10.130.100.5 127.0.0.1
                     m_Args = new List<string> { "centerLon", "centerLat", "visibility_date" }
                 };
                 string response = m_HttpHelper.Request(cmd, new List<string> { centerLon.ToString(), centerLat.ToString(), visibility_date });
+                Console.WriteLine(" centerLon:" + centerLon + " " + "centerLat:" + centerLat + " " + "visibility_date:" + visibility_date);
+                Console.WriteLine("response:" + response);
                 R data = JsonConvert.DeserializeObject<R>(response);
                 if (data != null && data.code == 200)
                 {
@@ -382,13 +384,17 @@ namespace MuShiApp
                     if (fl.Equals(0))
                     {
                         fl = 15;
+                        Console.WriteLine("1:" + fl);
                     }
+                    Console.WriteLine("2:" + fl);
                     return fl;
                 }
+                Console.WriteLine("3:" + 15);
                 return 15;
             }
             catch (Exception ex)
             {
+                Console.WriteLine("4:" + 15);
                 Debug.Print("error!!!!!getVisibility");
                 Debug.Print(ex.ToString());
                 return 15;

SimulationServer/Entity/AircraftLandSJ.cs

@@ -111,20 +111,29 @@ 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; 
+            time += TurningPoints[i].SegmentFlightTime;
         }
 
         double3 targetPoint = new double3(FlightPlanEditor.targetpoint[0].TargetPointLongitude,
             FlightPlanEditor.targetpoint[0].TargetPointLatitude,
             FlightPlanEditor.targetpoint[0].TargetPointHeight);
 
-        string cityName = helper.getCityName(targetPoint.x,targetPoint.y);
+        string cityName = helper.getCityName(targetPoint.x, targetPoint.y);
         //var visibility = helper.getVisibility(cityName, DateTime.Now.ToString("yyyy-MM-dd HH"));
-        var visibility = helper.getVisibilityByDb(targetPoint.x, targetPoint.y, DateTime.Now.ToString("yyyy-MM-dd HH"));
+        string year = taskContent.missionInformation.StartDate.Split("年")[0];
+        string month = taskContent.missionInformation.StartDate.Split("年")[1].Split("月")[0];
+        if (Convert.ToInt32(month) < 10) month = "0" + month;
+        string day = taskContent.missionInformation.StartDate.Split("年")[1].Split("月")[1].Split("日")[0];
+        if (Convert.ToInt32(day) < 10) day = "0" + day;
+        //string hour = taskContent.missionInformation.StartTime.Split("时")[0];
+        string date = year + "-" + month + "-" + day;// + " " + hour;
+        //Console.Write(date);
+        //Console.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH"));
+        var visibility = helper.getVisibilityByDb(targetPoint.x, targetPoint.y, date); //DateTime.Now.ToString("yyyy-MM-dd HH")
 
         getNCData = new GetNCData();
         getNCData.GetData();
@@ -140,20 +149,20 @@ 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; 
+                        time += TurningPoints[i].SegmentFlightTime;
                     }
-                    Log.Info($"+++++++++++搜寻结束 TurningPoints Count: { TurningPoints.Count } 下次结束的时间  { time }++++++++++++++++");
+                    Log.Info($"+++++++++++搜寻结束 TurningPoints Count: {TurningPoints.Count} 下次结束的时间  {time}++++++++++++++++");
                 }
-                
+
                 (currentLocation, _) =
                     FXJHGenerate.GetAllCurrentLocation(TurningPoints, temptime); // 获取飞机当前位置
                 double3 aricraftPoint = new double3(currentLocation.CurrentLon, currentLocation.CurrentLat,
@@ -165,26 +174,26 @@ public class AircraftLandSJ : AircraftEntity
                 Log.Info("距离：====================" + distance);
 
                 probability =
-                    helper.GetMushiLandProbability(aricraftPoint, visibility,  FlightPlanEditor.targetpoint[0]);
+                    helper.GetMushiLandProbability(aricraftPoint, visibility, FlightPlanEditor.targetpoint[0]);
                 //finalProbability *= (1 - probability); 
 
-             
+
                 if (probability > 0.8)
                 {
                     probability -= 0.5f;
 
                     probability *= random.NextDouble();
-                    double random1 = random.NextInt64(8000,9200); // 生成随机数比较概率  调整概率使任务成功率降低 至 5%（0.05） 第一个参数越低概率越低 // 1000
+                    double random1 = random.NextInt64(8000, 9200); // 生成随机数比较概率  调整概率使任务成功率降低 至 5%（0.05） 第一个参数越低概率越低 // 1000
                     random1 /= 10000;
                     probability += (0.5 * random1);
                 }
-                
-                double randomValue = random.NextInt64(9006,10000);  // 生成随机数比较概率  调整概率使任务成功率降低 至 5%（0.05） 第一个参数越高概率越低
-                 randomValue /= 10000;
-                 
-                 Log.Info(
-                     $"陆上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，是否看到遇险人员：{isseePerson}");
-                 
+
+                double randomValue = random.NextInt64(9006, 10000);  // 生成随机数比较概率  调整概率使任务成功率降低 至 5%（0.05） 第一个参数越高概率越低
+                randomValue /= 10000;
+
+                Log.Info(
+                    $"陆上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，是否看到遇险人员：{isseePerson}");
+
                 if (randomValue < probability) // 1 - finalProbability
                 {
                     isseePerson = true;
@@ -199,7 +208,7 @@ public class AircraftLandSJ : AircraftEntity
                 }
 
                 temptime += 10;
-                if(temptime >= taskContent.missionInformation.TaskEndConditions.TaskTime)
+                if (temptime >= taskContent.missionInformation.TaskEndConditions.TaskTime)
                 {
                     IsOver = true;
                     isseePerson = false;

SimulationServer/Entity/AircraftSJ.cs

@@ -56,11 +56,11 @@ public class AircraftSJ : AircraftEntity
 
         //if (!isbool2)
         //{
-            Text_readNC text_ReadNC = new Text_readNC();
-            //text_ReadNC = new Text_readNC();
-            text_ReadNC.GetNCData();
-            text_ReadNC.GetWaveHighData();
-            //isbool2 = true;
+        Text_readNC text_ReadNC = new Text_readNC();
+        //text_ReadNC = new Text_readNC();
+        text_ReadNC.GetNCData();
+        text_ReadNC.GetWaveHighData();
+        //isbool2 = true;
         //}
         var nCread = text_ReadNC.windNCread;
 
@@ -185,13 +185,22 @@ public class AircraftSJ : AircraftEntity
 
         string cityName = helper.getCityName(targetPoint.x, targetPoint.y);
         //var vis = helper.getVisibility(cityName, DateTime.Now.ToString("yyyy-MM-dd HH"));
-        var vis = helper.getVisibilityByDb(targetPoint.x, targetPoint.y, DateTime.Now.ToString("yyyy-MM-dd HH"));
+        string year = taskContent.missionInformation.StartDate.Split("年")[0];
+        string month = taskContent.missionInformation.StartDate.Split("年")[1].Split("月")[0];
+        if (Convert.ToInt32(month) < 10) month = "0" + month;
+        string day = taskContent.missionInformation.StartDate.Split("年")[1].Split("月")[1].Split("日")[0];
+        if (Convert.ToInt32(day) < 10) day = "0" + day;
+        //string hour = taskContent.missionInformation.StartTime.Split("时")[0];
+        string date = year + "-" + month + "-" + day;// + " " + hour;
+        //Console.Write(date);
+        //Console.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH"));
+        var vis = helper.getVisibilityByDb(targetPoint.x, targetPoint.y, date); //DateTime.Now.ToString("yyyy-MM-dd HH")
 
         //if (!isbool)
         //{
-            getNCData = new GetNCData();
-            getNCData.GetData();
-            //isbool = true;
+        getNCData = new GetNCData();
+        getNCData.GetData();
+        //isbool = true;
         //}
 
         Task.Run(() =>

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

@@ -1,7 +1,7 @@
 {
     "仿真次数": 100,
     "想定信息": {
-        "想定日期": "2024年6月4日",
+        "想定日期": "2024年4月10日",
         "想定时间": "00时00分00秒"
     },
     "基地信息": [
@@ -156,7 +156,7 @@
     "搜救目标点初始坐标": [
         {
             "目标点ID": 1,
-            "目标点经度": 101,
+            "目标点经度": 101.00,
             "目标点纬度": 30.15,
             "目标点海拔": 0.0,
             "目标类型": {

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

@@ -70,9 +70,9 @@
                 "任务触发器": "时间触发",
                 "下一个任务ID": "",
                 "目标点ID": 1,
-                "开始日期": "2024年6月4日",
+                "开始日期": "2023年4月10日",
                 "开始时间": "00时00分00秒",
-                "结束日期": "2024年6月6日",
+                "结束日期": "2023年4月12日",
                 "结束时间": "23时00分00秒",
                 "起飞准备时间": 600.0,
                 "任务结束条件": {
@@ -143,9 +143,9 @@
                 "任务触发器": "时间触发",
                 "下一个任务ID": "",
                 "目标点ID": 1,
-                "开始日期": "2024年6月4日",
+                "开始日期": "2024年4月10日",
                 "开始时间": "00时00分00秒",
-                "结束日期": "2024年6月6日",
+                "结束日期": "2024年4月12日",
                 "结束时间": "23时00分00秒",
                 "起飞准备时间": 600.0,
                 "任务结束条件": {
@@ -226,9 +226,9 @@
                 "任务触发器": "时间触发",
                 "下一个任务ID": "",
                 "目标点ID": 4,
-                "开始日期": "2024年6月4日",
+                "开始日期": "2024年4月10日",
                 "开始时间": "00时00分00秒",
-                "结束日期": "2024年6月6日",
+                "结束日期": "2024年4月12日",
                 "结束时间": "23时00分00秒",
                 "起飞准备时间": 600.0,
                 "任务结束条件": {
@@ -277,9 +277,9 @@
                 "任务触发器": "时间触发",
                 "下一个任务ID": "",
                 "目标点ID": 5,
-                "开始日期": "2024年6月4日",
+                "开始日期": "2024年4月10日",
                 "开始时间": "00时00分00秒",
-                "结束日期": "2024年6月6日",
+                "结束日期": "2024年4月12日",
                 "结束时间": "23时00分00秒",
                 "起飞准备时间": 600.0,
                 "任务结束条件": {
@@ -333,9 +333,9 @@
                 "任务触发器": "时间触发",
                 "下一个任务ID": "",
                 "目标点ID": 6,
-                "开始日期": "2024年6月4日",
+                "开始日期": "2024年4月10日",
                 "开始时间": "00时00分00秒",
-                "结束日期": "2024年6月6日",
+                "结束日期": "2024年4月12日",
                 "结束时间": "23时00分00秒",
                 "起飞准备时间": 600.0,
                 "任务结束条件": {