浏览代码

更新一星一地重新定位

wyq 1 年之前
父节点
当前提交
131d7d4d37

+ 4 - 1
XdCxRhDW.App/Controllers/PosController.cs

@@ -2172,6 +2172,7 @@ namespace XdCxRhDW.App.Controllers
                 foreach (var item in list)
                 {
                     var dayFile = Path.Combine(dir, item);
+                    if (!File.Exists(dayFile)) continue;
                     using (RHDWPartContext db = RHDWPartContext.GetContext(dayFile))
                     {
                         var query = db.PosRes.Where(p => p.SigTime >= start && p.SigTime <= end && p.TaskInfoID == dto.TaskInfoID);
@@ -2238,6 +2239,7 @@ namespace XdCxRhDW.App.Controllers
                 foreach (var item in list)
                 {
                     var dayFile = Path.Combine(dir, item);
+                    if (!File.Exists(dayFile)) continue;
                     using (RHDWPartContext db = RHDWPartContext.GetContext(dayFile))
                     {
                         var query = db.PosRes.Where(p => p.SigTime >= start && p.SigTime <= end && p.TaskInfoID == dto.TaskInfoID);
@@ -2250,10 +2252,11 @@ namespace XdCxRhDW.App.Controllers
                         foreach (var itemPos in posRes)
                         {
                             var repos = new RePosRes();
+                            repos.ID = itemPos.ID;
                             repos.SigTime = itemPos.SigTime;
                             repos.PosLon = itemPos.PosLon;
                             repos.PosLat = itemPos.PosLat;
-                            repos.MirrLon= itemPos.MirrLon;
+                            repos.MirrLon = itemPos.MirrLon;
                             repos.MirrLat = itemPos.MirrLat;
                             repos.TaskInfoID = itemPos.TaskInfoID;
                             repos.FreqUpHz = itemPos.FreqUpHz;

+ 2 - 0
XdCxRhDW.App/UserControl/CtrlCgRes.cs

@@ -158,6 +158,8 @@ namespace XdCxRhDW.App.UserControl
                         var dayFiles = Directory.EnumerateFiles(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, yearDir), "*.db").OrderByDescending(p => Convert.ToInt32(new DirectoryInfo(p).Name.Substring(0, 4)));
                         foreach (var dayFile in dayFiles)
                         {
+
+                            if (!File.Exists(dayFile)) continue;
                             using (RHDWPartContext db = RHDWPartContext.GetContext(dayFile))
                             {
                                 if (db.CgRes.Any(p => p.TaskID == ((TaskInfo)txtTask.EditValue).ID))

+ 17 - 1
XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -1166,7 +1166,10 @@ namespace XdCxRhDW.App.UserControl
                                 Fx = item.CxRes.Fx,
                             };
                             var res = PosApi.X1D1_Pos(cgRes, StationRes, cxRes);
-
+                            item.PosLon = res[0];
+                            item.PosLat = res[1];
+                            item.MirrLon = res[3];
+                            item.MirrLat = res[4];
                             break;
                         case EnumPosResType.X2D1:
                         case EnumPosResType.X2D1NoRef:
@@ -1205,6 +1208,19 @@ namespace XdCxRhDW.App.UserControl
                         await db.SaveChangesAsync();
                     }
                 }
+                //var posids = items.Select(s => s.ID);
+                //var ds = this.gridHomePosRes.DataSource as List<ModelPosRes>;
+                //ds.Where(w => posids.Contains(w.ID)).ForEach(t =>
+                //{
+                //    var repos = items.First(i => i.ID == t.ID);
+                //    t.PosLon = repos.PosLon;
+                //    t.PosLat = repos.PosLat;
+                //    t.MirrLon = repos.MirrLon;
+                //    t.MirrLat = repos.MirrLat;
+                //});
+                //gridView2.RefreshData();
+                Serilog.Log.Warning($"共重新定位了{items.Count()}个定位点的目标信息");
+                MsgBoxHelper.ShowInfo($"共重新定位了{items.Count()}个定位点的目标信息");
 
 
             });