zoulei 1 年之前
父節點
當前提交
d23a678f00

二進制
Database.db


+ 0 - 1
MachineGen/machine.key

@@ -1 +0,0 @@
-33C3B0E7C07EFF95C7A3EB79132823C4F8D22200905D35CA6D56957E9F67B561

+ 63 - 47
XdCxRhDW.App/ExtensionsDev/MapControlEx.cs

@@ -167,69 +167,85 @@ public static class MapControlEx
         ctrl.ToolTipController.BeforeShow += (sender, e) =>
         {
             if (e.SelectedObject == null) return;
+            SuperToolTip superToolTip = new SuperToolTip();
             if (e.SelectedObject.ToString() == ItemsEditorPanelAction.AddRectangle.ToString())
             {
                 e.ToolTip = "绘制矩形";
                 return;
             }
-            var mapDot = e.SelectedObject as MapDot;
-            if (mapDot == null) return;
-            var posItem = mapDot.Tag as PosData;
-            if (mapDot == null || posItem == null) return;
-            SuperToolTip superToolTip = new SuperToolTip();
-            if (posItem.ClusterCount == 1)
+            else if (e.SelectedObject is MapDot mapDot)
             {
-                var props = posItem.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public).ToList();
-                var list = new List<(int Index, string Name, string Format, object Value)>();
-                foreach (var prop in props)
+                if (mapDot == null) return;
+                var posItem = mapDot.Tag as PosData;
+                if (mapDot == null || posItem == null) return;
+                if (posItem.ClusterCount == 1)
                 {
-                    var attrToolTip = prop.GetCustomAttribute<ToolTipAttribute>();
-                    if (attrToolTip == null) continue;
-                    string toolTipFormat = attrToolTip.Format;
+                    var props = posItem.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public).ToList();
+                    var list = new List<(int Index, string Name, string Format, object Value)>();
+                    foreach (var prop in props)
+                    {
+                        var attrToolTip = prop.GetCustomAttribute<ToolTipAttribute>();
+                        if (attrToolTip == null) continue;
+                        string toolTipFormat = attrToolTip.Format;
 
 
-                    var val = prop.GetValue(posItem);
+                        var val = prop.GetValue(posItem);
 
-                    string displayName = prop.Name;
-                    var attrDisplay = prop.GetCustomAttribute<DisplayAttribute>();
-                    if (attrDisplay != null && !string.IsNullOrWhiteSpace(attrDisplay.Name))
-                        displayName = attrDisplay.Name;
-
-                    int index = attrToolTip.Index;
-                    list.Add((index, displayName, toolTipFormat, val));
-                }
-                list = list.OrderBy(p => p.Index).ToList();
-                foreach ((int Index, string Name, string Format, object val) in list)
-                {
-                    string f = null;
-                    if (val is DateTime)
-                    {
-                        f = "yyyy-MM-dd HH:mm:ss";
+                        string displayName = prop.Name;
+                        var attrDisplay = prop.GetCustomAttribute<DisplayAttribute>();
+                        if (attrDisplay != null && !string.IsNullOrWhiteSpace(attrDisplay.Name))
+                            displayName = attrDisplay.Name;
 
+                        int index = attrToolTip.Index;
+                        list.Add((index, displayName, toolTipFormat, val));
                     }
-                    else if (val is float || val is double || val is decimal)
+                    list = list.OrderBy(p => p.Index).ToList();
+                    foreach ((int Index, string Name, string Format, object val) in list)
                     {
-                        f = "f4";
+                        string f = null;
+                        if (val is DateTime)
+                        {
+                            f = "yyyy-MM-dd HH:mm:ss";
+
+                        }
+                        else if (val is float || val is double || val is decimal)
+                        {
+                            f = "f4";
+                        }
+                        if (!string.IsNullOrWhiteSpace(Format))
+                            f = Format;
+                        string valStr;
+                        if (!string.IsNullOrWhiteSpace(f))
+                            valStr = ((dynamic)val).ToString(f);
+                        else
+                            valStr = val.ToString();
+                        ToolTipItem tipItem = new ToolTipItem();
+                        tipItem.Text = $"{Name}:{valStr}";
+                        superToolTip.Items.Add(tipItem);
                     }
-                    if (!string.IsNullOrWhiteSpace(Format))
-                        f = Format;
-                    string valStr;
-                    if (!string.IsNullOrWhiteSpace(f))
-                        valStr = ((dynamic)val).ToString(f);
-                    else
-                        valStr = val.ToString();
+                }
+                else
+                {
                     ToolTipItem tipItem = new ToolTipItem();
-                    tipItem.Text = $"{Name}:{valStr}";
+                    tipItem.Text = $"当前位置附近有{posItem.ClusterCount}个定位点,放大可查看";
                     superToolTip.Items.Add(tipItem);
                 }
+                e.SuperTip = superToolTip;
             }
-            else
+            else if (e.SelectedObject is MapCustomElement ele)
             {
-                ToolTipItem tipItem = new ToolTipItem();
-                tipItem.Text = $"当前位置附近有{posItem.ClusterCount}个定位点,放大可查看";
-                superToolTip.Items.Add(tipItem);
+                var find = innerData.mMapStorageFixed.Items.Where(p => (p is MapCustomElement pp) && p != ele && pp.Location.Equals(ele.Location));
+                StringBuilder sb = new StringBuilder();
+                sb.Append(((object[])ele.Tag)[1]);
+                foreach (var item in find)
+                {
+                    sb.Append("\r\n");
+                    sb.Append("-------------------");
+                    sb.Append("\r\n");
+                    sb.Append(((object[])item.Tag)[1]);
+                }
+                ele.ToolTipPattern = sb.ToString();
             }
-            e.SuperTip = superToolTip;
         };
         ctrl.MouseDown += (sender, e) =>
         {
@@ -406,7 +422,7 @@ public static class MapControlEx
                 else
                     btnCustom.Visibility = BarItemVisibility.Never;
             }
-                
+
         };
         return ctrl;
     }
@@ -696,7 +712,7 @@ public static class MapControlEx
     public static void DrawFixedImg(this MapControl ctrl, string tag, double imgLat, double imgLon, Image img, string toolTip = "")
     {
         var innerData = ctrl.Tag as InnerData;
-        var item = new MapCustomElement() { Tag = tag };
+        var item = new MapCustomElement() { Tag =new object[] { tag, toolTip } };
         item.UseAnimation = false;
         item.BackgroundDrawingMode = ElementState.None;
         item.Location = new GeoPoint(imgLat, imgLon);
@@ -717,7 +733,7 @@ public static class MapControlEx
     public static void DrawFixedImg(this MapControl ctrl, string tag, double imgLat, double imgLon, SvgImage img, string toolTip = "")
     {
         var innerData = ctrl.Tag as InnerData;
-        var item = new MapCustomElement() { Tag = tag };
+        var item = new MapCustomElement() { Tag =new object[] { tag, toolTip } };
         item.UseAnimation = false;
         item.BackgroundDrawingMode = ElementState.None;
         item.Location = new GeoPoint(imgLat, imgLon);
@@ -729,7 +745,7 @@ public static class MapControlEx
     public static void DelFixedImg(this MapControl ctrl, string tag)
     {
         var innerData = ctrl.Tag as InnerData;
-        var delItems = innerData.mMapStorageFixed.Items.ToList().FindAll(p => p.Tag.ToString() == tag);
+        var delItems = innerData.mMapStorageFixed.Items.ToList().FindAll(p => ((object[])p.Tag)[0].ToString() == tag);
         foreach (var item in delItems)
         {
             innerData.mMapStorageFixed.Items.Remove(item);

+ 6 - 6
XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -228,7 +228,7 @@ namespace XdCxRhDW.App.UserControl
                     Serilog.Log.Error(ex, $"启动Http服务失败!");
                     if (ex.InnerException is HttpListenerException)
                     {
-                        DxHelper.MsgBoxHelper.ShowWarning($"启动Http服务失败,请以管理员身份运行程序!");
+                        DxHelper.MsgBoxHelper.ShowWarning($"{ex.InnerException.Message}");
                     }
                     else
                     {
@@ -264,11 +264,11 @@ namespace XdCxRhDW.App.UserControl
                 var sat2 = db.SatInfos.Where(p => p.SatCode == tsk.Adja1Sat).FirstOrDefault();
                 var sat3 = db.SatInfos.Where(p => p.SatCode == tsk.Adja2Sat).FirstOrDefault();
                 if (sat1 != null && sat1.SatLon != null)
-                    mapControl1.DrawFixedImg("Sat", 0, sat1.SatLon.Value, DxHelper.SvgHelper.CreateSat(), $"主星\r\n{sat1.Sat}\r\n");
+                    mapControl1.DrawFixedImg("Sat", 0, sat1.SatLon.Value, DxHelper.SvgHelper.CreateSat(), $"主星\r\n{sat1.Sat}");
                 if (sat2 != null && sat2.SatLon != null)
-                    mapControl1.DrawFixedImg("Sat", 0, sat2.SatLon.Value, DxHelper.SvgHelper.CreateSat(), $"邻1星\r\n{sat2.Sat}\r\n");
+                    mapControl1.DrawFixedImg("Sat", 0, sat2.SatLon.Value, DxHelper.SvgHelper.CreateSat(), $"邻1星\r\n{sat2.Sat}");
                 if (sat3 != null && sat3.SatLon != null)
-                    mapControl1.DrawFixedImg("Sat", 0, sat3.SatLon.Value, DxHelper.SvgHelper.CreateSat(), $"邻2星\r\n{sat3.Sat}\r\n");
+                    mapControl1.DrawFixedImg("Sat", 0, sat3.SatLon.Value, DxHelper.SvgHelper.CreateSat(), $"邻2星\r\n{sat3.Sat}");
             }
 
             this.gridHomePosRes.DataSource = listPos;
@@ -288,9 +288,9 @@ namespace XdCxRhDW.App.UserControl
                     if (station.CdbTxLon != null)
                         mapControl1.DrawFixedImg("Tx", station.CdbTxLat.Value, station.CdbTxLon.Value, DxHelper.SvgHelper.CreateAnt(), $"[超短接收天线]\r\n经度:{station.CdbTxLon.Value}°\r\n纬度:{station.CdbTxLat.Value}°");
                     if (station.RefLon != null)
-                        mapControl1.DrawFixedImg("Tx", station.RefLat.Value, station.RefLon.Value, DxHelper.SvgHelper.CreateAnt(), $"[超短接收天线]\r\n经度:{station.RefLon.Value}°\r\n纬度:{station.RefLat.Value}°");
+                        mapControl1.DrawFixedImg("Tx", station.RefLat.Value, station.RefLon.Value, DxHelper.SvgHelper.CreatePentagram(), $"[参考站]\r\n经度:{station.RefLon.Value}°\r\n纬度:{station.RefLat.Value}°");
                     if (station.CxLon != null)
-                        mapControl1.DrawFixedImg("Tx", station.CxLat.Value, station.CxLon.Value, DxHelper.SvgHelper.CreateAnt(), $"[超短接收天线]\r\n经度:{station.CxLon.Value}°\r\n纬度:{station.CxLat.Value}°");
+                        mapControl1.DrawFixedImg("Tx", station.CxLat.Value, station.CxLon.Value, DxHelper.SvgHelper.CreatePentagram(), $"[测向站]\r\n经度:{station.CxLon.Value}°\r\n纬度:{station.CxLat.Value}°");
 
                 }
             }

+ 1 - 1
XdCxRhDw.Dto/PosDto/RHNoParPosDto.cs

@@ -106,5 +106,5 @@ namespace XdCxRhDw.Dto
         /// </summary>
         public StationResDto StationResInfo { get; set; }
     }
-        
+
 }

+ 1 - 1
XdCxRhDw.Dto/PosDto/RHNoXlNoParPosDto.cs

@@ -82,5 +82,5 @@ namespace XdCxRhDw.Dto
         public StationResDto StationResInfo { get; set; }
 
     }
-        
+
 }

+ 12 - 12
XdCxRhDw.Dto/PosDto/RHNoXlPosDto.cs

@@ -31,7 +31,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 目标双星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double SxDto { get; set; }
 
         /// <summary>
@@ -47,7 +47,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 目标星地时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double XdDto { get; set; }
 
         /// <summary>
@@ -63,13 +63,13 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 参考样本主时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double MainYbDto { get; set; }
 
         /// <summary>
         /// 参考样本邻时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double AdjaYbDto { get; set; }
 
         /// <summary>
@@ -90,49 +90,49 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double SatTxLon { get; set; }
 
         /// <summary>
         /// 卫星接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
         /// <summary>
         /// 超短波天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double CdbTxLon { get; set; }
 
         /// <summary>
         /// 超短波接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double CdbTxLat { get; set; }
 
         /// <summary>
         /// 测向站经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double CxLon { get; set; }
 
         /// <summary>
         /// 测向站纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double CxLat { get; set; }
 
         /// <summary>
         /// 参考站经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double RefLon { get; set; }
 
         /// <summary>
         /// 参考站纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
     }
 }

+ 13 - 13
XdCxRhDw.Dto/PosDto/RHPosDto.cs

@@ -31,7 +31,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 目标双星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double SxDto { get; set; }
 
         /// <summary>
@@ -47,7 +47,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 目标星地时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double XdDto { get; set; }
 
         /// <summary>
@@ -63,13 +63,13 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 样本主星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double MainYbDto { get; set; }
 
         /// <summary>
         /// 样本邻星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double AdjaYbDto { get; set; }
 
         /// <summary>
@@ -120,50 +120,50 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double SatTxLon { get; set; }
 
         /// <summary>
         /// 卫星接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
         /// <summary>
         /// 超短波天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double CdbTxLon { get; set; }
 
         /// <summary>
         /// 超短波接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double CdbTxLat { get; set; }
 
         /// <summary>
         /// 测向站经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double CxLon { get; set; }
 
         /// <summary>
         /// 测向站纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double CxLat { get; set; }
 
         /// <summary>
         /// 参考站经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double RefLon { get; set; }
 
         /// <summary>
         /// 参考站纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
     }
-        
+
 }

+ 1 - 1
XdCxRhDw.Dto/PosDto/X1D1NoParPosDto.cs

@@ -71,5 +71,5 @@ namespace XdCxRhDw.Dto
         /// </summary>
         public StationResDto StationResInfo { get; set; }
     }
-        
+
 }

+ 10 - 10
XdCxRhDw.Dto/PosDto/X1D1NoXlPosDto.cs

@@ -26,7 +26,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 目标星地时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double XdDto { get; set; }
 
         /// <summary>
@@ -42,7 +42,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 样本主星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double MainYbDto { get; set; }
 
         /// <summary>
@@ -63,49 +63,49 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double SatTxLon { get; set; }
 
         /// <summary>
         /// 卫星接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
         /// <summary>
         /// 超短波天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double CdbTxLon { get; set; }
 
         /// <summary>
         /// 超短波接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double CdbTxLat { get; set; }
 
         /// <summary>
         /// 测向站经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double CxLon { get; set; }
 
         /// <summary>
         /// 测向站纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double CxLat { get; set; }
 
         /// <summary>
         /// 参考站经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double RefLon { get; set; }
 
         /// <summary>
         /// 参考站纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
     }
 }

+ 11 - 11
XdCxRhDw.Dto/PosDto/X1D1PosDto.cs

@@ -25,7 +25,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 目标星地时差(us)
         /// </summary>
-        [RangeDouble(240000, 280000,IncludeMin =true,IncludeMax =true)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double XdDto { get; set; }
 
         /// <summary>
@@ -41,7 +41,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 样本主星时差(us)
         /// </summary>
-        [RangeDouble(240000, 280000, IncludeMin = true, IncludeMax = true)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double MainYbDto { get; set; }
 
         /// <summary>
@@ -77,50 +77,50 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double SatTxLon { get; set; }
 
         /// <summary>
         /// 卫星接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
         /// <summary>
         /// 超短波天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double CdbTxLon { get; set; }
 
         /// <summary>
         /// 超短波接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double CdbTxLat { get; set; }
 
         /// <summary>
         /// 测向站经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double CxLon { get; set; }
 
         /// <summary>
         /// 测向站纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double CxLat { get; set; }
 
         /// <summary>
         /// 参考站经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double RefLon { get; set; }
 
         /// <summary>
         /// 参考站纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
     }
-        
+
 }

+ 7 - 7
XdCxRhDw.Dto/PosDto/X2D1NoParPosDto.cs

@@ -31,7 +31,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 目标双星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double SxDto { get; set; }
 
         /// <summary>
@@ -47,7 +47,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 目标星地时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double XdDto { get; set; }
 
         /// <summary>
@@ -103,26 +103,26 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double SatTxLon { get; set; }
 
         /// <summary>
         /// 卫星接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
         /// <summary>
         /// 超短波天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double CdbTxLon { get; set; }
 
         /// <summary>
         /// 超短波接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double CdbTxLat { get; set; }
     }
-        
+
 }

+ 7 - 7
XdCxRhDw.Dto/PosDto/X2D1NoXlNoParlPosDto.cs

@@ -31,7 +31,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 目标双星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double SxDto { get; set; }
 
         /// <summary>
@@ -47,7 +47,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 目标星地时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double XdDto { get; set; }
 
         /// <summary>
@@ -73,27 +73,27 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double SatTxLon { get; set; }
 
         /// <summary>
         /// 卫星接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
         /// <summary>
         /// 超短波天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double CdbTxLon { get; set; }
 
         /// <summary>
         /// 超短波接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double CdbTxLat { get; set; }
 
     }
-        
+
 }

+ 11 - 11
XdCxRhDw.Dto/PosDto/X2D1NoXlPosDto.cs

@@ -11,7 +11,7 @@ namespace XdCxRhDw.Dto
     /// </summary>
     public class X2D1NoXlPosDto
     {
-        
+
         /// <summary>
         /// 信号时刻(北京时间)
         /// </summary>
@@ -32,7 +32,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 目标双星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double SxDto { get; set; }
 
         /// <summary>
@@ -48,7 +48,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 目标星地时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double XdDto { get; set; }
 
         /// <summary>
@@ -65,13 +65,13 @@ namespace XdCxRhDw.Dto
         /// <summary>
         ///样本主星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double MainYbDto { get; set; }
 
         /// <summary>
         /// 样本邻星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double AdjaYbDto { get; set; }
 
         /// <summary>
@@ -87,37 +87,37 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double SatTxLon { get; set; }
 
         /// <summary>
         /// 卫星接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
         /// <summary>
         /// 超短波天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double CdbTxLon { get; set; }
 
         /// <summary>
         /// 超短波接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double CdbTxLat { get; set; }
 
         /// <summary>
         /// 参考站经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double RefLon { get; set; }
 
         /// <summary>
         /// 参考站纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
     }
 }

+ 10 - 10
XdCxRhDw.Dto/PosDto/X2D1PosDto.cs

@@ -31,7 +31,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 目标双星时差(us)
         /// </summary>
-        [RangeDouble(-20000, 20000)]
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double SxDto { get; set; }
 
         /// <summary>
@@ -63,13 +63,13 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 样本主星时差(us)
         /// </summary>
-        [RangeDouble(240000, 280000, IncludeMin = true, IncludeMax = true)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double MainYbDto { get; set; }
 
         /// <summary>
         /// 样本邻星时差(us)
         /// </summary>
-        [RangeDouble(240000, 280000, IncludeMin = true, IncludeMax = true)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double AdjaYbDto { get; set; }
 
         /// <summary>
@@ -115,39 +115,39 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double SatTxLon { get; set; }
 
         /// <summary>
         /// 卫星接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
         /// <summary>
         /// 超短波天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double CdbTxLon { get; set; }
 
         /// <summary>
         /// 超短波接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double CdbTxLat { get; set; }
 
         /// <summary>
         /// 参考站经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double RefLon { get; set; }
 
         /// <summary>
         /// 参考站纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
 
     }
-        
+
 }

+ 12 - 15
XdCxRhDw.Dto/PosDto/X2DtoDfoNoXlPosDto.cs

@@ -33,13 +33,12 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主邻时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double Dto { get; set; }
 
         /// <summary>
         /// 主邻频差(Hz)
         /// </summary>
-        [Pow2]
         public double Dfo { get; set; }
 
         /// <summary>
@@ -50,49 +49,47 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 样本主星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double YbMainDto { get; set; }
 
         /// <summary>
         /// 样本邻星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double YbAdjaDto { get; set; }
 
         /// <summary>
         /// 样本主星频差(Hz)
         /// </summary>
-        [Pow2]
         public double YbMainDfo { get; set; }
 
         /// <summary>
         /// 样本邻星频差(Hz)
         /// </summary>
-        [Pow2]
         public double YbAdjaDfo { get; set; }
 
         /// <summary>
         /// 目标上行频点(Hz)
         /// </summary>
-        [RangeDouble(0, IncludeMin = true)]
+        [RangeDouble(0)]
         public double TarFreqUp { get; set; }
 
         /// <summary>
         /// 目标下行频点(Hz)
         /// </summary>
-        [RangeDouble(0, IncludeMin = true)]
+        [RangeDouble(0)]
         public double TarFreqDown { get; set; }
 
         /// <summary>
         /// 参考上行频点(Hz)
         /// </summary>
-        [RangeDouble(0, IncludeMin = true)]
+        [RangeDouble(0)]
         public double RefFreqUp { get; set; }
 
         /// <summary>
         /// 参考下行频点(Hz)
         /// </summary>
-        [RangeDouble(0, IncludeMin = true)]
+        [RangeDouble(0)]
         public double RefFreqDown { get; set; }
 
         /// <summary>
@@ -108,27 +105,27 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double SatTxLon { get; set; }
 
         /// <summary>
         /// 卫星接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
         /// <summary>
         /// 参考站经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double RefLon { get; set; }
 
         /// <summary>
         /// 参考站纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
 
     }
-        
+
 }

+ 12 - 15
XdCxRhDw.Dto/PosDto/X2DtoDfoPosDto.cs

@@ -33,13 +33,12 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主邻1时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double Dto { get; set; }
 
         /// <summary>
         /// 主邻1频差(Hz)
         /// </summary>
-        [Pow2]
         public double Dfo { get; set; }
 
         /// <summary>
@@ -50,49 +49,47 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 样本主星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double YbMainDto { get; set; }
 
         /// <summary>
         /// 样本邻星1时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double YbAdjaDto { get; set; }
 
         /// <summary>
         /// 样本主星频差(Hz)
         /// </summary>
-        [Pow2]
         public double YbMainDfo { get; set; }
 
         /// <summary>
         /// 样本邻星频差(Hz)
         /// </summary>
-        [Pow2]
         public double YbAdjaDfo { get; set; }
 
         /// <summary>
         /// 目标上行频点(Hz)
         /// </summary>
-        [RangeDouble(0, IncludeMin = true)]
+        [RangeDouble(0)]
         public double TarFreqUp { get; set; }
 
         /// <summary>
         /// 目标下行频点(Hz)
         /// </summary>
-        [RangeDouble(0, IncludeMin = true)]
+        [RangeDouble(0)]
         public double TarFreqDown { get; set; }
 
         /// <summary>
         /// 参考上行频点(Hz)
         /// </summary>
-        [RangeDouble(0, IncludeMin = true)]
+        [RangeDouble(0)]
         public double RefFreqUp { get; set; }
 
         /// <summary>
         /// 参考下行频点(Hz)
         /// </summary>
-        [RangeDouble(0, IncludeMin = true)]
+        [RangeDouble(0)]
         public double RefFreqDown { get; set; }
 
         /// <summary>
@@ -168,27 +165,27 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double SatTxLon { get; set; }
 
         /// <summary>
         /// 卫星接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
         /// <summary>
         /// 参考站经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double RefLon { get; set; }
 
         /// <summary>
         /// 参考站纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
 
     }
-        
+
 }

+ 11 - 11
XdCxRhDw.Dto/PosDto/X3TwoDfoNoXlPosDto.cs

@@ -39,12 +39,12 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主邻1时差(us)
         /// </summary>
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double? Dto1 { get; set; }
 
         /// <summary>
         /// 主邻1频差(Hz)
         /// </summary>
-        [Pow2]
         public double Dfo1 { get; set; }
 
         /// <summary>
@@ -55,12 +55,12 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主邻2时差(us)
         /// </summary>
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double? Dto2 { get; set; }
 
         /// <summary>
         /// 主邻2频差(Hz)
         /// </summary>
-        [Pow2]
         public double Dfo2 { get; set; }
 
         /// <summary>
@@ -86,25 +86,25 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 目标上行频点(Hz)
         /// </summary>
-        [RangeDouble(0, IncludeMin = true)]
+        [RangeDouble(0)]
         public double TarFreqUp { get; set; }
 
         /// <summary>
         /// 目标下行频点(Hz)
         /// </summary>
-        [RangeDouble(0, IncludeMin = true)]
+        [RangeDouble(0)]
         public double TarFreqDown { get; set; }
 
         /// <summary>
         /// 参考上行频点(Hz)
         /// </summary>
-        [RangeDouble(0, IncludeMin = true)]
+        [RangeDouble(0)]
         public double RefFreqUp { get; set; }
 
         /// <summary>
         /// 参考下行频点(Hz)
         /// </summary>
-        [RangeDouble(0, IncludeMin = true)]
+        [RangeDouble(0)]
         public double RefFreqDown { get; set; }
 
         /// <summary>
@@ -120,27 +120,27 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double SatTxLon { get; set; }
 
         /// <summary>
         /// 卫星接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
         /// <summary>
         /// 参考站经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double RefLon { get; set; }
 
         /// <summary>
         /// 参考站纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
 
     }
-        
+
 }

+ 9 - 14
XdCxRhDw.Dto/PosDto/X3TwoDfoPosDto.cs

@@ -44,7 +44,6 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主邻1频差(Hz)
         /// </summary>
-        [Pow2]
         public double Dfo1 { get; set; }
 
         /// <summary>
@@ -60,7 +59,6 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主邻2频差(Hz)
         /// </summary>
-        [Pow2]
         public double Dfo2 { get; set; }
 
         /// <summary>
@@ -71,43 +69,40 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 样本主星频差(Hz)
         /// </summary>
-        [Pow2]
         public double YbMainDfo { get; set; }
 
         /// <summary>
         /// 样本邻星1频差(Hz)
         /// </summary>
-        [Pow2]
         public double YbAdja1Dfo { get; set; }
 
         /// <summary>
         /// 样本邻星1频差(Hz)
         /// </summary>
-        [Pow2]
         public double YbAdja2Dfo { get; set; }
 
         /// <summary>
         /// 目标上行频点(Hz)
         /// </summary>
-        [RangeDouble(0, IncludeMin = true)]
+        [RangeDouble(0)]
         public double TarFreqUp { get; set; }
 
         /// <summary>
         /// 目标下行频点(Hz)
         /// </summary>
-        [RangeDouble(0, IncludeMin = true)]
+        [RangeDouble(0)]
         public double TarFreqDown { get; set; }
 
         /// <summary>
         /// 参考上行频点(Hz)
         /// </summary>
-        [RangeDouble(0, IncludeMin = true)]
+        [RangeDouble(0)]
         public double RefFreqUp { get; set; }
 
         /// <summary>
         /// 参考下行频点(Hz)
         /// </summary>
-        [RangeDouble(0, IncludeMin = true)]
+        [RangeDouble(0)]
         public double RefFreqDown { get; set; }
 
         /// <summary>
@@ -213,26 +208,26 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double SatTxLon { get; set; }
 
         /// <summary>
         /// 卫星接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
         /// <summary>
         /// 参考站经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double RefLon { get; set; }
 
         /// <summary>
         /// 参考站纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
     }
-        
+
 }

+ 5 - 5
XdCxRhDw.Dto/PosDto/X3TwoDtoNoParPosDto.cs

@@ -38,7 +38,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主邻1时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double Dto1 { get; set; }
 
         /// <summary>
@@ -54,7 +54,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主邻2时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double Dto2 { get; set; }
 
         /// <summary>
@@ -125,15 +125,15 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double SatTxLon { get; set; }
 
         /// <summary>
         /// 卫星接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
     }
-        
+
 }

+ 6 - 6
XdCxRhDw.Dto/PosDto/X3TwoDtoNoXlNoParPosDto.cs

@@ -38,7 +38,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主邻1时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double Dto1 { get; set; }
 
         /// <summary>
@@ -54,7 +54,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主邻2时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double Dto2 { get; set; }
 
         /// <summary>
@@ -66,7 +66,7 @@ namespace XdCxRhDw.Dto
         /// 主邻2信噪比(dB)
         /// </summary>
         public double? Snr2 { get; set; }
-       
+
         /// <summary>
         /// 目标名称(可空)
         /// </summary>
@@ -80,15 +80,15 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double SatTxLon { get; set; }
 
         /// <summary>
         /// 卫星接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
     }
-        
+
 }

+ 10 - 10
XdCxRhDw.Dto/PosDto/X3TwoDtoNoXlPosDto.cs

@@ -38,7 +38,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主邻1时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double Dto1 { get; set; }
 
         /// <summary>
@@ -54,7 +54,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主邻2时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double Dto2 { get; set; }
 
         /// <summary>
@@ -70,19 +70,19 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 样本主星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double YbMainDto { get; set; }
 
         /// <summary>
         /// 样本邻星1时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double YbAdja1Dto { get; set; }
 
         /// <summary>
         /// 样本邻星2时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double YbAdja2Dto { get; set; }
 
         /// <summary>
@@ -98,27 +98,27 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double SatTxLon { get; set; }
 
         /// <summary>
         /// 卫星接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
         /// <summary>
         /// 参考站经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double RefLon { get; set; }
 
         /// <summary>
         /// 参考站纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
 
     }
-        
+
 }

+ 10 - 10
XdCxRhDw.Dto/PosDto/X3TwoDtoPosDto.cs

@@ -38,7 +38,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主邻1时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double Dto1 { get; set; }
 
         /// <summary>
@@ -54,7 +54,7 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主邻2时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(-20000, 20000, IncludeMin = true)]
         public double Dto2 { get; set; }
 
         /// <summary>
@@ -70,19 +70,19 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 样本主星时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double YbMainDto { get; set; }
 
         /// <summary>
         /// 样本邻星1时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double YbAdja1Dto { get; set; }
 
         /// <summary>
         /// 样本邻星2时差(us)
         /// </summary>
-        [RangeDouble(0, 100000)]
+        [RangeDouble(240000, 280000, IncludeMin = true)]
         public double YbAdja2Dto { get; set; }
 
         /// <summary>
@@ -143,26 +143,26 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 卫星接收天线经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double SatTxLon { get; set; }
 
         /// <summary>
         /// 卫星接收天线纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
         /// <summary>
         /// 参考站经度
         /// </summary>
-        [RangeDouble(-180, 180)]
+        [RangeDouble(-180, 180, IncludeMin = true)]
         public double RefLon { get; set; }
 
         /// <summary>
         /// 参考站纬度
         /// </summary>
-        [RangeDouble(-90, 90)]
+        [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
     }
-        
+
 }