123

XdCxRhDW.App/Controllers/FileController.cs

@@ -33,7 +33,7 @@ namespace XdCxRhDW.App.Controllers
         /// <returns></returns>
         [HttpPost, SwaggerForm]
         public async Task<AjaxResult<string>> UploadFileAsync()
-        {
+         {
             if (!Request.Content.IsMimeMultipartContent("form-data"))
             {
                 bool s=Request.Content.IsFormData();

XdCxRhDW.App/DxHelper/PopupHelper.cs

@@ -76,6 +76,10 @@ namespace DxHelper
         /// <param name="renderDone">渲染完成后的回调函数</param>
         public static void ShowPopup(Control content, Control owner, int size = 0, EnumPopupDirection direct = EnumPopupDirection.Right, EnumPopupAnimation animation = EnumPopupAnimation.Slide, bool showCloseButton = true, bool autoClose = false, Action renderDone = null)
         {
+            foreach (var item in dic.Values)
+            {
+                item.HidePopup();
+            }
             FlyoutPanel docker;
             if (!dic.ContainsKey(content))
             {

XdCxRhDW.App/EditForms/EditorTar.Designer.cs

@@ -72,7 +72,7 @@
             this.btnOk.Size = new System.Drawing.Size(105, 22);
             this.btnOk.StyleController = this.layoutControl1;
             this.btnOk.TabIndex = 8;
-            this.btnOk.Text = "确定q";
+            this.btnOk.Text = "确定";
             this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
             // 
             // btnCancel

XdCxRhDW.App/EditForms/EditorTar.cs

@@ -37,10 +37,21 @@ namespace XdCxRhDW.App.EditForms
                 infos.AddRange(res);
             }
             this.searchLookUpEdit1.UseDefault().SetData(infos,nameof(TargetInfo.TargetName)).UseDoubleClickToSelectAll();
+            this.searchLookUpEdit1.Properties.View.RowCellStyle += View_RowCellStyle;
             if (info != null)
                 this.searchLookUpEdit1.Text = info.TargetName;
         }
 
+        private void View_RowCellStyle(object sender, DevExpress.XtraGrid.Views.Grid.RowCellStyleEventArgs e)
+        {
+            if (e.CellValue == null) return;
+            if (e.Column.FieldName == nameof(TargetInfo.TargeColor))
+            {
+                var clolrRes = ColorTranslator.FromHtml(e.CellValue.ToString());
+                e.Appearance.BackColor = clolrRes;
+            }
+        }
+
         private void btnCancel_Click(object sender, EventArgs e)
         {
             this.DialogResult = DialogResult.Cancel;

XdCxRhDW.App/EditForms/TaskEditor.cs

@@ -69,7 +69,7 @@ namespace XdCxRhDW.App.EditForms
                 this.txtAdja1Sat.UseDefault().SetData(sats, nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
                 this.txtAdja2Sat.UseDefault().SetData(sats, nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
             }
-            if (this.Text == "编辑任务" && info != null)
+            if (this.Text.StartsWith("编辑任务") && info != null)
             {
                 using (RHDWContext db = new RHDWContext())
                 {
@@ -83,18 +83,18 @@ namespace XdCxRhDW.App.EditForms
                     this.txtSignalType.EditValue = info.SigType;
                     if (info.DetectionWay != null)
                     {
-                        List<EnumDetectionWay> deWay = new List<EnumDetectionWay>();
-                        if (info.DetectionWay.Value.HasFlag(EnumDetectionWay.DAMA))
+                        List<EnumTaskCheckType> deWay = new List<EnumTaskCheckType>();
+                        if (info.DetectionWay.Value.HasFlag(EnumTaskCheckType.DAMA))
                         {
-                            deWay.Add(EnumDetectionWay.DAMA);
+                            deWay.Add(EnumTaskCheckType.DAMA);
                         }
-                        if (info.DetectionWay.Value.HasFlag(EnumDetectionWay.IBS))
+                        if (info.DetectionWay.Value.HasFlag(EnumTaskCheckType.IBS))
                         {
-                            deWay.Add(EnumDetectionWay.IBS);
+                            deWay.Add(EnumTaskCheckType.IBS);
                         }
-                        if (info.DetectionWay.Value.HasFlag(EnumDetectionWay.Ky5758))
+                        if (info.DetectionWay.Value.HasFlag(EnumTaskCheckType.Ky5758))
                         {
-                            deWay.Add(EnumDetectionWay.Ky5758);
+                            deWay.Add(EnumTaskCheckType.Ky5758);
                         }
                         this.txtDetectionWay.EditValue = string.Join(",", deWay);
                     }
@@ -253,15 +253,15 @@ namespace XdCxRhDW.App.EditForms
                     var res = txtDetectionWay.EditValue.ToString().Split(new string[] { "," }, System.StringSplitOptions.RemoveEmptyEntries).ToList();
                     if (res.Count() == 2)
                     {
-                        info.DetectionWay = (EnumDetectionWay)Enum.Parse(typeof(EnumDetectionWay), res[0]) | (EnumDetectionWay)Enum.Parse(typeof(EnumDetectionWay), res[1]);
+                        info.DetectionWay = (EnumTaskCheckType)Enum.Parse(typeof(EnumTaskCheckType), res[0]) | (EnumTaskCheckType)Enum.Parse(typeof(EnumTaskCheckType), res[1]);
                     }
                     else if (res.Count() == 3)
                     {
-                        info.DetectionWay = (EnumDetectionWay)Enum.Parse(typeof(EnumDetectionWay), res[0]) | (EnumDetectionWay)Enum.Parse(typeof(EnumDetectionWay), res[1]) | (EnumDetectionWay)Enum.Parse(typeof(EnumDetectionWay), res[2]);
+                        info.DetectionWay = (EnumTaskCheckType)Enum.Parse(typeof(EnumTaskCheckType), res[0]) | (EnumTaskCheckType)Enum.Parse(typeof(EnumTaskCheckType), res[1]) | (EnumTaskCheckType)Enum.Parse(typeof(EnumTaskCheckType), res[2]);
                     }
                     else
                     {
-                        info.DetectionWay = (EnumDetectionWay)Enum.Parse(typeof(EnumDetectionWay), res[0]);
+                        info.DetectionWay = (EnumTaskCheckType)Enum.Parse(typeof(EnumTaskCheckType), res[0]);
                     }
                 }
                 else
@@ -374,7 +374,7 @@ namespace XdCxRhDW.App.EditForms
                 if (selectedEnum == EnumSigType.SX)
                 {
                     txtDetectionWay.Properties.Items.Clear();
-                    txtDetectionWay.Properties.Items.AddEnum<EnumDetectionWay>();
+                    txtDetectionWay.Properties.Items.AddEnum<EnumTaskCheckType>();
                     itemDetectionWay.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
                 }
                 else

XdCxRhDW.App/ExtensionsDev/MapControlEx.cs

@@ -178,9 +178,24 @@ public static class MapControlEx
                         }
                         if (!string.IsNullOrWhiteSpace(Format))
                             f = Format;
-                        string valStr;
-                        if (!string.IsNullOrWhiteSpace(f))
+                        string valStr = "";
+                        if (val is null)
+                            valStr = "--";
+                        else if (!string.IsNullOrWhiteSpace(f))
                             valStr = ((dynamic)val).ToString(f);
+                        else if (val.GetType().IsEnum)
+                        {
+                            var field = val.GetType().GetField(Enum.GetName(val.GetType(), val));
+                            var attr = field.GetCustomAttribute<DisplayAttribute>();
+                            if (attr != null && !string.IsNullOrWhiteSpace(attr.Name))
+                            {
+                                valStr = attr.Name;
+                            }
+                            else
+                            {
+                                valStr = val.ToString();
+                            }
+                        }
                         else
                             valStr = val.ToString();
                         ToolTipItem tipItem = new ToolTipItem();

XdCxRhDW.App/MainForm.cs

@@ -87,16 +87,26 @@ namespace XdCxRhDW
                     {
                         var fileName = await HttpHelper.UploadFileAsync(file, baseUrl + "File/UploadFileAsync");
                         XlImportDto dto = new XlImportDto() { File = fileName };
-                        await HttpHelper.PostRequestAsync<int>(baseUrl + "Xl/ImportTleAsync", dto);
-
-                        //导入完成的文件放在备份目录
-                        var baseDirectory = Path.Combine(backUpDir, "TleBackUp");
-                        Directory.CreateDirectory(baseDirectory);
-                        File.Move(file, Path.Combine(baseDirectory, Path.GetFileName(file)));
+                        var res = await HttpHelper.PostRequestAsync<RecordRes>(baseUrl + "Xl/ImportTleAsync", dto);
+                        if (res.code == 200)
+                        {
+                            Serilog.Log.Information($"星历文件[{file}]自动导入成功!");
+                            //导入完成的文件放在备份目录
+                            var baseDirectory = Path.Combine(backUpDir, "TleBackUp");
+                            Directory.CreateDirectory(baseDirectory);
+                            var newFile = Path.Combine(baseDirectory, Path.GetFileName(file));
+                            if (File.Exists(newFile))
+                                File.Delete(newFile);
+                            File.Move(file, newFile);
+                        }
+                        else
+                        {
+                            Serilog.Log.Information($"星历文件[{file}]自动导入失败.{res.msg}");
+                        }
                     }
                     catch (Exception ex)
                     {
-                        Serilog.Log.Error(ex, "自动导入星历出错");
+                        Serilog.Log.Error(ex, $"星历文件[{file}]自动导入失败");
                     }
                 }
 

XdCxRhDW.App/Model/ModelPosRes.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XdCxRhDW.Dto;
+using XdCxRhDW.Entity;
+
+namespace XdCxRhDW.App.Model
+{
+    public class ModelPosRes : PosRes
+    {
+        [Display(Name = "目标名称")]
+        public string TargetName => TargetInfo?.TargetName;
+
+        [Display(Name = "检测方式")]
+        public EnumPosCheckType? CheckType => CheckRes?.PosCheckType;
+    }
+}

XdCxRhDW.App/PopupControl/ShowCheckCtrl.cs

@@ -58,17 +58,8 @@ namespace XdCxRhDW.App.PopupControl
 
         private void gridView1_CustomColumnDisplayText(object sender, DevExpress.XtraGrid.Views.Base.CustomColumnDisplayTextEventArgs e)
         {
-            if (e.Column.FieldName == nameof(CheckRes.DetectionWay))
-            {
-                List<EnumDetectionWay> enumRes = new List<EnumDetectionWay>();
-                if (((EnumDetectionWay)e.Value).HasFlag(EnumDetectionWay.DAMA))
-                    enumRes.Add(EnumDetectionWay.DAMA);
-                if (((EnumDetectionWay)e.Value).HasFlag(EnumDetectionWay.IBS))
-                    enumRes.Add(EnumDetectionWay.IBS);
-                if (((EnumDetectionWay)e.Value).HasFlag(EnumDetectionWay.Ky5758))
-                    enumRes.Add(EnumDetectionWay.Ky5758);
-                e.DisplayText = string.Join(",", enumRes);
-            }
+            if (e.Value == null)
+                e.DisplayText = "--";
         }
     }
 }

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -34,6 +34,7 @@ using XdCxRhDW.App.Controllers;
 using DevExpress.XtraPrinting.Native.Properties;
 using DevExpress.Utils.Drawing.Helpers;
 using DevExpress.Office.Crypto;
+using XdCxRhDW.App.Model;
 
 namespace XdCxRhDW.App.UserControl
 {
@@ -48,12 +49,12 @@ namespace XdCxRhDW.App.UserControl
             layoutControl1.UseDefault();
         }
 
-        private void PosSubEvent(PosRes posRes)
+        private void PosSubEvent(ModelPosRes posRes)
         {
             var currentTask = gridView1.GetFocusedRow() as TaskInfo;
             if (currentTask.ID == posRes.TaskInfoID)
             {
-                var ds = this.gridHomePosRes.DataSource as List<PosRes>;
+                var ds = this.gridHomePosRes.DataSource as List<ModelPosRes>;
                 ds.Insert(0, posRes);
                 this.Invoke(new Action(() =>
                 {
@@ -73,17 +74,17 @@ namespace XdCxRhDW.App.UserControl
         private async void CtrlHome_Load(object sender, EventArgs e)
         {
             gridHomeTask.Init<TaskInfo>().UseFilter().DataSource = list;
-            gridHomePosRes.Init<PosRes>().UseMultiSelect().UseRowNumber().UseSort().UseFilter()
+            gridHomePosRes.Init<ModelPosRes>().UseMultiSelect().UseRowNumber().UseSort().UseFilter()
                 .AddMenu("删除", SvgHelper.CreateClose(), async () =>
                 {
                     if (!MsgBoxHelper.ShowConfirm("是否删除选中的记录!")) return;
                     try
                     {
                         var rows = gridView2.GetSelectedRows();
-                        List<PosRes> list = new List<PosRes>();
+                        List<ModelPosRes> list = new List<ModelPosRes>();
                         foreach (var item in rows)
                         {
-                            list.Add(gridView2.GetRow(item) as PosRes);
+                            list.Add(gridView2.GetRow(item) as ModelPosRes);
                         }
                         var groupItems = list.GroupBy(p => p.SigTime.ToString("yyyyMMdd"));
                         foreach (var groupItem in groupItems)
@@ -103,14 +104,14 @@ namespace XdCxRhDW.App.UserControl
                         Serilog.Log.Error(ex, "表格中删除定位点异常!");
                         DxHelper.MsgBoxHelper.ShowError("删除定位点异常!");
                     }
-                }, popupMenu2).DataSource = new List<PosRes>();
+                }, popupMenu2).DataSource = new List<ModelPosRes>();
             txtStartTime.UseDefault();
             txtEndTime.UseDefault();
             btnDrawDto.ImageOptions.SvgImage = SvgHelper.LoadFromFile("Image\\DtoLine.svg");
             btnDrawDfo.ImageOptions.SvgImage = SvgHelper.LoadFromFile("Image\\DfoLine.svg");
             btnGDOP.ImageOptions.SvgImage = SvgHelper.LoadFromFile("Image\\GDOP.svg");
             btnPos.ImageOptions.SvgImage = SvgHelper.LoadFromFile("Image\\Pos.svg");
-            Messenger.Defalut.Sub<PosRes>("新增定位点", PosSubEvent);
+            Messenger.Defalut.Sub<ModelPosRes>("新增定位点", PosSubEvent);
             Messenger.Defalut.Sub<SysSetings>("系统配置改变", ConfigSubEvent);
             //mapService = "http://ows.mundialis.de/services/service";
             mapControl1.UseDefalutOptions()
@@ -177,8 +178,8 @@ namespace XdCxRhDW.App.UserControl
                 List<TxInfo> txList = new List<TxInfo>();
                 using (RHDWContext db = new RHDWContext())
                 {
-                    var qq = db.TaskInfos.OrderByDescending(p => p.UpdateTime).ToList();
-                    list.AddRange(qq);
+                    var tasks = db.TaskInfos.OrderByDescending(p => p.UpdateTime).ToList();
+                    list.AddRange(tasks);
                     var runningList = await db.TaskInfos.Where(p => p.TaskState == EnumTaskState.Running).ToListAsync();
                     foreach (var item in runningList)
                     {
@@ -191,7 +192,7 @@ namespace XdCxRhDW.App.UserControl
                     var txres = await db.TxInfos.ToListAsync();
                     txList.AddRange(txres);
                 }
-                mapControl1.AddRectMenu<PosRes>("删除定位点", SvgHelper.CreateClose(), async items =>
+                mapControl1.AddRectMenu<ModelPosRes>("删除定位点", SvgHelper.CreateClose(), async items =>
                 {
                     var count = await DeletePosRes(items.ToList());
                     if (count > 0)
@@ -200,7 +201,7 @@ namespace XdCxRhDW.App.UserControl
                         MsgBoxHelper.ShowInfo($"共删除了{items.Count()}个定位点");
                     }
                 });
-                mapControl1.AddRectMenu<PosRes>("使用镜像点", SvgHelper.LoadFromFile("Image\\Pos.svg"), async items =>
+                mapControl1.AddRectMenu<ModelPosRes>("使用镜像点", SvgHelper.LoadFromFile("Image\\Pos.svg"), async items =>
                    {
                        var count = await UseMirr(items.ToList());
                        if (count > 0)
@@ -209,7 +210,7 @@ namespace XdCxRhDW.App.UserControl
                            MsgBoxHelper.ShowInfo($"共修改了{items.Count()}个定位点的镜像点");
                        }
                    });
-                mapControl1.AddRectMenu<PosRes>("编辑目标", SvgHelper.LoadFromFile("Image\\Edit.svg"), async items =>
+                mapControl1.AddRectMenu<ModelPosRes>("编辑目标", SvgHelper.LoadFromFile("Image\\Edit.svg"), async items =>
                 {
                     var count = await EditTarget(items.ToList());
                     if (count > 0)
@@ -218,15 +219,15 @@ namespace XdCxRhDW.App.UserControl
                         MsgBoxHelper.ShowInfo($"共修改了{items.Count()}个定位点的目标信息");
                     }
                 });
-                mapControl1.AddPosMenu<PosRes>("手动定位", SvgHelper.LoadFromFile("Image\\Pos.svg"), item =>
+                mapControl1.AddPosMenu<ModelPosRes>("手动定位", SvgHelper.LoadFromFile("Image\\Pos.svg"), item =>
                 {
                     Pos(item);
                 });
-                mapControl1.AddRectMenu<PosRes>("转到列表", SvgHelper.LoadFromFile("Image\\To.svg"), items =>
+                mapControl1.AddRectMenu<ModelPosRes>("转到列表", SvgHelper.LoadFromFile("Image\\To.svg"), items =>
                 {
                     ToPosList(items.ToList());
                 });
-                mapControl1.AddPosMenu<PosRes>("绘制时差线", SvgHelper.LoadFromFile("Image\\DtoLine.svg"), item =>
+                mapControl1.AddPosMenu<ModelPosRes>("绘制时差线", SvgHelper.LoadFromFile("Image\\DtoLine.svg"), item =>
                 {
                     DrawDtoLine(item);
                 }, p =>
@@ -247,7 +248,7 @@ namespace XdCxRhDW.App.UserControl
                             return true;
                     }
                 })
-                .AddPosMenu<PosRes>("绘制频差线", SvgHelper.LoadFromFile("Image\\DfoLine.svg"), item =>
+                .AddPosMenu<ModelPosRes>("绘制频差线", SvgHelper.LoadFromFile("Image\\DfoLine.svg"), item =>
                 {
                     DrawDfoLine(item);
                 }, p =>
@@ -267,7 +268,7 @@ namespace XdCxRhDW.App.UserControl
                             return false;
                     }
                 })
-                 .AddPosMenu<PosRes>("绘制GDOP", SvgHelper.LoadFromFile("Image\\GDOP.svg"), item =>
+                 .AddPosMenu<ModelPosRes>("绘制GDOP", SvgHelper.LoadFromFile("Image\\GDOP.svg"), item =>
                   {
                       DrawGDOP(item);
                   }, p =>
@@ -287,7 +288,7 @@ namespace XdCxRhDW.App.UserControl
                               return false;
                       }
                   })
-                 .AddPosMenu<PosRes>("绘制测向线", btnDrawCX.ImageOptions.SvgImage, item =>
+                 .AddPosMenu<ModelPosRes>("绘制测向线", btnDrawCX.ImageOptions.SvgImage, item =>
                   {
                       DrawCXLine(item);
                   }, p =>
@@ -307,12 +308,12 @@ namespace XdCxRhDW.App.UserControl
                               return false;
                       }
                   })
-                  .AddPosMenu<PosRes>("查看参估", btnShowCgRes.ImageOptions.SvgImage, item =>
+                  .AddPosMenu<ModelPosRes>("查看参估", btnShowCgRes.ImageOptions.SvgImage, item =>
                   {
                       DxHelper.PopupHelper.ShowPopup(new ShowCgCtrl(item), gridHomePosRes, gridHomePosRes.Height + 80, EnumPopupDirection.Bottom, showCloseButton: true);
 
                   })
-                  .AddPosMenu<PosRes>("查看测向", btnShowCxRes.ImageOptions.SvgImage, item =>
+                  .AddPosMenu<ModelPosRes>("查看测向", btnShowCxRes.ImageOptions.SvgImage, item =>
                    {
                        DxHelper.PopupHelper.ShowPopup(new ShowCxCtrl(item), gridHomePosRes, gridHomePosRes.Height + 80, EnumPopupDirection.Bottom, showCloseButton: true);
                    }, p =>
@@ -350,12 +351,12 @@ namespace XdCxRhDW.App.UserControl
             txtTimeCho_SelectedIndexChanged(null, null);
             WaitHelper.CloseForm();
         }
-        private async Task<int> EditTarget(List<PosRes> items)
+        private async Task<int> EditTarget(List<ModelPosRes> items)
         {
             try
             {
                 if (items.Count == 0) return 0;
-                var targetID = items.Where(p => p.TargetID > 0).FirstOrDefault()?.TargetID;
+                var targetID = items.Where(p => p.TargetInfoID > 0).FirstOrDefault()?.TargetInfoID;
                 TargetInfo info = null;
                 if (targetID > 0)
                 {
@@ -377,8 +378,8 @@ namespace XdCxRhDW.App.UserControl
                         var tarItems = await db.PosRes.Where(p => ids.Contains(p.ID)).ToArrayAsync();
                         tarItems.ForEach(t =>
                         {
-                            t.TargetID = tar.ID;
-                            t.TarName = tar.TargetName;
+                            t.TargetInfoID = tar.ID;
+                            //t.TargetName = tar.TargetName;
                         });
                         db.PosRes.AddOrUpdate(tarItems);
                         await db.SaveChangesAsync();
@@ -396,7 +397,7 @@ namespace XdCxRhDW.App.UserControl
         }
 
 
-        private void ToPosList(List<PosRes> items)
+        private void ToPosList(List<ModelPosRes> items)
         {
             if (items == null || items.Count() == 0)
             {
@@ -405,7 +406,7 @@ namespace XdCxRhDW.App.UserControl
             }
             try
             {
-                var ds = this.gridHomePosRes.DataSource as List<PosRes>;
+                var ds = this.gridHomePosRes.DataSource as List<ModelPosRes>;
                 var ids = items.Select(p => p.ID).ToList();
 
                 //删除地图
@@ -423,7 +424,7 @@ namespace XdCxRhDW.App.UserControl
             }
 
         }
-        private async Task<int> UseMirr(List<PosRes> items)
+        private async Task<int> UseMirr(List<ModelPosRes> items)
         {
             if (items == null || items.Count() == 0)
             {
@@ -461,7 +462,7 @@ namespace XdCxRhDW.App.UserControl
             }
 
         }
-        private async Task<int> DeletePosRes(List<PosRes> items)
+        private async Task<int> DeletePosRes(List<ModelPosRes> items)
         {
             if (items == null || items.Count() == 0)
             {
@@ -480,13 +481,13 @@ namespace XdCxRhDW.App.UserControl
                     var ids = groupItem.Select(m => m.ID).ToList();
                     using (RHDWPartContext db = RHDWPartContext.GetContext(groupItem.First().SigTime))
                     {
-                        List<PosRes> list = await db.PosRes.Where(p => ids.Contains(p.ID)).ToListAsync();
+                        var list = await db.PosRes.Where(p => ids.Contains(p.ID)).ToListAsync();
                         db.PosRes.RemoveRange(list);
                         await db.SaveChangesAsync();
                     }
                 }
                 mapControl1.DelPosItem(items);
-                var ds = this.gridHomePosRes.DataSource as List<PosRes>;
+                var ds = this.gridHomePosRes.DataSource as List<ModelPosRes>;
                 ds.RemoveAll(m => items.Select(p => p.ID).Contains(m.ID));
                 gridView2.RefreshData();
                 return items.Count;
@@ -553,10 +554,10 @@ namespace XdCxRhDW.App.UserControl
             var btnEdit = (layoutControlGroup1.CustomHeaderButtons[1] as GroupBoxButton);
             var btnDel = (layoutControlGroup1.CustomHeaderButtons[2] as GroupBoxButton);
             btnDel.Enabled = btnEdit.Enabled = tsk.TaskState != EnumTaskState.Running;
-            List<PosRes> listPos = null;
+            List<ModelPosRes> listPos = null;
             if (txtTimeCho.Text == "自定义" && (txtStartTime.EditValue == null || txtEndTime.EditValue == null || txtStartTime.DateTime > txtEndTime.DateTime))
             {
-                listPos = new List<PosRes>();
+                listPos = new List<ModelPosRes>();
                 this.gridHomePosRes.DataSource = listPos;
                 mapControl1.SetPosDataSource(listPos);
             }
@@ -584,7 +585,7 @@ namespace XdCxRhDW.App.UserControl
         private void GridView2_FocusedRowObjectChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowObjectChangedEventArgs e)
         {
             mapControl1.DelFixedImg("Tx");
-            var posItem = (e.Row as PosRes);
+            var posItem = (e.Row as ModelPosRes);
             if (posItem == null) return;
             using (RHDWPartContext db = RHDWPartContext.GetContext(posItem.SigTime))
             {
@@ -852,7 +853,7 @@ namespace XdCxRhDW.App.UserControl
                         dto.TaskName = tsk.TaskName;
                         dto.PosType = (EnumPosTypeDto)(int)tsk.PosType;
                         dto.SigType = (EnumSigTypeDto)(int)tsk.SigType;
-                        dto.DmcType = (DmcTypeDto)tsk.DetectionWay.Value;
+                        dto.TaskCheckType = (EnumTaskCheckTypeDto)(int)tsk.DetectionWay.Value;
                         dto.CapDir = tsk.CapDir;
                         dto.DateDirFormat = tsk.CapDirFormat;
                         var strs = tsk.HistoryFrequpMHz.Split(',');
@@ -926,7 +927,7 @@ namespace XdCxRhDW.App.UserControl
 
         private void gridView2_RowClick(object sender, RowClickEventArgs e)
         {
-            var p = gridView2.GetFocusedRow() as PosRes;
+            var p = gridView2.GetFocusedRow() as ModelPosRes;
             p.Selected = true;
             mapControl1.UpdatePosItem(p, true);
         }
@@ -937,7 +938,7 @@ namespace XdCxRhDW.App.UserControl
             if (info == null) return;
             DrawDtoLine(info);
         }
-        private PosRes GetPosRes(string msg)
+        private ModelPosRes GetPosRes(string msg)
         {
             var ids = gridView2.GetSelectedRows();
             if (ids.Length <= 0)
@@ -945,7 +946,7 @@ namespace XdCxRhDW.App.UserControl
                 DxHelper.MsgBoxHelper.ShowWarning($"请选择需要{msg}的定位数据信息!");
                 return null;
             }
-            var item = gridView2.GetRow(ids[0]) as PosRes;
+            var item = gridView2.GetRow(ids[0]) as ModelPosRes;
             return item;
         }
 
@@ -965,7 +966,7 @@ namespace XdCxRhDW.App.UserControl
                 DxHelper.MsgBoxHelper.ShowWarning($"请选择需要绘制测向线的定位数据信息!");
                 return;
             }
-            var item = gridView2.GetRow(ids[0]) as PosRes;
+            var item = gridView2.GetRow(ids[0]) as ModelPosRes;
             if (item.PosResType == EnumPosResType.X1D1CX)
             {
                 DrawCXLine(item);
@@ -980,23 +981,23 @@ namespace XdCxRhDW.App.UserControl
         }
         private void btnShowCgRes_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            var item = gridView2.GetFocusedRow() as PosRes;
+            var item = gridView2.GetFocusedRow() as ModelPosRes;
             DxHelper.PopupHelper.ShowPopup(new ShowCgCtrl(item), gridHomePosRes, gridHomePosRes.Height + 80, EnumPopupDirection.Bottom, showCloseButton: true);
         }
 
         private void btnShowCxRes_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            var item = gridView2.GetFocusedRow() as PosRes;
+            var item = gridView2.GetFocusedRow() as ModelPosRes;
             DxHelper.PopupHelper.ShowPopup(new ShowCxCtrl(item), gridHomePosRes, gridHomePosRes.Height + 80, EnumPopupDirection.Bottom, showCloseButton: true);
         }
 
         private void btnCheckRes_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            var item = gridView2.GetFocusedRow() as PosRes;
+            var item = gridView2.GetFocusedRow() as ModelPosRes;
             DxHelper.PopupHelper.ShowPopup(new ShowCheckCtrl(item), gridHomePosRes, gridHomePosRes.Height + 80, EnumPopupDirection.Bottom, showCloseButton: true);
         }
 
-        private void DrawGDOP(PosRes item)
+        private void DrawGDOP(ModelPosRes item)
         {
             try
             {
@@ -1040,7 +1041,7 @@ namespace XdCxRhDW.App.UserControl
             }
         }
 
-        private void DrawDtoLine(PosRes item)
+        private void DrawDtoLine(ModelPosRes item)
         {
 
             switch (item.PosResType)
@@ -1069,7 +1070,7 @@ namespace XdCxRhDW.App.UserControl
 
         }
 
-        private void DrawDfoLine(PosRes item)
+        private void DrawDfoLine(ModelPosRes item)
         {
             switch (item.PosResType)
             {
@@ -1082,7 +1083,7 @@ namespace XdCxRhDW.App.UserControl
             }
 
         }
-        private void Pos(PosRes item)
+        private void Pos(ModelPosRes item)
         {
             switch (item.PosResType)
             {
@@ -1113,7 +1114,7 @@ namespace XdCxRhDW.App.UserControl
             }
 
         }
-        private async void DrawX3DfoLine(PosRes item)
+        private async void DrawX3DfoLine(ModelPosRes item)
         {
             try
             {
@@ -1194,7 +1195,7 @@ namespace XdCxRhDW.App.UserControl
                 DxHelper.MsgBoxHelper.ShowError($"绘制{item.PosResType.GetEnumDisplayName()}频差线失败");
             }
         }
-        private async void DrawCXLine(PosRes item)
+        private async void DrawCXLine(ModelPosRes item)
         {
             try
             {
@@ -1249,8 +1250,8 @@ namespace XdCxRhDW.App.UserControl
         {
             listCts.ForEach(t => t.Cancel());
             listCts.Clear();
-            this.gridHomePosRes.DataSource = new List<PosRes>();//先设为空,数据相同时便于观察结果有没有变化
-            this.mapControl1.SetPosDataSource(new List<PosRes>());
+            this.gridHomePosRes.DataSource = new List<ModelPosRes>();//先设为空,数据相同时便于观察结果有没有变化
+            this.mapControl1.SetPosDataSource(new List<ModelPosRes>());
             if (tsk == null)
             {
                 return;
@@ -1285,7 +1286,7 @@ namespace XdCxRhDW.App.UserControl
             {
                 listCts.ForEach(t => t.Cancel());
                 listCts.Clear();
-                this.gridHomePosRes.DataSource = new List<PosRes>();//先设为空,数据相同时便于观察结果有没有变化
+                this.gridHomePosRes.DataSource = new List<ModelPosRes>();//先设为空,数据相同时便于观察结果有没有变化
                 if (tsk == null)
                 {
                     return;
@@ -1322,7 +1323,7 @@ namespace XdCxRhDW.App.UserControl
 
 
         }
-        private async Task<List<PosRes>> searchPos(CancellationToken ct = default)
+        private async Task<List<ModelPosRes>> searchPos(CancellationToken ct = default)
         {
             gridView2.ClearSorting();
             gridView2.ClearFindFilter();
@@ -1338,7 +1339,7 @@ namespace XdCxRhDW.App.UserControl
             }
             try
             {
-                List<PosRes> list = new List<PosRes>();
+                List<ModelPosRes> list = new List<ModelPosRes>();
                 if (txtTimeCho.Text == "自定义")
                 {
                     var dto = new PosRequestByTimeRangeDto()
@@ -1357,7 +1358,7 @@ namespace XdCxRhDW.App.UserControl
                         {
                             MsgBoxHelper.ShowWarning(res.msg);
                         }
-                        list = res.data.Select(p => Map(p)).ToList();
+                        list = res.data;
                     }
                     else
                     {
@@ -1384,7 +1385,7 @@ namespace XdCxRhDW.App.UserControl
                         {
                             MsgBoxHelper.ShowWarning(res.msg);
                         }
-                        list = res.data.Select(p => Map(p)).ToList();
+                        list = res.data;
                     }
                     else
                     {
@@ -1399,7 +1400,7 @@ namespace XdCxRhDW.App.UserControl
                 Serilog.Log.Error(ex, "定位结果查询异常");
                 MsgBoxHelper.ShowError("定位结果查询异常");
             }
-            return new List<PosRes>();
+            return new List<ModelPosRes>();
         }
 
         private void btnPos_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -1409,38 +1410,6 @@ namespace XdCxRhDW.App.UserControl
             Pos(info);
         }
 
-        private PosRes Map(ModelPosRes res)
-        {
-            return new PosRes()
-            {
-                ID = res.ID,
-                CgResID = res.CgResID,
-                ClusterCount = res.ClusterCount,
-                ClusterKey = res.ClusterKey,
-                ColorKey = res.ColorKey,
-                CreateTime = res.CreateTime,
-                CxResID = res.CxResID,
-                CheckResID=res.CheckResID,
-                Selected = res.Selected,
-                StationResID = res.StationResID,
-                TargetID = res.TargetID,
-                TargetState = res.TargetState,
-                TsName = res.TsName,
-                UpdateTime = res.UpdateTime,
-                Visible = res.Visible,
-                SigTime = res.SigTime,
-                TaskInfoID = res.TaskInfoID,
-                TarName = string.IsNullOrWhiteSpace(res.TarName) ? "未知目标" : res.TarName,
-                PosLon = res.PosLon,
-                PosLat = res.PosLat,
-                MirrLon = res.MirrLon,
-                MirrLat = res.MirrLat,
-                FreqUpHz = res.FreqUpHz,
-                PosResType = (EnumPosResType)((int)res.PosResType)
-            };
-        }
-
-     
     }
 }
 

XdCxRhDW.App/UserControl/CtrlTarget.cs

@@ -157,6 +157,7 @@ namespace XdCxRhDW.App.UserControl
 
         private void gridView1_RowCellStyle(object sender, DevExpress.XtraGrid.Views.Grid.RowCellStyleEventArgs e)
         {
+            if (e.CellValue == null) return;
             if (e.Column.FieldName == nameof(TargetInfo.TargeColor))
             {
                 var clolrRes = ColorTranslator.FromHtml(e.CellValue.ToString());

XdCxRhDW.App/XdCxRhDW.App.csproj

@@ -85,6 +85,10 @@
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
@@ -277,6 +281,7 @@
     <Compile Include="MainForm.Designer.cs">
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="Model\ModelPosRes.cs" />
     <Compile Include="Model\ModelSatEphRes.cs" />
     <Compile Include="Model\ModelSvrs.cs" />
     <Compile Include="Model\ModelCg.cs" />

XdCxRhDW.Entity/03.XdCxRhDW.Entity.csproj

@@ -48,7 +48,7 @@
     <Compile Include="CgXgfRes.cs" />
     <Compile Include="CheckRes.cs" />
     <Compile Include="CxRes.cs" />
-    <Compile Include="ModelEnum.cs" />
+    <Compile Include="EntityEnum.cs" />
     <Compile Include="PosData.cs" />
     <Compile Include="PosRes.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

XdCxRhDW.Entity/CheckRes.cs

@@ -11,19 +11,48 @@ namespace XdCxRhDW.Entity
     [Table("CheckRes")]
     public class CheckRes : BaseEntity<long>
     {
-        [Display(Name = "信号时刻")]
-        public DateTime SigTime { get; set; }
-
-        [Display(Name = "文件名称")]
+        /// <summary>
+        /// 检测文件名称
+        /// </summary>
+        [Display(Name = "检测文件名称")]
         public string FileName { get; set; }
 
+        /// <summary>
+        /// 检测类型
+        /// </summary>
+        [Display(Name = "检测类型")]
+        public EnumPosCheckType? PosCheckType { get; set; }
+
+        /// <summary>
+        /// 开始样点
+        /// </summary>
         [Display(Name = "开始样点")]
-        public long StartSamp { get; set; }
+        public long? SmpStart { get; set; }
 
+        /// <summary>
+        /// 样点长度
+        /// </summary>
         [Display(Name = "样点长度")]
-        public long SampCount { get; set; }
+        public long? SmpCount{ get; set; }
+
+        /// <summary>
+        /// 用户名(只有DAMA有)
+        /// </summary>
+        [Display(Name = "用户名")]
+        public string UserName { get; set; }
+
+
+        /// <summary>
+        /// 调制类型(只有DAMA有)
+        /// </summary>
+        [Display(Name = "调制类型")]
+        public string ModType { get; set; }
+
+        /// <summary>
+        /// 调制速率(只有DAMA有)
+        /// </summary>
+        [Display(Name = "调制速率")]
+        public double? ModRate { get; set; }
 
-        [Display(Name ="检测类型")]
-        public EnumDetectionWay? DetectionWay { get; set; }
     }
 }

XdCxRhDW.Entity/ModelEnum.cs → XdCxRhDW.Entity/EntityEnum.cs

@@ -154,23 +154,50 @@ namespace XdCxRhDW.Entity
         SX,
     }
 
+    /// <summary>
+    /// 任务信号的检测方式(支持多选)
+    /// </summary>
     [Flags]
-    public enum EnumDetectionWay
+    public enum EnumTaskCheckType
     {
         /// <summary>
         /// DAMA
         /// </summary>
         [Display(Name = "DAMA")]
         DAMA=1,
+
         /// <summary>
         /// IBS
         /// </summary>
         [Display(Name = "IBS")]
         IBS=2,
+
         /// <summary>
         /// 能量检测
         /// </summary>
         [Display(Name = "能量检测")]
         Ky5758 = 4,
     }
+
+    /// <summary>
+    /// 定位点的信号检测类型
+    /// </summary>
+    public enum EnumPosCheckType
+    {
+        /// <summary>
+        /// DAMA
+        /// </summary>
+        [Display(Name = "DAMA")]
+        DAMA,
+        /// <summary>
+        /// IBS
+        /// </summary>
+        [Display(Name = "IBS")]
+        IBS,
+        /// <summary>
+        /// 能量检测
+        /// </summary>
+        [Display(Name = "能量检测")]
+        Ky5758,
+    }
 }

XdCxRhDW.Entity/PosRes.cs

@@ -17,45 +17,27 @@ namespace XdCxRhDW.Entity
         [Display(Name = "任务编号")]
         public int TaskInfoID { get; set; }
 
-        [Display(AutoGenerateField = false)]
-        public virtual TaskInfo TaskInfo { get; set; }
-
         [Display(Name = "上行频点")]
         public long FreqUpHz { get; set; }
 
         [Display(Name = "站点ID")]
         public long StationResID { get; set; }
 
-        [Display(AutoGenerateField = false)]
-        public virtual StationRes StationRes { get; set; }
-
         [Display(Name = "测向编号")]
         public long? CxResID { get; set; }
 
-        [Display(AutoGenerateField = false)]
-        public virtual CxRes CxRes { get; set; }
-
         [Display(Name = "参估编号")]
         public long CgResID { get; set; }
 
         [Display(AutoGenerateField = false)]
-        public virtual CgRes CgRes { get; set; }
-
-        [Display(Name = "检测结果")]
-        public long? CheckResID { get; set; }
-
-        [Display(AutoGenerateField = false)]
-        public virtual CheckRes CheckRes { get; set; }
+        public int? TargetInfoID { get; set; }
 
-        [Display(AutoGenerateField = false)]
-        public int? TargetID { get; set; }
+        public TargetInfo TargetInfo;
 
-        [Display(Name = "目标名称")]
-        public string TarName { get; set; } = "未识别";
-
-        [Display(Name = "时隙标识")]
-        public string TsName { get; set; } = "未知";
+        [Display(Name = "检测编号")]
+        public long? CheckResID { get; set; }
 
+        public CheckRes CheckRes;
 
         [Display(Name = "定位点")]
         public string LonLat
@@ -87,11 +69,13 @@ namespace XdCxRhDW.Entity
         }
 
         [Display(Name = "定位类型")]
+        [ToolTip]
         public EnumPosResType PosResType { get; set; }
 
         [Display(Name = "目标状态")]
+        [ToolTip]
         public EnumTargetState TargetState { get; set; }
 
-       
+
     }
 }

XdCxRhDW.Entity/TaskInfo.cs

@@ -50,7 +50,7 @@ namespace XdCxRhDW.Entity
         /// 检测方式
         /// </summary>
         [Display(AutoGenerateField = false)]
-        public EnumDetectionWay? DetectionWay { get; set; }
+        public EnumTaskCheckType? DetectionWay { get; set; }
 
         /// <summary>
         /// 历史任务采集文件的目录

XdCxRhDW.Framework/EnumExtension.cs

@@ -22,8 +22,11 @@ public static class EnumExtension
         {
             Type type = enumType.GetType();
             var field = type.GetField(Enum.GetName(type, enumType));
-            string displayName = field.GetCustomAttribute<DisplayAttribute>().Name;
-            return displayName;
+            var attr = field.GetCustomAttribute<DisplayAttribute>();
+            if (attr == null || string.IsNullOrWhiteSpace(attr.Name))
+                return enumType.ToString();
+            else
+                return attr.Name;
         }
         catch
         {

XdCxRhDW.Repostory/04.XdCxRhDW.Repostory.csproj

@@ -81,7 +81,6 @@
   <ItemGroup>
     <Compile Include="EFContext\RHDWContext.cs" />
     <Compile Include="EFContext\SqliteInterceptor.cs" />
-    <Compile Include="ModelPosRes.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="XlRepository.cs" />
   </ItemGroup>

XdCxRhDW.Repostory/ModelPosRes.cs

@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using XdCxRhDW.Entity;
-
-namespace XdCxRhDW.Repostory
-{
-    /// <summary>
-    /// 定位结果UI绑定对象
-    /// </summary>
-    public class ModelPosRes : PosData
-    {
-        [Display(Name = "任务编号")]
-        public int TaskInfoID { get; set; }
-
-        [Display(Name = "上行频点")]
-        public long FreqUpHz { get; set; }
-
-        [Display(Name = "站点ID")]
-        public long StationResID { get; set; }
-
-        [Display(Name = "测向编号")]
-        public long? CxResID { get; set; }
-
-        [Display(Name = "参估编号")]
-        public long CgResID { get; set; }
-
-        [Display(Name = "检测结果")]
-        public long? CheckResID { get; set; }
-
-        [Display(AutoGenerateField = false)]
-        public int? TargetID { get; set; }
-
-        [Display(Name = "目标名称")]
-        public string TarName { get; set; } = "未识别";
-
-        [Display(Name = "时隙标识")]
-        public string TsName { get; set; } = "未知";
-
-
-        [Display(Name = "定位点")]
-        public string LonLat
-        {
-            get
-            {
-                if (PosLon == 0 && PosLat == 0)
-                    return "无";
-                else if (PosLon > 180 || PosLon < -180)
-                    return "无";
-                else
-                    return $"{PosLon:f4},{PosLat:f4}";
-            }
-        }
-
-
-        [Display(Name = "镜像点")]
-        public string MirrLonLat
-        {
-            get
-            {
-                if (MirrLon == 0 && MirrLat == 0)
-                    return "无";
-                else if (MirrLon > 180 || MirrLon < -180)
-                    return "无";
-                else
-                    return $"{MirrLon:f4},{MirrLat:f4}";
-            }
-        }
-
-        [Display(Name = "定位类型")]
-        public EnumPosResType PosResType { get; set; }
-
-        [Display(Name = "目标状态")]
-        public EnumTargetState TargetState { get; set; }
-    }
-}

XdCxRhDW.Repostory/XlRepository.cs

@@ -46,7 +46,7 @@ namespace XdCxRhDW.Repostory
                 using (RHDWContext db = new RHDWContext())
                 {
                   var res= await db.XlInfos.SqlQuery($"SELECT min(abs(JULIANDAY(timebj)-JULIANDAY('{timeBj:yyyy-MM-dd HH:mm:ss}')))" +
-                        " as NearDaySpan,* FROM XlInfo where satcode=23467").FirstOrDefaultAsync();
+                        $" as NearDaySpan,* FROM XlInfo where satcode={satCode}").FirstOrDefaultAsync();
                     return res;
                 }
             }

XdCxRhDW.TaskServer/Controllers/HistoryTaskProcessingController.cs

@@ -53,7 +53,7 @@ namespace XdCxRhDW.TaskServer.Controllers
                 dto.CapDir = @"D:\\data";
                 dto.SigType = EnumSigTypeDto.SX;
                 dto.PosType = EnumPosTypeDto.X2D1;
-                dto.DmcType = DmcTypeDto.DAMA;
+                dto.TaskCheckType = EnumTaskCheckTypeDto.DAMA;
                 if (!Directory.Exists(dto.CapDir))
                 {
                     LogHelper.Error($"采集路径:{dto.CapDir}不存在");

XdCxRhDW.TaskServer/Task/HistoryTaskI.cs

@@ -61,7 +61,7 @@ namespace XdCxRhDW.TaskServer.Task
         }
 
         //检测
-        public async Task<IEnumerable<DetectResDto>> DAMAAsync(DmcTypeDto dmc, double fsHz, string mFile)
+        public async Task<IEnumerable<DetectResDto>> DAMAAsync(EnumTaskCheckTypeDto dmc, double fsHz, string mFile)
         {
             try
             {

XdCxRhDW.TaskServer/Task/X2D1Task.cs

@@ -104,7 +104,7 @@ namespace XdCxRhDW.TaskServer.Task
                             }
                             else
                             {
-                                var mDetect = await DAMAAsync(dto.DmcType.Value, minfo.FsHz, minfo.FilePath);
+                                var mDetect = await DAMAAsync(dto.TaskCheckType, minfo.FsHz, minfo.FilePath);
                                 var dfile = await ToResampleAsync((int)dinfo.FsHz, dinfo.FilePath);
                                 var nfile = await ToResampleAsync((int)ninfo.FsHz, ninfo.FilePath);
                                 foreach (var deitem in mDetect)
@@ -116,7 +116,7 @@ namespace XdCxRhDW.TaskServer.Task
                                     try
                                     {
                                         var xd = await CPUCalcAsync(deitem.File1, dfile.File, dfile.OutFsHz, deitem, 260000, 40000);
-                                       
+                                        Thread.Sleep(100);
                                         var sx = await CPUCalcAsync(deitem.File1, nfile.File, nfile.OutFsHz, deitem, 0, 40000);
                                         X2D1NoXlPosDto x2D1 = new X2D1NoXlPosDto()
                                         {
@@ -160,9 +160,6 @@ namespace XdCxRhDW.TaskServer.Task
                     preTime = preTime.AddHours(1);
                 }
 
-                IsRuning = false;
-                LogHelper.Info($"历史任务:{dto.ID}已结束!");
-
             });
         }
 

XdCxRhDw.Dto/EnumPosResTypeDto.cs

@@ -162,11 +162,12 @@ namespace XdCxRhDW.Dto
         [Display(Name = "突发信号")]
         SX,
     }
+
     /// <summary>
-    /// 检测类型
+    /// 任务信号的检测方式(支持多选)
     /// </summary>
     [Flags]
-    public enum DmcTypeDto
+    public enum EnumTaskCheckTypeDto
     {
         /// <summary>
         /// DAMA检测
@@ -187,4 +188,26 @@ namespace XdCxRhDW.Dto
         Ky5758 = 4
     }
 
+    /// <summary>
+    /// 定位点的信号检测类型
+    /// </summary>
+    public enum EnumPosCheckTypeDto
+    {
+        /// <summary>
+        /// DAMA
+        /// </summary>
+        [Display(Name = "DAMA")]
+        DAMA,
+        /// <summary>
+        /// IBS
+        /// </summary>
+        [Display(Name = "IBS")]
+        IBS,
+        /// <summary>
+        /// 能量检测
+        /// </summary>
+        [Display(Name = "能量检测")]
+        Ky5758,
+    }
+
 }

XdCxRhDw.Dto/HistoryTaskProcessingDto.cs

@@ -52,10 +52,14 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public List<long> FreqsHz { get; set; }
 
-        [Display(Name = "信号类型")]
+        /// <summary>
+        /// 信号类型
+        /// </summary>
         public EnumSigTypeDto SigType { get; set; }
 
-        [Display(Name = "检测类型")]
-        public DmcTypeDto? DmcType { get; set; }
+        /// <summary>
+        /// 任务检测类型(支持多选)
+        /// </summary>
+        public EnumTaskCheckTypeDto TaskCheckType { get; set; }
     }
 }

XdCxRhDw.Dto/PosDto/CheckResDto.cs

@@ -8,22 +8,44 @@ using System.Threading.Tasks;
 
 namespace XdCxRhDW.Dto
 {
-   
+    /// <summary>
+    /// 检测结果模型
+    /// </summary>
     public class CheckResDto 
     {
-        [Display(Name = "信号时刻")]
-        public DateTime SigTime { get; set; }
-
-        [Display(Name = "文件名称")]
+        /// <summary>
+        /// 检测文件名称
+        /// </summary>
         public string FileName { get; set; }
 
-        [Display(Name = "开始样点")]
-        public long StartSamp { get; set; }
+        /// <summary>
+        /// 开始样点
+        /// </summary>
+        public long SmpStart { get; set; }
+
+        /// <summary>
+        /// 样点长度
+        /// </summary>
+        public long SmpCount { get; set; }
+
+        /// <summary>
+        /// 检测类型
+        /// </summary>
+        public EnumPosCheckTypeDto PosCheckType { get; set; }
+
+        /// <summary>
+        /// 用户名(可空)
+        /// </summary>
+        public string UserName { get; set; }
 
-        [Display(Name = "样点长度")]
-        public long SampCount { get; set; }
+        /// <summary>
+        /// 调制类型(可空)
+        /// </summary>
+        public string ModType { get; set; }
 
-        [Display(Name ="检测类型")]
-        public DmcTypeDto? DetectionWay { get; set; }
+        /// <summary>
+        /// 调制速率(可空)
+        /// </summary>
+        public double? ModRate { get; set; }
     }
 }

XdCxRhDw.Dto/PosDto/RHNoParPosDto.cs

@@ -67,16 +67,6 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public double CxRes { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 目标上行频点Hz(可空)
         /// </summary>
@@ -123,6 +113,11 @@ namespace XdCxRhDW.Dto
         /// 站点信息
         /// </summary>
         public StationResDto StationResInfo { get; set; }
+
+        /// <summary>
+        /// 检测结果(可空)
+        /// </summary>
+        public CheckResDto CheckRes { get; set; }
     }
 
 }

XdCxRhDw.Dto/PosDto/RHNoXlNoParPosDto.cs

@@ -72,16 +72,6 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public double CxRes { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 目标上行频点Hz(可空)
         /// </summary>
@@ -99,6 +89,11 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public StationResDto StationResInfo { get; set; }
 
+        /// <summary>
+        /// 检测结果(可空)
+        /// </summary>
+        public CheckResDto CheckRes { get; set; }
+
     }
 
 }

XdCxRhDw.Dto/PosDto/RHNoXlPosDto.cs

@@ -81,16 +81,6 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public double CxRes { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 目标上行频点Hz(可空)
         /// </summary>
@@ -152,9 +142,8 @@ namespace XdCxRhDW.Dto
         public double RefLat { get; set; }
 
         /// <summary>
-        /// 检测结果
+        /// 检测结果(可空)
         /// </summary>
-        [Display(AutoGenerateField = false)]
-        public CheckResDto CheckRes { get; set; } = null;
+        public CheckResDto CheckRes { get; set; }
     }
 }

XdCxRhDw.Dto/PosDto/RHPosDto.cs

@@ -81,16 +81,6 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public double CxRes { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 目标上行频点Hz(可空)
         /// </summary>
@@ -182,10 +172,9 @@ namespace XdCxRhDW.Dto
         public double RefLat { get; set; }
 
         /// <summary>
-        /// 检测结果
+        /// 检测结果(可空)
         /// </summary>
-        [Display(AutoGenerateField = false)]
-        public CheckResDto CheckRes { get; set; } = null;
+        public CheckResDto CheckRes { get; set; }
     }
 
 }

XdCxRhDw.Dto/PosDto/StationResDto.cs

@@ -50,5 +50,6 @@ namespace XdCxRhDW.Dto
         /// 参考站纬度
         /// </summary>
         public double RefLat { get; set; }
+
     }
 }

XdCxRhDw.Dto/PosDto/X1D1NoParPosDto.cs

@@ -47,16 +47,6 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public double CxRes { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 目标上行频点Hz(可空)
         /// </summary>
@@ -120,6 +110,11 @@ namespace XdCxRhDW.Dto
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double CxLat { get; set; }
 
+        /// <summary>
+        /// 检测结果(可空)
+        /// </summary>
+        public CheckResDto CheckRes { get; set; }
+
     }
 
 }

XdCxRhDw.Dto/PosDto/X1D1NoXlNoParPosDto.cs

@@ -47,16 +47,6 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public double CxRes { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 目标上行频点Hz(可空)
         /// </summary>
@@ -103,5 +93,10 @@ namespace XdCxRhDW.Dto
         /// </summary>
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double CxLat { get; set; }
+
+        /// <summary>
+        /// 检测结果(可空)
+        /// </summary>
+        public CheckResDto CheckRes { get; set; }
     }
 }

XdCxRhDw.Dto/PosDto/X1D1NoXlPosDto.cs

@@ -54,16 +54,6 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public double CxRes { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 目标上行频点Hz(可空)
         /// </summary>
@@ -125,9 +115,8 @@ namespace XdCxRhDW.Dto
         public double RefLat { get; set; }
 
         /// <summary>
-        /// 检测结果
+        /// 检测结果(可空)
         /// </summary>
-        [Display(AutoGenerateField = false)]
-        public CheckResDto CheckRes { get; set; } = null;
+        public CheckResDto CheckRes { get; set; }
     }
 }

XdCxRhDw.Dto/PosDto/X1D1PosDto.cs

@@ -53,16 +53,6 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public double CxRes { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 目标上行频点Hz(可空)
         /// </summary>
@@ -139,10 +129,9 @@ namespace XdCxRhDW.Dto
         public double RefLat { get; set; }
 
         /// <summary>
-        /// 检测结果
+        /// 检测结果(可空)
         /// </summary>
-        [Display(AutoGenerateField = false)]
-        public CheckResDto CheckRes { get; set; } = null;
+        public CheckResDto CheckRes { get; set; }
     }
 
 }

XdCxRhDw.Dto/PosDto/X2D1NoParPosDto.cs

@@ -66,16 +66,6 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public double? XdSnr { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 目标上行频点Hz(可空)
         /// </summary>
@@ -173,10 +163,9 @@ namespace XdCxRhDW.Dto
         public double CdbTxLat { get; set; }
 
         /// <summary>
-        /// 检测结果
+        /// 检测结果(可空)
         /// </summary>
-        [Display(AutoGenerateField = false)]
-        public CheckResDto CheckRes { get; set; } = null;
+        public CheckResDto CheckRes { get; set; }
     }
 
 }

XdCxRhDw.Dto/PosDto/X2D1NoXlNoParlPosDto.cs

@@ -66,16 +66,6 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public double? XdSnr { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 目标上行频点Hz(可空)
         /// </summary>
@@ -113,10 +103,9 @@ namespace XdCxRhDW.Dto
         public double CdbTxLat { get; set; }
 
         /// <summary>
-        /// 检测结果
+        /// 检测结果(可空)
         /// </summary>
-        [Display(AutoGenerateField = false)]
-        public CheckResDto CheckRes { get; set; } = null;
+        public CheckResDto CheckRes { get; set; }
 
     }
 

XdCxRhDw.Dto/PosDto/X2D1NoXlPosDto.cs

@@ -78,16 +78,6 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public double AdjaYbDto { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 目标上行频点Hz(可空)
         /// </summary>
@@ -137,9 +127,8 @@ namespace XdCxRhDW.Dto
         public double RefLat { get; set; }
 
         /// <summary>
-        /// 检测结果
+        /// 检测结果(可空)
         /// </summary>
-        [Display(AutoGenerateField = false)]
-        public CheckResDto CheckRes { get; set; } = null;
+        public CheckResDto CheckRes { get; set; }
     }
 }

XdCxRhDw.Dto/PosDto/X2D1PosDto.cs

@@ -76,16 +76,6 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public double AdjaYbDto { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 目标上行频点Hz(可空)
         /// </summary>
@@ -195,10 +185,9 @@ namespace XdCxRhDW.Dto
         public double RefLat { get; set; }
 
         /// <summary>
-        /// 检测结果
+        /// 检测结果(可空)
         /// </summary>
-        [Display(AutoGenerateField = false)]
-        public CheckResDto CheckRes { get; set; } = null;
+        public CheckResDto CheckRes { get; set; }
     }
 
 }

XdCxRhDw.Dto/PosDto/X2DtoDfoNoXlPosDto.cs

@@ -96,16 +96,6 @@ namespace XdCxRhDW.Dto
         [RangeDouble(0)]
         public double RefFreqDown { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
@@ -130,12 +120,11 @@ namespace XdCxRhDW.Dto
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
 
+
         /// <summary>
-        /// 检测结果
+        /// 检测结果(可空)
         /// </summary>
-        [Display(AutoGenerateField = false)]
-        public CheckResDto CheckRes { get; set; } = null;
-
+        public CheckResDto CheckRes { get; set; }
     }
 
 }

XdCxRhDw.Dto/PosDto/X2DtoDfoPosDto.cs

@@ -96,16 +96,6 @@ namespace XdCxRhDW.Dto
         [RangeDouble(0)]
         public double RefFreqDown { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         ///  主星X坐标
         /// </summary>
@@ -191,10 +181,9 @@ namespace XdCxRhDW.Dto
         public double RefLat { get; set; }
 
         /// <summary>
-        /// 检测结果
+        /// 检测结果(可空)
         /// </summary>
-        [Display(AutoGenerateField = false)]
-        public CheckResDto CheckRes { get; set; } = null;
+        public CheckResDto CheckRes { get; set; }
 
     }
 

XdCxRhDw.Dto/PosDto/X3TwoDfoNoXlPosDto.cs

@@ -113,16 +113,6 @@ namespace XdCxRhDW.Dto
         [RangeDouble(0)]
         public double RefFreqDown { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
@@ -148,10 +138,9 @@ namespace XdCxRhDW.Dto
         public double RefLat { get; set; }
 
         /// <summary>
-        /// 检测结果
+        /// 检测结果(可空)
         /// </summary>
-        [Display(AutoGenerateField = false)]
-        public CheckResDto CheckRes { get; set; } = null;
+        public CheckResDto CheckRes { get; set; }
 
     }
 

XdCxRhDw.Dto/PosDto/X3TwoDfoPosDto.cs

@@ -111,16 +111,6 @@ namespace XdCxRhDW.Dto
         [RangeDouble(0)]
         public double RefFreqDown { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         ///  主星X坐标
         /// </summary>
@@ -236,10 +226,9 @@ namespace XdCxRhDW.Dto
         public double RefLat { get; set; }
 
         /// <summary>
-        /// 检测结果
+        /// 检测结果(可空)
         /// </summary>
-        [Display(AutoGenerateField = false)]
-        public CheckResDto CheckRes { get; set; } = null;
+        public CheckResDto CheckRes { get; set; }
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDtoNoParPosDto.cs

@@ -73,16 +73,6 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public double? Snr2 { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 目标上行频点Hz(可空)
         /// </summary>
@@ -198,10 +188,9 @@ namespace XdCxRhDW.Dto
         public double SatTxLat { get; set; }
 
         /// <summary>
-        /// 检测结果
+        /// 检测结果(可空)
         /// </summary>
-        [Display(AutoGenerateField = false)]
-        public CheckResDto CheckRes { get; set; } = null;
+        public CheckResDto CheckRes { get; set; }
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDtoNoXlNoParPosDto.cs

@@ -73,16 +73,6 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public double? Snr2 { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 目标上行频点Hz(可空)
         /// </summary>
@@ -108,10 +98,9 @@ namespace XdCxRhDW.Dto
         public double SatTxLat { get; set; }
 
         /// <summary>
-        /// 检测结果
+        /// 检测结果(可空)
         /// </summary>
-        [Display(AutoGenerateField = false)]
-        public CheckResDto CheckRes { get; set; } = null;
+        public CheckResDto CheckRes { get; set; }
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDtoNoXlPosDto.cs

@@ -88,16 +88,6 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public double YbAdja2Dto { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 目标上行频点Hz(可空)
         /// </summary>
@@ -135,10 +125,9 @@ namespace XdCxRhDW.Dto
         public double RefLat { get; set; }
 
         /// <summary>
-        /// 检测结果
+        /// 检测结果(可空)
         /// </summary>
-        [Display(AutoGenerateField = false)]
-        public CheckResDto CheckRes { get; set; } = null;
+        public CheckResDto CheckRes { get; set; }
 
     }
 

XdCxRhDw.Dto/PosDto/X3TwoDtoPosDto.cs

@@ -88,16 +88,6 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public double YbAdja2Dto { get; set; }
 
-        /// <summary>
-        /// 目标名称(可空)
-        /// </summary>
-        public string TarName { get; set; }
-
-        /// <summary>
-        /// 时隙名称(可空)
-        /// </summary>
-        public string TsName { get; set; }
-
         /// <summary>
         /// 目标上行频点Hz(可空)
         /// </summary>
@@ -225,10 +215,9 @@ namespace XdCxRhDW.Dto
         public double RefLat { get; set; }
 
         /// <summary>
-        /// 检测结果
+        /// 检测结果(可空)
         /// </summary>
-        [Display(AutoGenerateField = false)]
-        public CheckResDto CheckRes { get; set; } = null;
+        public CheckResDto CheckRes { get; set; }
     }
 
 }

XdCxRhDw.Dto/PosResDto.cs

@@ -18,14 +18,14 @@ namespace XdCxRhDW.Dto
         public long ID { get; set; }
 
         /// <summary>
-        /// 上行频点Hz
+        /// 任务编号
         /// </summary>
-        public long FreqUpHz { get; set; }
+        public int TaskInfoID { get; set; }
 
         /// <summary>
-        /// 时隙名称(仅DAMA有)
+        /// 上行频点Hz
         /// </summary>
-        public string UserName { get; set; }
+        public long FreqUpHz { get; set; }
 
         /// <summary>
         /// 信号时刻
@@ -33,9 +33,10 @@ namespace XdCxRhDW.Dto
         public DateTime SigTime { get; set; }
 
         /// <summary>
-        /// 任务编号
+        /// 信号检测方式
         /// </summary>
-        public int TaskInfoID { get; set; }
+        public string CheckType { get; set; }
+
 
         /// <summary>
         /// 目标位置经度

XdCxRhDw.Dto/SvrStateDto.cs

@@ -16,16 +16,15 @@ namespace XdCxRhDW.Dto
         /// 服务类型
         /// </summary> 
         public EnumSvrType SvrType { get; set; }
+
         /// <summary>
         /// 服务ID
         /// </summary>
-        [Display(Name = "服务ID")]
         public string SvrID { get; set; }
 
         /// <summary>
         /// 服务Http基地址
         /// </summary>
-        [Display(Name = "服务Http地址", AutoGenerateField = false)]
         public string BaseHttpAddr { get; set; }
 
         /// <summary>