11

Service/CheckServer/Controllers/CheckController.cs

@@ -116,7 +116,7 @@ namespace CheckServer.Controllers
             }
             catch (Exception ex)
             {
-                await LogHelper.Error($"{dto.dmcType}检测异常", ex);
+                await LogHelper.Error($"文件【{Path.GetFileName(dto.file1)}】{dto.dmcType}检测异常", ex);
                 return Error<List<DetectResDto>>($"{dto.dmcType}检测异常");
             }
         }

Service/X2D1NoRefTaskServer/App.config

@@ -18,7 +18,7 @@
 		<add key="PosDtoFactor" value="1"/>
 
 		<!--实时任务采集时长(秒)-->
-		<add key="CapSeconds" value="15"/>
+		<add key="CapSeconds" value="60"/>
 
 		<!--主星转发延迟(us),平台信号中没有配置信号对应主星的转发延迟时将使用这个值-->
 		<add key="MainSatDelay" value="2235"/>

Service/X2D1NoRefTaskServer/Service/TaskService.cs

@@ -621,7 +621,7 @@ namespace X2D1NoRefTaskServer.Service
                                     doNextHour = true;
                                     break;
                                 }
-                                await Task.Delay(10000);
+                                await Task.Delay(10000,cts.Token);
                                 files = Directory.GetFiles(filesDir, "*.dat").ToList();
                                 continue;
                             }

XdCxRhDW.App/Controllers/SvrReportController.cs

@@ -32,10 +32,13 @@ namespace XdCxRhDW.App.Controllers
         {
             try
             {
-                if (dto.BaseHttpAddr.EndsWith("/"))
-                    dto.BaseHttpAddr = dto.BaseHttpAddr + "api/";
-                else
-                    dto.BaseHttpAddr = dto.BaseHttpAddr + "/api/";
+                if (!string.IsNullOrWhiteSpace(dto.BaseHttpAddr))
+                {
+                    if (dto.BaseHttpAddr.EndsWith("/"))
+                        dto.BaseHttpAddr = dto.BaseHttpAddr + "api/";
+                    else
+                        dto.BaseHttpAddr = dto.BaseHttpAddr + "/api/";
+                }
                 Messenger.Defalut.Pub("服务状态改变", dto);
                 return Success();
             }

XdCxRhDW.App/ExtensionsDev/MapControlEx.cs

@@ -642,8 +642,11 @@ public static class MapControlEx
             Tag = item,
             Location = new GeoPoint(item.PosLat, item.PosLon)
         };
-        innerData._dataCache.Add(item, mapItem);
-        innerData.posStorge.Items.Add(mapItem);
+        if (!innerData._dataCache.ContainsKey(item))
+        {
+            innerData._dataCache.Add(item, mapItem);
+            innerData.posStorge.Items.Add(mapItem);
+        }
 
     }
     /// <summary>
@@ -3052,8 +3055,8 @@ public static class MapControlEx
                         {
                             suffix = ".jpg";
                         }
-                        int maxY=(int)Math.Pow(2, zoomLevel);
-                        imgUrl = $"{HttpServerAddr}/{LayerName}/{zoomLevel}/{tilePositionX}/{maxY-tilePositionY}{suffix}";
+                        int maxY = (int)Math.Pow(2, zoomLevel);
+                        imgUrl = $"{HttpServerAddr}/{LayerName}/{zoomLevel}/{tilePositionX}/{maxY - tilePositionY}{suffix}";
                     }
                     //string imgUrl = string.Format("http://192.168.0.214:58089/{0}/{1}/{2}/{3}", (int)GoogleMapType.Normal, zoomLevel, tilePositionX, tilePositionY);
                     Uri u = new Uri(imgUrl);

XdCxRhDW.App/Model/ModelPosRes.cs

@@ -23,5 +23,10 @@ namespace XdCxRhDW.App.Model
         [Display(Name = "检测方式")]
         [ToolTip]
         public string CheckType => CheckRes?.PosCheckType?.GetEnumDisplayName();
+
+        public override int GetHashCode()
+        {
+            return $"ModelPosRes_{TaskInfoID}_{ID}".GetHashCode();
+        }
     }
 }

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -229,8 +229,21 @@ namespace XdCxRhDW.App.UserControl
                     return;
                 if (posRes.PosLon == 999 && !btnIncludeInvalidate.Checked)
                     return;
+                if (txtTimeCho.Text == "自定义")
+                {
+                    return;
+                }
+                var hours = Convert.ToInt32(txtTimeCho.EditValue);
                 var ds = this.gridHomePosRes.DataSource as List<ModelPosRes>;
                 ds.Insert(0, posRes);
+                var max = ds.Max(p => p.SigTime);
+                var removeItems = ds.Where(p => (max - p.SigTime).TotalHours > hours).ToList();
+                foreach (var item in removeItems)
+                {
+                    ds.Remove(item);
+                    mapControl1.DelPosItem(item, false);
+                }
+
                 this.Invoke(new Action(() =>
                 {
                     gridView2.RefreshData();

XdCxRhDW.App/XdCxRhDW.App.csproj

@@ -679,7 +679,7 @@ del System*.xml,Microsoft*.xml,autofac*.xml,MySql*.xml,K4os*.xml,google*.xml
 del BouncyCastle*.xml,Serilog.Sinks.File.pdb
 copy $(SolutionDir)tips.txt tips.txt
 copy $(SolutionDir)geo.txt geo.txt
-copy $(SolutionDir)服务数据清理.exe 服务数据清理.exe
+copy $(SolutionDir)数据清理.exe 数据清理.exe
 
 if not exist "AddIns" md AddIns
 move /Y *.dll AddIns