111

Service/X2D1NoRefTaskServer/Service/HistoryTaskService.cs

@@ -278,6 +278,9 @@ namespace X2D1NoRefTaskServer.Service
             var fileName = Path.GetFileNameWithoutExtension(filePath);
             var strs = fileName.Split(new string[] { "_", "MHz", "Hz", "ch" }, StringSplitOptions.RemoveEmptyEntries);
 
+            historyFile.CapLon = Convert.ToDouble(strs[10].Substring(1, strs[10].Length - 1));
+            historyFile.CapLat = Convert.ToDouble(strs[9].Substring(1, strs[9].Length - 1));
+
             //采集时间
             var datestr = string.Join("_", strs.Take(6));
             DateTime dateTime;

XdCxRhDW.App/ExtensionsDev/MapControlEx.cs

@@ -2605,7 +2605,7 @@ public static class MapControlEx
                             layerName = "roadmap-final";
                         else
                             layerName = "overlay-final";
-                        imgUrl = $"{HttpServerAddr}/{layerName}/{zoomLevel}/{tilePositionX}/{tilePositionY}.png";
+                        imgUrl = $"{HttpServerAddr}/{layerName}/{zoomLevel}/{tilePositionX}/{tilePositionY}.jpg";
 
 
                     }

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -152,17 +152,23 @@ namespace XdCxRhDW.App.UserControl
             {
                 try
                 {
-                    //if (settings.WMSType == EnumWmtsType.ZKXT)
-                    //    mapControl1.UseWMS(settings.ZKXT_Url, settings.ZKXT_LayerName);
-                    //else if (settings.WMSType == EnumWmtsType.SJZX)
-                    //    mapControl1.UseWMTS(settings.SJZX_Url, settings.SJZX_LayerName);
-                    //else
-                    //    mapControl1.UseWMTS(settings.LW_Url, settings.LW_LayerName);
+                    string url;
+                    if (settings.WmtsSource == EnumWmtsSource.ZCJ)
+                    {
+                        url = ConfigurationManager.AppSettings["ZCJ_URL"].Trim();
+                    }
+                    else
+                    {
+                        url = ConfigurationManager.AppSettings["SJZX_URL"].Trim();
+                    }
+                    if (url.EndsWith("/"))
+                        url = url.Substring(0, url.Length - 1);
+                    mapControl1.UseWMTS(url, settings.WmtsSource, settings.MapLayerType);
                 }
                 catch (Exception ex)
                 {
                     mapControl1.UseLocalDb();
-                    Serilog.Log.Error(ex, "MapControl使用WMS出现异常,强制使用本地地图");
+                    Serilog.Log.Error(ex, "MapControl使用WMTS出现异常,强制使用本地地图");
                 }
             }
             gridView1.FocusedRowObjectChanged += GridView1_FocusedRowObjectChanged;
@@ -215,18 +221,26 @@ namespace XdCxRhDW.App.UserControl
                 mapControl1.UseLocalDb();
             else
             {
-                string url;
-                if (settings.WmtsSource == EnumWmtsSource.ZCJ)
+                try
                 {
-                    url = ConfigurationManager.AppSettings["ZCJ_URL"].Trim();
+                    string url;
+                    if (settings.WmtsSource == EnumWmtsSource.ZCJ)
+                    {
+                        url = ConfigurationManager.AppSettings["ZCJ_URL"].Trim();
+                    }
+                    else
+                    {
+                        url = ConfigurationManager.AppSettings["SJZX_URL"].Trim();
+                    }
+                    if (url.EndsWith("/"))
+                        url = url.Substring(0, url.Length - 1);
+                    mapControl1.UseWMTS(url, settings.WmtsSource, settings.MapLayerType);
                 }
-                else
+                catch (Exception ex)
                 {
-                    url = ConfigurationManager.AppSettings["SJZX_URL"].Trim();
+                    mapControl1.UseLocalDb();
+                    Serilog.Log.Error(ex, "MapControl使用WMTS出现异常,强制使用本地地图");
                 }
-                if (url.EndsWith("/"))
-                    url=url.Substring(0,url.Length - 1);
-                mapControl1.UseWMTS(url,settings.WmtsSource,settings.MapLayerType);
             }
         }
         private void OnPosAdd(ModelPosRes posRes)

XdCxRhDW.App/UserControl/CtrlSysSettings.Designer.cs

@@ -256,7 +256,7 @@ namespace XdCxRhDW.App.UserControl
             // 
             this.layoutControlItem1.Control = this.txtYDPZThreshold;
             this.layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem1.CustomizationFormText = "Wms地址";
+            this.layoutControlItem1.CustomizationFormText = "运动判证阈值";
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 93);
             this.layoutControlItem1.MaxSize = new System.Drawing.Size(0, 50);
             this.layoutControlItem1.MinSize = new System.Drawing.Size(100, 50);