111

Service/CpuCheckCgServer/CpuCgServer.csproj

@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{993D7982-3BB0-4339-ADD8-10D0C422FA5A}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>CpuCgServer</RootNamespace>
+    <AssemblyName>CPU参估服务</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Debug\CPU参估服务.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>..\..\Service.ico</ApplicationIcon>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\BouncyCastle.Cryptography.2.3.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Data.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Drawing.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Utils.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraGrid.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraLayout.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="Google.Protobuf, Version=3.26.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Google.Protobuf.3.26.0\lib\net45\Google.Protobuf.dll</HintPath>
+    </Reference>
+    <Reference Include="K4os.Compression.LZ4, Version=1.3.8.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\K4os.Compression.LZ4.1.3.8\lib\net462\K4os.Compression.LZ4.dll</HintPath>
+    </Reference>
+    <Reference Include="K4os.Compression.LZ4.Streams, Version=1.3.8.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\K4os.Compression.LZ4.Streams.1.3.8\lib\net462\K4os.Compression.LZ4.Streams.dll</HintPath>
+    </Reference>
+    <Reference Include="K4os.Hash.xxHash, Version=1.0.8.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="MySql.Data, Version=8.3.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MySql.Data.8.3.0\lib\net462\MySql.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Serilog.3.1.1\lib\net471\Serilog.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Sinks.Console, Version=5.0.1.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Serilog.Sinks.Console.5.0.1\lib\net471\Serilog.Sinks.Console.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Sinks.File, Version=5.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Serilog.Sinks.File.5.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Configuration.ConfigurationManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Core" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.8.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Pipelines, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.IO.Pipelines.8.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Management" />
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Web.Http, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\System.Web.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="ZstdSharp, Version=0.7.6.0, Culture=neutral, PublicKeyToken=8d151af33a4ad5cf, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\ZstdSharp.Port.0.7.6\lib\net462\ZstdSharp.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\XdCxRhDW.App\DxHelper\MsgBoxHelper.cs">
+      <Link>DxHelper\MsgBoxHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\XdCxRhDW.App\DxHelper\SvgHelper.cs">
+      <Link>DxHelper\SvgHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\XdCxRhDW.App\ExtensionsDev\GridControlEx.cs">
+      <Link>DxHelper\GridControlEx.cs</Link>
+    </Compile>
+    <Compile Include="..\..\XdCxRhDW.App\Localizer\ChsLocalizer.cs">
+      <Link>DxHelper\ChsLocalizer.cs</Link>
+    </Compile>
+    <Compile Include="LogHelper.cs" />
+    <Compile Include="LogInfo.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="MainForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MainForm.Designer.cs">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </Compile>
+    <None Include="packages.config" />
+    <None Include="Properties\licenses.licx" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <EmbeddedResource Include="MainForm.resx">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\XdCxRhDw.Dto\02.XdCxRhDW.Dto.csproj">
+      <Project>{994f5945-4d73-40b4-a1d9-3e23a9fcd350}</Project>
+      <Name>02.XdCxRhDW.Dto</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\XdCxRhDW.Framework\01.XdCxRhDW.Framework.csproj">
+      <Project>{cd41cedf-e0b8-41cc-867b-3b57f476b450}</Project>
+      <Name>01.XdCxRhDW.Framework</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\XdCxRhDW.WebApi\05.XdCxRhDW.WebApi.csproj">
+      <Project>{652C29AC-65DE-466A-A964-8F1A2E657D86}</Project>
+      <Name>05.XdCxRhDW.WebApi</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Controllers\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>del DevExpress*.xml,EntityFramework*.xml,Serilog*.xml,Newtonsoft*.xml
+del System*.xml,Microsoft*.xml,autofac*.xml,MySql*.xml,K4os*.xml,google*.xml
+del BouncyCastle*.xml
+
+if not exist "AddIns" md AddIns
+move /Y *.dll AddIns
+move /Y *.pdb AddIns
+copy $(SolutionDir)Service.svg Service.svg</PostBuildEvent>
+  </PropertyGroup>
+</Project>

XdCxRhDW.X2D1TaskServer/LogHelper.cs → Service/CpuCheckCgServer/LogHelper.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace XdCxRhDW.X2D1TaskServer
+namespace CpuCgServer
 {
     public static class LogHelper
     {

XdCxRhDW.X2D1TaskServer/LogInfo.cs → Service/CpuCheckCgServer/LogInfo.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace XdCxRhDW.X2D1TaskServer
+namespace CpuCgServer
 {
     public class LogInfo
     {

XdCxRhDW.X2D1TaskServer/MainForm.Designer.cs → Service/CpuCheckCgServer/MainForm.Designer.cs

@@ -1,4 +1,4 @@
-namespace XdCxRhDW.X2D1TaskServer
+namespace CpuCgServer
 {
     partial class MainForm
     {
@@ -59,7 +59,7 @@
             this.Controls.Add(this.gridLog);
             this.IconOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("MainForm.IconOptions.SvgImage")));
             this.Name = "MainForm";
-            this.Text = "两星一地离线任务处理程序";
+            this.Text = "CPU检测参估服务";
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed);
             this.Load += new System.EventHandler(this.MainForm_LoadAsync);
             ((System.ComponentModel.ISupportInitialize)(this.gridLog)).EndInit();

XdCxRhDW.X2D1TaskServer/MainForm.cs → Service/CpuCheckCgServer/MainForm.cs

@@ -5,9 +5,8 @@ using System.Configuration;
 using System.Windows.Forms;
 using XdCxRhDW.Dto;
 using XdCxRhDW.WebApi;
-using XdCxRhDW.X2D1TaskServer;
 
-namespace XdCxRhDW.X2D1TaskServer
+namespace CpuCgServer
 {
     public partial class MainForm : DevExpress.XtraEditors.XtraForm
     {
@@ -31,9 +30,9 @@ namespace XdCxRhDW.X2D1TaskServer
             var port = Convert.ToInt32(ConfigurationManager.AppSettings["LocalHttpPort"].Trim());
             var svrID = ConfigurationManager.AppSettings["SvrID"].Trim();
             var posPlatformAddr = ConfigurationManager.AppSettings["PosPlatformAddr"].Trim();
-            this.Text = EnumSvrType.X2D1HistoryTask.GetEnumDisplayName() + "-" + svrID;
+            this.Text = EnumSvrType.X2D1NoRefHistoryTask.GetEnumDisplayName() + "-" + svrID;
             var localIp = IpHelper.GetLocalIp();
-            Startup.Start(port, "两星一地离线数据定位服务.Xml", "XdCxRhDW.Dto.xml");
+            Startup.Start(port, $"{System.Reflection.Assembly.GetExecutingAssembly().GetName().Name}.xml", "XdCxRhDW.Dto.xml");
             LogHelper.Info($"服务启动成功.接口地址http://{localIp}:{port}/swagger");
 
             string url;
@@ -48,7 +47,7 @@ namespace XdCxRhDW.X2D1TaskServer
                 {
                     var res = await HttpHelper.PostRequestAsync<object>(url, new SvrStateReportDto()
                     {
-                        SvrType = EnumSvrType.X2D1HistoryTask,
+                        SvrType = EnumSvrType.X2D1NoRefHistoryTask,
                         SvrID = svrID,
                         ReportType = 0,
                         BaseHttpAddr = $"http://{localIp}:{port}",
@@ -93,7 +92,7 @@ namespace XdCxRhDW.X2D1TaskServer
                 _ = HttpHelper.PostRequestAsync<object>(url, new SvrStateReportDto()
                 {
                     SvrID = svrID,
-                    SvrType = EnumSvrType.X2D1HistoryTask,
+                    SvrType = EnumSvrType.X2D1NoRefHistoryTask,
                     ReportType = 1,
                     BaseHttpAddr = $"http://{localIp}:{port}",
                 });

XdCxRhDW.X2D1TaskServer/Program.cs → Service/CpuCheckCgServer/Program.cs

@@ -12,7 +12,7 @@ using System.Security.Principal;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace XdCxRhDW.X2D1TaskServer
+namespace CpuCgServer
 {
     internal static class Program
     {
@@ -117,7 +117,7 @@ namespace XdCxRhDW.X2D1TaskServer
             }
             if (IsRunningAsAdmin())
             {
-                ChsLocalizer.UseChs();
+                XdCxRhDW.ChsLocalizer.UseChs();
                 MainForm mainForm = new MainForm();
                 System.Windows.Forms.Application.Run(mainForm);
             }

XdCxRhDW.X2D1TaskServer/Properties/AssemblyInfo.cs → Service/CpuCheckCgServer/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // 有关程序集的一般信息由以下
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("XdCxRhDW.X2D1TaskServer")]
+[assembly: AssemblyTitle("CPU参估服务")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("XdCxRhDW.X2D1TaskServer")]
+[assembly: AssemblyProduct("CPU参估服务")]
 [assembly: AssemblyCopyright("Copyright ©  2024")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

XdCxRhDW.X2D1TaskServer/Properties/Resources.Designer.cs → Service/CpuCheckCgServer/Properties/Resources.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace XdCxRhDW.X2D1TaskServer.Properties {
+namespace CpuCgServer.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace XdCxRhDW.X2D1TaskServer.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("XdCxRhDW.X2D1TaskServer.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CpuCgServer.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

XdCxRhDW.X2D1TaskServer/Properties/Settings.Designer.cs → Service/CpuCheckCgServer/Properties/Settings.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace XdCxRhDW.X2D1TaskServer.Properties {
+namespace CpuCgServer.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

Service/X2D1NoRefTaskServer/App.config

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<connectionStrings>
+		<add name="MySql" connectionString="server=192.168.1.5;port=3306;database=mcms;user=root;password=123456" />
+	</connectionStrings>
+	<appSettings>
+		<!--服务ID-->
+		<add key="SvrID" value="001" />
+
+		<!--本地http端口-->
+		<add key="LocalHttpPort" value="8920" />
+
+		<!--融合定位平台Http地址-->
+		<add key="PosPlatformAddr" value="http://127.0.0.1:8091" />
+
+		<!--定位时差系数-->
+		<add key="PosDtoFactor" value="1"/>
+
+	</appSettings>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+	</startup>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Http.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-3.26.0.0" newVersion="3.26.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="ZstdSharp" publicKeyToken="8d151af33a4ad5cf" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-0.7.6.0" newVersion="0.7.6.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="K4os.Compression.LZ4.Streams" publicKeyToken="2186fa9121ef231d" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-1.3.8.0" newVersion="1.3.8.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>

XdCxRhDW.X2D1TaskServer/Controllers/HistoryTaskProcessingController.cs → Service/X2D1NoRefTaskServer/Controllers/HistoryTaskProcessingController.cs

@@ -7,9 +7,9 @@ using System.Linq;
 using System.Web.Http;
 using XdCxRhDW.Dto;
 using XdCxRhDW.WebApi;
-using XdCxRhDW.X2D1TaskServer.Service;
+using X2D1NoRefTaskServer.Service;
 
-namespace XdCxRhDW.X2D1TaskServer.Controllers
+namespace X2D1NoRefTaskServer.Controllers
 {
     /// <summary>
     ///离线任务处理接口

XdCxRhDW.X2D1TaskServer/HistoryFile.cs → Service/X2D1NoRefTaskServer/HistoryFile.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace XdCxRhDW.X2D1TaskServer
+namespace X2D1NoRefTaskServer
 {
     public class HistoryFile
     {

XdCxRhDW.X2D1TaskServer54/LogHelper.cs → Service/X2D1NoRefTaskServer/LogHelper.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace XdCxRhDW.X2D1TaskServer54
+namespace X2D1NoRefTaskServer
 {
     public static class LogHelper
     {

XdCxRhDW.X2D1TaskServer54/LogInfo.cs → Service/X2D1NoRefTaskServer/LogInfo.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace XdCxRhDW.X2D1TaskServer54
+namespace X2D1NoRefTaskServer
 {
     public class LogInfo
     {

XdCxRhDW.X2D1TaskServer54/MainForm.Designer.cs → Service/X2D1NoRefTaskServer/MainForm.Designer.cs

@@ -1,4 +1,4 @@
-namespace XdCxRhDW.X2D1TaskServer54
+namespace X2D1NoRefTaskServer
 {
     partial class MainForm
     {
@@ -59,7 +59,7 @@
             this.Controls.Add(this.gridLog);
             this.IconOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("MainForm.IconOptions.SvgImage")));
             this.Name = "MainForm";
-            this.Text = "两星一地离线任务处理程序";
+            this.Text = "两星一地无参离线数据处理服务";
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed);
             this.Load += new System.EventHandler(this.MainForm_LoadAsync);
             ((System.ComponentModel.ISupportInitialize)(this.gridLog)).EndInit();

Service/X2D1NoRefTaskServer/MainForm.cs

@@ -0,0 +1,109 @@
+using DxHelper;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Windows.Forms;
+using XdCxRhDW.Dto;
+using XdCxRhDW.WebApi;
+using X2D1NoRefTaskServer;
+
+namespace X2D1NoRefTaskServer
+{
+    public partial class MainForm : DevExpress.XtraEditors.XtraForm
+    {
+        List<LogInfo> list = new List<LogInfo>();
+        public MainForm()
+        {
+            InitializeComponent();
+            gridLog.UseDefault(list).UseExportCsv().UseClear<LogInfo>();
+            gridView1.Columns[0].MaxWidth = 150;
+            gridView1.Columns[1].MaxWidth = 120;
+            this.IconOptions.SvgImage = DxHelper.SvgHelper.LoadFromFile("Service.svg");
+            LogHelper.Logger = info =>
+            {
+                list.Insert(0, info);
+                gridView1.RefreshData();
+            };
+        }
+
+        private async void MainForm_LoadAsync(object sender, EventArgs e)
+        {
+            var port = Convert.ToInt32(ConfigurationManager.AppSettings["LocalHttpPort"].Trim());
+            var svrID = ConfigurationManager.AppSettings["SvrID"].Trim();
+            var posPlatformAddr = ConfigurationManager.AppSettings["PosPlatformAddr"].Trim();
+            this.Text = EnumSvrType.X2D1NoRefHistoryTask.GetEnumDisplayName() + "-" + svrID;
+            var localIp = IpHelper.GetLocalIp();
+            
+            Startup.Start(port, $"{System.Reflection.Assembly.GetExecutingAssembly().GetName().Name}.xml", "XdCxRhDW.Dto.xml");
+            LogHelper.Info($"服务启动成功.接口地址http://{localIp}:{port}/swagger");
+
+            string url;
+            if (posPlatformAddr.EndsWith("/"))
+                url = posPlatformAddr + "api/SvrReport/Report";
+            else
+                url = posPlatformAddr + "/api/SvrReport/Report";
+            bool preSucceed = false;
+            while (!this.Disposing)
+            {
+                try
+                {
+                    var res = await HttpHelper.PostRequestAsync<object>(url, new SvrStateReportDto()
+                    {
+                        SvrType = EnumSvrType.X2D1NoRefHistoryTask,
+                        SvrID = svrID,
+                        ReportType = 0,
+                        BaseHttpAddr = $"http://{localIp}:{port}",
+                        SwaggerAddr = $"http://{localIp}:{port}/Swagger",
+                    });
+                    if (res.code != 200)
+                    {
+                        LogHelper.Error($"状态上报异常[url={url}].{res.msg}");
+                        preSucceed = false;
+                    }
+                    else
+                    {
+                        if (!preSucceed)
+                            LogHelper.Info($"状态上报成功![url={url}]");
+                        preSucceed = true;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.Error($"状态上报异常[url={url}]", ex);
+                    preSucceed = false;
+                }
+                await System.Threading.Tasks.Task.Delay(10000);
+            }
+        }
+
+        private void MainForm_FormClosed(object sender, FormClosedEventArgs e)
+        {
+            try
+            {
+                var port = Convert.ToInt32(ConfigurationManager.AppSettings["LocalHttpPort"].Trim());
+                var svrID = ConfigurationManager.AppSettings["SvrID"].Trim();
+                var posPlatformAddr = ConfigurationManager.AppSettings["PosPlatformAddr"].Trim();
+                string url;
+                if (posPlatformAddr.EndsWith("/"))
+                    url = posPlatformAddr + "api/SvrReport/Report";
+                else
+                    url = posPlatformAddr + "/api/SvrReport/Report";
+                var localIp = IpHelper.GetLocalIp();
+
+
+                _ = HttpHelper.PostRequestAsync<object>(url, new SvrStateReportDto()
+                {
+                    SvrID = svrID,
+                    SvrType = EnumSvrType.X2D1NoRefHistoryTask,
+                    ReportType = 1,
+                    BaseHttpAddr = $"http://{localIp}:{port}",
+                });
+
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Error("状态上报异常", ex);
+            }
+        }
+    }
+}

XdCxRhDW.X2D1TaskServer/MySqlTools.cs → Service/X2D1NoRefTaskServer/MySqlTools.cs

@@ -2,7 +2,7 @@
 using System;
 using System.Data;
 
-namespace XdCxRhDW.X2D1TaskServer
+namespace X2D1NoRefTaskServer
 {
     public static class MySqlTools
     {

Service/X2D1NoRefTaskServer/Program.cs

@@ -0,0 +1,130 @@
+using DevExpress.LookAndFeel;
+using DevExpress.XtraEditors;
+using Serilog;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Security.Principal;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace X2D1NoRefTaskServer
+{
+    internal static class Program
+    {
+        static Program()
+        {
+
+            //设置私有路径
+            Environment.CurrentDirectory = AppDomain.CurrentDomain.BaseDirectory;
+            AppDomain.CurrentDomain.SetData("PRIVATE_BINPATH", "AddIns;");
+            var m = typeof(AppDomainSetup).GetMethod("UpdateContextProperty", BindingFlags.NonPublic | BindingFlags.Static);
+            var funsion = typeof(AppDomain).GetMethod("GetFusionContext", BindingFlags.NonPublic | BindingFlags.Instance);
+            m.Invoke(null, new object[] { funsion.Invoke(AppDomain.CurrentDomain, null), "PRIVATE_BINPATH", "AddIns;" });
+
+            //c++dll加入环境变量
+            string paths = Environment.GetEnvironmentVariable("PATH");
+            var dirs = Directory.EnumerateDirectories("AddIns", "*", SearchOption.AllDirectories);
+            List<string> list = new List<string>
+            {
+                Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "AddIns")
+            };
+            foreach (var item in dirs)
+            {
+                list.Add(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, item));
+            }
+            Environment.SetEnvironmentVariable("PATH", $"{paths};{string.Join(";", list)}");
+
+            AppDomain.CurrentDomain.UnhandledException += (sender, e) =>
+            {
+                var args = e.ExceptionObject as Exception;
+                Serilog.Log.Error(args, "出现未处理的异常,程序即将退出!");
+                DxHelper.MsgBoxHelper.ShowError("出现未处理的异常,程序即将退出!");
+            };
+            Application.ThreadException += (sender, e) =>
+            {
+                DxHelper.MsgBoxHelper.ShowError($"出现未处理的线程异常!{e.Exception.Message}");
+                Serilog.Log.Error(e.Exception, "出现未处理的线程异常");
+            };
+        }
+        static bool IsRunningAsAdmin()
+        {
+            bool result;
+            try
+            {
+                WindowsIdentity identity = WindowsIdentity.GetCurrent();
+                WindowsPrincipal principal = new WindowsPrincipal(identity);
+                result = principal.IsInRole(WindowsBuiltInRole.Administrator);
+            }
+            catch
+            {
+                result = false;
+            }
+            return result;
+        }
+        static void RestartAsAdmin()
+        {
+            var startInfo = new ProcessStartInfo();
+            startInfo.FileName = Application.ExecutablePath;
+            startInfo.Verb = "runas"; // 以管理员身份运行
+            try
+            {
+                Process.Start(startInfo);
+            }
+            catch (System.ComponentModel.Win32Exception)
+            {
+                // 用户取消了管理员权限提示，或者其他错误
+                // 可以在此处处理错误情况
+            }
+
+            Application.Exit();
+        }
+        /// <summary>
+        /// 应用程序的主入口点。
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            string outputTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}  {Exception}";
+            Serilog.Log.Logger = new Serilog.LoggerConfiguration()
+                .WriteTo.Console(outputTemplate: outputTemplate)
+                .WriteTo.Logger(p => p.Filter.ByIncludingOnly(e => e.Level == Serilog.Events.LogEventLevel.Information)
+                    .WriteTo.File("Logs\\Info\\.log", rollingInterval: Serilog.RollingInterval.Day))
+                .WriteTo.Logger(p => p.Filter.ByIncludingOnly(e => e.Level == Serilog.Events.LogEventLevel.Warning)
+                    .WriteTo.File("Logs\\Warning\\.log", rollingInterval: Serilog.RollingInterval.Day))
+                .WriteTo.Logger(p => p.Filter.ByIncludingOnly(e => e.Level == Serilog.Events.LogEventLevel.Error)
+                    .WriteTo.File("Logs\\Error\\.log", rollingInterval: Serilog.RollingInterval.Day, outputTemplate: outputTemplate))
+                .CreateLogger();
+
+            WindowsFormsSettings.AllowDpiScale = true;
+            WindowsFormsSettings.AllowHoverAnimation = DevExpress.Utils.DefaultBoolean.True;
+            WindowsFormsSettings.AllowDefaultSvgImages = DevExpress.Utils.DefaultBoolean.True;
+            WindowsFormsSettings.AllowRoundedWindowCorners = DevExpress.Utils.DefaultBoolean.True;
+            WindowsFormsSettings.AnimationMode = AnimationMode.EnableAll;
+            WindowsFormsSettings.BackgroundSkinningMode = BackgroundSkinningMode.AllColors;
+            WindowsFormsSettings.DefaultAllowHtmlDraw = true;
+            WindowsFormsSettings.DefaultLookAndFeel.SetSkinStyle(SkinStyle.WXICompact);
+            WindowsFormsSettings.DefaultFont = new System.Drawing.Font("微软雅黑", 10f);
+            WindowsFormsSettings.SetPerMonitorDpiAware();
+            if (Debugger.IsAttached)
+            {
+                //DevExpress23.2以上版本查看未本地化的资源
+                //DevExpress.Utils.Localization.XtraLocalizer.EnableTraceSource();
+            }
+            if (IsRunningAsAdmin())
+            {
+                XdCxRhDW.ChsLocalizer.UseChs();
+                MainForm mainForm = new MainForm();
+                System.Windows.Forms.Application.Run(mainForm);
+            }
+            else
+            {
+                RestartAsAdmin();
+            }
+        }
+    }
+}

XdCxRhDW.X2D1TaskServer54/Properties/AssemblyInfo.cs → Service/X2D1NoRefTaskServer/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // 有关程序集的一般信息由以下
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("XdCxRhDW.X2D1TaskServer54")]
+[assembly: AssemblyTitle("X2D1NoRefTaskServer")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("XdCxRhDW.X2D1TaskServer54")]
+[assembly: AssemblyProduct("X2D1NoRefTaskServer")]
 [assembly: AssemblyCopyright("Copyright ©  2024")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

XdCxRhDW.X2D1TaskServer54/Properties/Resources.Designer.cs → Service/X2D1NoRefTaskServer/Properties/Resources.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace XdCxRhDW.X2D1TaskServer54.Properties {
+namespace X2D1NoRefTaskServer.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace XdCxRhDW.X2D1TaskServer54.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("XdCxRhDW.X2D1TaskServer54.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("X2D1NoRefTaskServer.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

XdCxRhDW.X2D1TaskServer54/Properties/Settings.Designer.cs → Service/X2D1NoRefTaskServer/Properties/Settings.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace XdCxRhDW.X2D1TaskServer54.Properties {
+namespace X2D1NoRefTaskServer.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

XdCxRhDW.X2D1TaskServer/Service/HistoryTaskService.cs → Service/X2D1NoRefTaskServer/Service/HistoryTaskService.cs

@@ -11,7 +11,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using XdCxRhDW.Dto;
 
-namespace XdCxRhDW.X2D1TaskServer.Service
+namespace X2D1NoRefTaskServer.Service
 {
     public class HistoryTaskService
     {
@@ -34,6 +34,8 @@ namespace XdCxRhDW.X2D1TaskServer.Service
                 return;
             }
             LogHelper.Info($"【任务{dto.ID}】开始执行...");
+            int.TryParse(ConfigurationManager.AppSettings["PosDtoFactor"], out int posDtoFactor);
+            if (posDtoFactor == 0) posDtoFactor = 1;//定位时时差系数
             bool canConnected = CanGetSatIdFromMySql();
             if (!canConnected)
             {
@@ -148,9 +150,9 @@ namespace XdCxRhDW.X2D1TaskServer.Service
                                 var cgDto = new CpuCgMultiDto()
                                 {
                                     dtCenter = 260000,
-                                    dtRange = 60000,
-                                    file1 = mainFile,
-                                    file2 = cdbFile,
+                                    dtRange = 50000,
+                                    file1 = cdbFile,
+                                    file2 = mainFile,
                                     samplingRate = minfo.FsHz,
                                     smpPositions = smps,
                                     snrThreshold = 15,
@@ -165,9 +167,9 @@ namespace XdCxRhDW.X2D1TaskServer.Service
                                 cgDto = new CpuCgMultiDto()
                                 {
                                     dtCenter = 260000,
-                                    dtRange = 60000,
-                                    file1 = adjaFile,
-                                    file2 = cdbFile,
+                                    dtRange = 50000,
+                                    file1 = cdbFile,
+                                    file2 = adjaFile,
                                     samplingRate = minfo.FsHz,
                                     smpPositions = smps,
                                     snrThreshold = 15,
@@ -197,10 +199,10 @@ namespace XdCxRhDW.X2D1TaskServer.Service
                                             SigTime = minfo.CapTime.AddSeconds(data1[i].Smpstart / minfo.FsHz),
                                             MainCode = minfo.SatId,
                                             AdjaCode = ninfo.SatId,
-                                            SxDto = data1[i].Dt,
+                                            SxDto = data1[i].Dt * posDtoFactor - data2[i].Dt * posDtoFactor,
                                             SxDfo = data1[i].Df,
                                             SxSnr = data1[i].Snr,
-                                            XdDto = data2[i].Dt,
+                                            XdDto = data1[i].Dt * posDtoFactor,
                                             XdDfo = data2[i].Df,
                                             XdSnr = data2[i].Snr,
                                             SatTxLon = minfo.CapLon,

XdCxRhDW.X2D1TaskServer/XdCxRhDW.X2D1TaskServer.csproj → Service/X2D1NoRefTaskServer/X2D1NoRefTaskServer.csproj

@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{C1BECB5B-A11E-4A10-988F-1056FE60E689}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>XdCxRhDW.X2D1TaskServer</RootNamespace>
-    <AssemblyName>两星一地离线数据处理服务</AssemblyName>
+    <RootNamespace>XdCxRhDW.X2D1NoRefTaskServer</RootNamespace>
+    <AssemblyName>两星一地无参离线数据处理服务</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -22,7 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\两星一地离线数据处理服务.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\两星一地无参离线数据处理服务.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -34,11 +34,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>..\Service.ico</ApplicationIcon>
+    <ApplicationIcon>..\..\Service.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
-      <HintPath>..\packages\BouncyCastle.Cryptography.2.3.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+      <HintPath>..\..\packages\BouncyCastle.Cryptography.2.3.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Data.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -48,73 +48,73 @@
     <Reference Include="DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraGrid.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraLayout.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraLayout.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="Google.Protobuf, Version=3.26.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Protobuf.3.26.0\lib\net45\Google.Protobuf.dll</HintPath>
+      <HintPath>..\..\packages\Google.Protobuf.3.26.0\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
     <Reference Include="K4os.Compression.LZ4, Version=1.3.8.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Compression.LZ4.1.3.8\lib\net462\K4os.Compression.LZ4.dll</HintPath>
+      <HintPath>..\..\packages\K4os.Compression.LZ4.1.3.8\lib\net462\K4os.Compression.LZ4.dll</HintPath>
     </Reference>
     <Reference Include="K4os.Compression.LZ4.Streams, Version=1.3.8.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Compression.LZ4.Streams.1.3.8\lib\net462\K4os.Compression.LZ4.Streams.dll</HintPath>
+      <HintPath>..\..\packages\K4os.Compression.LZ4.Streams.1.3.8\lib\net462\K4os.Compression.LZ4.Streams.dll</HintPath>
     </Reference>
     <Reference Include="K4os.Hash.xxHash, Version=1.0.8.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll</HintPath>
+      <HintPath>..\..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data, Version=8.3.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.8.3.0\lib\net462\MySql.Data.dll</HintPath>
+      <HintPath>..\..\packages\MySql.Data.8.3.0\lib\net462\MySql.Data.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
     </Reference>
     <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.3.1.1\lib\net471\Serilog.dll</HintPath>
+      <HintPath>..\..\packages\Serilog.3.1.1\lib\net471\Serilog.dll</HintPath>
     </Reference>
     <Reference Include="Serilog.Sinks.Console, Version=5.0.1.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.Sinks.Console.5.0.1\lib\net471\Serilog.Sinks.Console.dll</HintPath>
+      <HintPath>..\..\packages\Serilog.Sinks.Console.5.0.1\lib\net471\Serilog.Sinks.Console.dll</HintPath>
     </Reference>
     <Reference Include="Serilog.Sinks.File, Version=5.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.Sinks.File.5.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
+      <HintPath>..\..\packages\Serilog.Sinks.File.5.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Configuration.ConfigurationManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
+      <HintPath>..\..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.8.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.8.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Pipelines, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Pipelines.8.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
+      <HintPath>..\..\packages\System.IO.Pipelines.8.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
     <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -125,28 +125,25 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Web.Http, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\System.Web.Http.dll</HintPath>
+      <HintPath>..\..\System.Web.Http.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="ZstdSharp, Version=0.7.6.0, Culture=neutral, PublicKeyToken=8d151af33a4ad5cf, processorArchitecture=MSIL">
-      <HintPath>..\packages\ZstdSharp.Port.0.7.6\lib\net462\ZstdSharp.dll</HintPath>
+      <HintPath>..\..\packages\ZstdSharp.Port.0.7.6\lib\net462\ZstdSharp.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\XdCxRhDW.App\DxHelper\MsgBoxHelper.cs">
+    <Compile Include="..\..\XdCxRhDW.App\DxHelper\MsgBoxHelper.cs">
       <Link>DxHelper\MsgBoxHelper.cs</Link>
     </Compile>
-    <Compile Include="..\XdCxRhDW.App\DxHelper\SvgHelper.cs">
+    <Compile Include="..\..\XdCxRhDW.App\DxHelper\SvgHelper.cs">
       <Link>DxHelper\SvgHelper.cs</Link>
     </Compile>
-    <Compile Include="..\XdCxRhDW.App\DxHelper\WaitHelper.cs">
-      <Link>DxHelper\WaitHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\XdCxRhDW.App\ExtensionsDev\GridControlEx.cs">
+    <Compile Include="..\..\XdCxRhDW.App\ExtensionsDev\GridControlEx.cs">
       <Link>DxHelper\GridControlEx.cs</Link>
     </Compile>
-    <Compile Include="..\XdCxRhDW.App\Localizer\ChsLocalizer.cs">
+    <Compile Include="..\..\XdCxRhDW.App\Localizer\ChsLocalizer.cs">
       <Link>DxHelper\ChsLocalizer.cs</Link>
     </Compile>
     <Compile Include="Controllers\HistoryTaskProcessingController.cs" />
@@ -192,15 +189,15 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\XdCxRhDw.Dto\02.XdCxRhDW.Dto.csproj">
+    <ProjectReference Include="..\..\XdCxRhDw.Dto\02.XdCxRhDW.Dto.csproj">
       <Project>{994f5945-4d73-40b4-a1d9-3e23a9fcd350}</Project>
       <Name>02.XdCxRhDW.Dto</Name>
     </ProjectReference>
-    <ProjectReference Include="..\XdCxRhDW.Framework\01.XdCxRhDW.Framework.csproj">
+    <ProjectReference Include="..\..\XdCxRhDW.Framework\01.XdCxRhDW.Framework.csproj">
       <Project>{cd41cedf-e0b8-41cc-867b-3b57f476b450}</Project>
       <Name>01.XdCxRhDW.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\XdCxRhDW.WebApi\05.XdCxRhDW.WebApi.csproj">
+    <ProjectReference Include="..\..\XdCxRhDW.WebApi\05.XdCxRhDW.WebApi.csproj">
       <Project>{652C29AC-65DE-466A-A964-8F1A2E657D86}</Project>
       <Name>05.XdCxRhDW.WebApi</Name>
     </ProjectReference>

XdCxRhDW.X2D1TaskServer/App.config → Service/X2D1TaskServer54/App.config

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-	<connectionStrings>
-		<add name="MySql" connectionString="server=192.168.1.5;port=3306;database=mcms;user=root;password=123456" />
-	</connectionStrings>
 	<appSettings>
 		<!--服务ID-->
 		<add key="SvrID" value="001" />
@@ -10,7 +7,7 @@
 		<!--本地http端口-->
 		<add key="LocalHttpPort" value="8920" />
 
-		<!--融合定位平台Http地址-->
+		<!--定位平台Http地址-->
 		<add key="PosPlatformAddr" value="http://127.0.0.1:8091" />
 
 	</appSettings>

XdCxRhDW.X2D1TaskServer54/Controllers/HistoryTaskProcessingController.cs → Service/X2D1TaskServer54/Controllers/HistoryTaskProcessingController.cs

@@ -7,9 +7,9 @@ using System.Linq;
 using System.Web.Http;
 using XdCxRhDW.Dto;
 using XdCxRhDW.WebApi;
-using XdCxRhDW.X2D1TaskServer54.Service;
+using X2D1TaskServer54.Service;
 
-namespace XdCxRhDW.X2D1TaskServer54.Controllers
+namespace X2D1TaskServer54.Controllers
 {
     /// <summary>
     ///离线任务处理接口

Service/X2D1TaskServer54/LogHelper.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace X2D1TaskServer54
+{
+    public static class LogHelper
+    {
+        public static Action<LogInfo> Logger;
+        public static void Info(string msg)
+        {
+            Serilog.Log.Information(msg);
+            Logger?.Invoke(new LogInfo() { LogType = EnumLogType.Info, Msg = msg });
+        }
+        public static void Warning(string msg, Exception ex = null)
+        {
+            Serilog.Log.Warning(ex, msg);
+            Logger?.Invoke(new LogInfo() { LogType = EnumLogType.Warning, Msg = msg });
+        }
+        public static void Error(string msg, Exception ex = null)
+        {
+            Serilog.Log.Error(ex, msg);
+            Logger?.Invoke(new LogInfo() { LogType = EnumLogType.Error, Msg = msg });
+        }
+    }
+}

Service/X2D1TaskServer54/LogInfo.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace X2D1TaskServer54
+{
+    public class LogInfo
+    {
+        public LogInfo()
+        {
+            this.LogTime = DateTime.Now;
+            this.LogType = EnumLogType.Info;
+        }
+        [Display(Name = "时间")]
+        public DateTime LogTime { get; private set; }
+
+        [Display(Name = "日志类型")]
+        public EnumLogType LogType { get; set; }
+
+        [Display(Name = "内容")]
+        public string Msg { get; set; }
+    }
+    public enum EnumLogType
+    {
+        [Display(Name = "消息")]
+        Info,
+
+        [Display(Name = "警告")]
+        Warning,
+
+        [Display(Name = "错误")]
+        Error
+    }
+}

Service/X2D1TaskServer54/MainForm.Designer.cs

@@ -0,0 +1,76 @@
+namespace X2D1TaskServer54
+{
+    partial class MainForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
+            this.gridLog = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            ((System.ComponentModel.ISupportInitialize)(this.gridLog)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // gridLog
+            // 
+            this.gridLog.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gridLog.Location = new System.Drawing.Point(0, 0);
+            this.gridLog.MainView = this.gridView1;
+            this.gridLog.Name = "gridLog";
+            this.gridLog.Size = new System.Drawing.Size(823, 394);
+            this.gridLog.TabIndex = 0;
+            this.gridLog.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.GridControl = this.gridLog;
+            this.gridView1.Name = "gridView1";
+            // 
+            // MainForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(823, 394);
+            this.Controls.Add(this.gridLog);
+            this.IconOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("MainForm.IconOptions.SvgImage")));
+            this.Name = "MainForm";
+            this.Text = "两星一地无参离线数据处理服务";
+            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed);
+            this.Load += new System.EventHandler(this.MainForm_LoadAsync);
+            ((System.ComponentModel.ISupportInitialize)(this.gridLog)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraGrid.GridControl gridLog;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+    }
+}

XdCxRhDW.X2D1TaskServer54/MainForm.cs → Service/X2D1TaskServer54/MainForm.cs

@@ -6,7 +6,7 @@ using System.Windows.Forms;
 using XdCxRhDW.Dto;
 using XdCxRhDW.WebApi;
 
-namespace XdCxRhDW.X2D1TaskServer54
+namespace X2D1TaskServer54
 {
     public partial class MainForm : DevExpress.XtraEditors.XtraForm
     {
@@ -30,9 +30,9 @@ namespace XdCxRhDW.X2D1TaskServer54
             var port = Convert.ToInt32(ConfigurationManager.AppSettings["LocalHttpPort"].Trim());
             var svrID = ConfigurationManager.AppSettings["SvrID"].Trim();
             var posPlatformAddr = ConfigurationManager.AppSettings["PosPlatformAddr"].Trim();
-            this.Text = EnumSvrType.X2D1HistoryTask.GetEnumDisplayName() + "-" + svrID;
+            this.Text = EnumSvrType.X2D1NoRefHistoryTask.GetEnumDisplayName() + "-" + svrID;
             var localIp = IpHelper.GetLocalIp();
-            Startup.Start(port, "两星一地离线数据定位服务.Xml", "XdCxRhDW.Dto.xml");
+            Startup.Start(port, $"{System.Reflection.Assembly.GetExecutingAssembly().GetName().Name}.xml", "XdCxRhDW.Dto.xml");
             LogHelper.Info($"服务启动成功.接口地址http://{localIp}:{port}/swagger");
 
             string url;
@@ -47,7 +47,7 @@ namespace XdCxRhDW.X2D1TaskServer54
                 {
                     var res = await HttpHelper.PostRequestAsync<object>(url, new SvrStateReportDto()
                     {
-                        SvrType = EnumSvrType.X2D1HistoryTask,
+                        SvrType = EnumSvrType.X2D1NoRefHistoryTask,
                         SvrID = svrID,
                         ReportType = 0,
                         BaseHttpAddr = $"http://{localIp}:{port}",
@@ -92,7 +92,7 @@ namespace XdCxRhDW.X2D1TaskServer54
                 _ = HttpHelper.PostRequestAsync<object>(url, new SvrStateReportDto()
                 {
                     SvrID = svrID,
-                    SvrType = EnumSvrType.X2D1HistoryTask,
+                    SvrType = EnumSvrType.X2D1NoRefHistoryTask,
                     ReportType = 1,
                     BaseHttpAddr = $"http://{localIp}:{port}",
                 });

XdCxRhDW.Sender/UserControl1.resx → Service/X2D1TaskServer54/MainForm.resx

@@ -117,4 +117,27 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="MainForm.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIQDAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3
+        RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh
+        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm
+        aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyAvPg0KICA8ZyBpZD0iU2VydmVyTW9kZSI+DQogICAg
+        PHBhdGggZD0iTTI3LDIwSDVjLTAuNSwwLTEsMC41LTEsMXY0YzAsMC41LDAuNSwxLDEsMWgyMmMwLjUs
+        MCwxLTAuNSwxLTF2LTRDMjgsMjAuNSwyNy41LDIwLDI3LDIweiBNOCwyNEg2di0yaDJWMjQgICB6IE0y
+        NywxMkg1Yy0wLjUsMC0xLDAuNS0xLDF2NGMwLDAuNSwwLjUsMSwxLDFoMjJjMC41LDAsMS0wLjUsMS0x
+        di00QzI4LDEyLjUsMjcuNSwxMiwyNywxMnogTTgsMTZINnYtMmgyVjE2eiBNMjcsNEg1ICAgQzQuNSw0
+        LDQsNC41LDQsNXY0YzAsMC41LDAuNSwxLDEsMWgyMmMwLjUsMCwxLTAuNSwxLTFWNUMyOCw0LjUsMjcu
+        NSw0LDI3LDR6IE04LDhINlY2aDJWOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
+</value>
+  </data>
 </root>

XdCxRhDW.X2D1TaskServer54/Program.cs → Service/X2D1TaskServer54/Program.cs

@@ -12,7 +12,7 @@ using System.Security.Principal;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace XdCxRhDW.X2D1TaskServer54
+namespace X2D1TaskServer54
 {
     internal static class Program
     {
@@ -117,7 +117,7 @@ namespace XdCxRhDW.X2D1TaskServer54
             }
             if (IsRunningAsAdmin())
             {
-                ChsLocalizer.UseChs();
+                XdCxRhDW.ChsLocalizer.UseChs();
                 MainForm mainForm = new MainForm();
                 System.Windows.Forms.Application.Run(mainForm);
             }

Service/X2D1TaskServer54/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("X2D1TaskServer54")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("X2D1TaskServer54")]
+[assembly: AssemblyCopyright("Copyright ©  2024")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("c1becb5b-a11e-4a10-988f-1056fe60e689")]
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
+//通过使用 "*"，如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Service/X2D1TaskServer54/Properties/Resources.Designer.cs

@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace X2D1TaskServer54.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   一个强类型的资源类，用于查找本地化的字符串等。
+    /// </summary>
+    // 此类是由 StronglyTypedResourceBuilder
+    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
+    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
+    // (以 /str 作为命令选项)，或重新生成 VS 项目。
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   返回此类使用的缓存的 ResourceManager 实例。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("X2D1TaskServer54.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   重写当前线程的 CurrentUICulture 属性，对
+        ///   使用此强类型资源类的所有资源查找执行重写。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}

XdCxRhDW.Sender/XtraForm1.resx → Service/X2D1TaskServer54/Properties/Resources.resx

@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,7 +60,6 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
@@ -69,10 +68,9 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
               <xsd:attribute name="type" type="xsd:string" />
               <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
@@ -87,10 +85,9 @@
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -112,9 +109,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>

Service/X2D1TaskServer54/Properties/Settings.Designer.cs

@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace X2D1TaskServer54.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}

Service/X2D1TaskServer54/Properties/Settings.settings

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>

XdCxRhDW.X2D1TaskServer54/Service/HistoryTaskService.cs → Service/X2D1TaskServer54/Service/HistoryTaskService.cs

@@ -9,7 +9,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using XdCxRhDW.Dto;
 
-namespace XdCxRhDW.X2D1TaskServer54.Service
+namespace X2D1TaskServer54.Service
 {
     //业务逻辑处理类
     public class HistoryTaskService

XdCxRhDW.X2D1TaskServer54/XdCxRhDW.X2D1TaskServer54.csproj → Service/X2D1TaskServer54/X2D1TaskServer54.csproj

@@ -34,11 +34,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>..\Service.ico</ApplicationIcon>
+    <ApplicationIcon>..\..\Service.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
-      <HintPath>..\packages\BouncyCastle.Cryptography.2.3.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+      <HintPath>..\..\packages\BouncyCastle.Cryptography.2.3.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Data.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -51,70 +51,70 @@
     <Reference Include="DevExpress.XtraLayout.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="Google.Protobuf, Version=3.26.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Protobuf.3.26.0\lib\net45\Google.Protobuf.dll</HintPath>
+      <HintPath>..\..\packages\Google.Protobuf.3.26.0\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
     <Reference Include="K4os.Compression.LZ4, Version=1.3.8.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Compression.LZ4.1.3.8\lib\net462\K4os.Compression.LZ4.dll</HintPath>
+      <HintPath>..\..\packages\K4os.Compression.LZ4.1.3.8\lib\net462\K4os.Compression.LZ4.dll</HintPath>
     </Reference>
     <Reference Include="K4os.Compression.LZ4.Streams, Version=1.3.8.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Compression.LZ4.Streams.1.3.8\lib\net462\K4os.Compression.LZ4.Streams.dll</HintPath>
+      <HintPath>..\..\packages\K4os.Compression.LZ4.Streams.1.3.8\lib\net462\K4os.Compression.LZ4.Streams.dll</HintPath>
     </Reference>
     <Reference Include="K4os.Hash.xxHash, Version=1.0.8.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll</HintPath>
+      <HintPath>..\..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data, Version=8.3.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.8.3.0\lib\net462\MySql.Data.dll</HintPath>
+      <HintPath>..\..\packages\MySql.Data.8.3.0\lib\net462\MySql.Data.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
     </Reference>
     <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.3.1.1\lib\net471\Serilog.dll</HintPath>
+      <HintPath>..\..\packages\Serilog.3.1.1\lib\net471\Serilog.dll</HintPath>
     </Reference>
     <Reference Include="Serilog.Sinks.Console, Version=5.0.1.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.Sinks.Console.5.0.1\lib\net471\Serilog.Sinks.Console.dll</HintPath>
+      <HintPath>..\..\packages\Serilog.Sinks.Console.5.0.1\lib\net471\Serilog.Sinks.Console.dll</HintPath>
     </Reference>
     <Reference Include="Serilog.Sinks.File, Version=5.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.Sinks.File.5.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
+      <HintPath>..\..\packages\Serilog.Sinks.File.5.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Configuration.ConfigurationManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
+      <HintPath>..\..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.8.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.8.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Pipelines, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Pipelines.8.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
+      <HintPath>..\..\packages\System.IO.Pipelines.8.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
     <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -125,28 +125,25 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Web.Http, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\System.Web.Http.dll</HintPath>
+      <HintPath>..\..\System.Web.Http.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="ZstdSharp, Version=0.7.6.0, Culture=neutral, PublicKeyToken=8d151af33a4ad5cf, processorArchitecture=MSIL">
-      <HintPath>..\packages\ZstdSharp.Port.0.7.6\lib\net462\ZstdSharp.dll</HintPath>
+      <HintPath>..\..\packages\ZstdSharp.Port.0.7.6\lib\net462\ZstdSharp.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\XdCxRhDW.App\DxHelper\MsgBoxHelper.cs">
+    <Compile Include="..\..\XdCxRhDW.App\DxHelper\MsgBoxHelper.cs">
       <Link>DxHelper\MsgBoxHelper.cs</Link>
     </Compile>
-    <Compile Include="..\XdCxRhDW.App\DxHelper\SvgHelper.cs">
+    <Compile Include="..\..\XdCxRhDW.App\DxHelper\SvgHelper.cs">
       <Link>DxHelper\SvgHelper.cs</Link>
     </Compile>
-    <Compile Include="..\XdCxRhDW.App\DxHelper\WaitHelper.cs">
-      <Link>DxHelper\WaitHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\XdCxRhDW.App\ExtensionsDev\GridControlEx.cs">
+    <Compile Include="..\..\XdCxRhDW.App\ExtensionsDev\GridControlEx.cs">
       <Link>DxHelper\GridControlEx.cs</Link>
     </Compile>
-    <Compile Include="..\XdCxRhDW.App\Localizer\ChsLocalizer.cs">
+    <Compile Include="..\..\XdCxRhDW.App\Localizer\ChsLocalizer.cs">
       <Link>DxHelper\ChsLocalizer.cs</Link>
     </Compile>
     <Compile Include="Controllers\HistoryTaskProcessingController.cs" />
@@ -190,15 +187,15 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\XdCxRhDw.Dto\02.XdCxRhDW.Dto.csproj">
+    <ProjectReference Include="..\..\XdCxRhDw.Dto\02.XdCxRhDW.Dto.csproj">
       <Project>{994f5945-4d73-40b4-a1d9-3e23a9fcd350}</Project>
       <Name>02.XdCxRhDW.Dto</Name>
     </ProjectReference>
-    <ProjectReference Include="..\XdCxRhDW.Framework\01.XdCxRhDW.Framework.csproj">
+    <ProjectReference Include="..\..\XdCxRhDW.Framework\01.XdCxRhDW.Framework.csproj">
       <Project>{cd41cedf-e0b8-41cc-867b-3b57f476b450}</Project>
       <Name>01.XdCxRhDW.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\XdCxRhDW.WebApi\05.XdCxRhDW.WebApi.csproj">
+    <ProjectReference Include="..\..\XdCxRhDW.WebApi\05.XdCxRhDW.WebApi.csproj">
       <Project>{652C29AC-65DE-466A-A964-8F1A2E657D86}</Project>
       <Name>05.XdCxRhDW.WebApi</Name>
     </ProjectReference>

Service/X2D1TaskServer54/packages.config

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="BouncyCastle.Cryptography" version="2.3.0" targetFramework="net472" />
+  <package id="Google.Protobuf" version="3.26.0" targetFramework="net472" />
+  <package id="K4os.Compression.LZ4" version="1.3.8" targetFramework="net472" />
+  <package id="K4os.Compression.LZ4.Streams" version="1.3.8" targetFramework="net472" />
+  <package id="K4os.Hash.xxHash" version="1.0.8" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.3.0" targetFramework="net472" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
+  <package id="MySql.Data" version="8.3.0" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
+  <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net472" />
+  <package id="Serilog" version="3.1.1" targetFramework="net472" />
+  <package id="Serilog.Sinks.Console" version="5.0.1" targetFramework="net472" />
+  <package id="Serilog.Sinks.File" version="5.0.0" targetFramework="net472" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
+  <package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net472" />
+  <package id="System.Diagnostics.DiagnosticSource" version="8.0.0" targetFramework="net472" />
+  <package id="System.IO.Pipelines" version="8.0.0" targetFramework="net472" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
+  <package id="ZstdSharp.Port" version="0.7.6" targetFramework="net472" />
+</packages>

XdCxRhDW.App/Controllers/PosController.cs

@@ -353,7 +353,8 @@ namespace XdCxRhDW.App.Controllers
                     MirrLat = res[4],
                     PosResType = EnumPosResType.X2D1,
                 };
-                posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
+                if (dto.TheoryDfoCalc)
+                    posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
                 posRes = db.PosRes.Add(posRes);
                 await db.SaveChangesAsync();
                 Messenger.Defalut.Pub("新增定位点", MapModel(posRes));
@@ -492,7 +493,8 @@ namespace XdCxRhDW.App.Controllers
                     MirrLat = res[4],
                     PosResType = EnumPosResType.X2D1,
                 };
-                posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
+                if (dto.TheoryDfoCalc)
+                    posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
                 posRes = db.PosRes.Add(posRes);
                 await db.SaveChangesAsync();
                 Messenger.Defalut.Pub("新增定位点", MapModel(posRes));
@@ -598,7 +600,8 @@ namespace XdCxRhDW.App.Controllers
                     MirrLat = res[4],
                     PosResType = EnumPosResType.X2D1NoRef,
                 };
-                posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
+                if (dto.TheoryDfoCalc)
+                    posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
                 posRes = db.PosRes.Add(posRes);
                 await db.SaveChangesAsync();
                 Messenger.Defalut.Pub("新增定位点", MapModel(posRes));
@@ -733,7 +736,8 @@ namespace XdCxRhDW.App.Controllers
                     MirrLat = res[4],
                     PosResType = EnumPosResType.X2D1NoRef,
                 };
-                posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
+                if (dto.TheoryDfoCalc)
+                    posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
                 posRes = db.PosRes.Add(posRes);
                 await db.SaveChangesAsync();
                 Messenger.Defalut.Pub("新增定位点", MapModel(posRes));
@@ -849,7 +853,8 @@ namespace XdCxRhDW.App.Controllers
                     MirrLat = res[4],
                     PosResType = EnumPosResType.RH,
                 };
-                posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
+                if (dto.TheoryDfoCalc)
+                    posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
                 posRes = db.PosRes.Add(posRes);
                 await db.SaveChangesAsync();
                 Messenger.Defalut.Pub("新增定位点", MapModel(posRes));
@@ -995,7 +1000,8 @@ namespace XdCxRhDW.App.Controllers
                     MirrLat = res[4],
                     PosResType = EnumPosResType.RH,
                 };
-                posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
+                if (dto.TheoryDfoCalc)
+                    posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
                 posRes = db.PosRes.Add(posRes);
                 await db.SaveChangesAsync();
                 Messenger.Defalut.Pub("新增定位点", MapModel(posRes));
@@ -1114,7 +1120,8 @@ namespace XdCxRhDW.App.Controllers
                     MirrLat = res[4],
                     PosResType = EnumPosResType.X3,
                 };
-                posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
+                if (dto.TheoryDfoCalc)
+                    posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
                 posRes = db.PosRes.Add(posRes);
                 await db.SaveChangesAsync();
                 Messenger.Defalut.Pub("新增定位点", MapModel(posRes));
@@ -1273,7 +1280,8 @@ namespace XdCxRhDW.App.Controllers
                     MirrLat = res[4],
                     PosResType = EnumPosResType.X3,
                 };
-                posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
+                if (dto.TheoryDfoCalc)
+                    posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
                 posRes = db.PosRes.Add(posRes);
                 await db.SaveChangesAsync();
                 Messenger.Defalut.Pub("新增定位点", MapModel(posRes));
@@ -1384,7 +1392,8 @@ namespace XdCxRhDW.App.Controllers
                     MirrLat = res[4],
                     PosResType = EnumPosResType.X3NoRef,
                 };
-                posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
+                if (dto.TheoryDfoCalc)
+                    posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
                 posRes = db.PosRes.Add(posRes);
                 await db.SaveChangesAsync();
                 Messenger.Defalut.Pub("新增定位点", MapModel(posRes));
@@ -1538,7 +1547,8 @@ namespace XdCxRhDW.App.Controllers
                     MirrLat = res[4],
                     PosResType = EnumPosResType.X3NoRef,
                 };
-                posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
+                if (dto.TheoryDfoCalc)
+                    posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
                 posRes = db.PosRes.Add(posRes);
                 await db.SaveChangesAsync();
                 Messenger.Defalut.Pub("新增定位点", MapModel(posRes));
@@ -1659,7 +1669,8 @@ namespace XdCxRhDW.App.Controllers
                     MirrLat = res[4],
                     PosResType = EnumPosResType.X3TwoDfo,
                 };
-                posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
+                if (dto.TheoryDfoCalc)
+                    posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
                 posRes = db.PosRes.Add(posRes);
                 await db.SaveChangesAsync();
                 Messenger.Defalut.Pub("新增定位点", MapModel(posRes));
@@ -1820,7 +1831,8 @@ namespace XdCxRhDW.App.Controllers
                     MirrLat = res[4],
                     PosResType = EnumPosResType.X3TwoDfo,
                 };
-                posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
+                if (dto.TheoryDfoCalc)
+                    posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
                 posRes = db.PosRes.Add(posRes);
                 await db.SaveChangesAsync();
                 Messenger.Defalut.Pub("新增定位点", MapModel(posRes));
@@ -1932,7 +1944,8 @@ namespace XdCxRhDW.App.Controllers
                     MirrLat = res[4],
                     PosResType = EnumPosResType.X2Dfo,
                 };
-                posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
+                if (dto.TheoryDfoCalc)
+                    posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
                 posRes = db.PosRes.Add(posRes);
                 await db.SaveChangesAsync();
                 Messenger.Defalut.Pub("新增定位点", MapModel(posRes));
@@ -2069,7 +2082,8 @@ namespace XdCxRhDW.App.Controllers
                     MirrLat = res[4],
                     PosResType = EnumPosResType.X2Dfo,
                 };
-                posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
+                if (dto.TheoryDfoCalc)
+                    posRes.TargetState = TheoryDtoDfoApi.TheoryDfo(cgRes, StationRes, posRes, settings.YDPZThreshold);
                 posRes = db.PosRes.Add(posRes);
                 await db.SaveChangesAsync();
                 Messenger.Defalut.Pub("新增定位点", MapModel(posRes));

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -509,7 +509,7 @@ namespace XdCxRhDW.App.UserControl
                         if (tsk.PosType == EnumPosType.X2D1)
                         {
                             //下发任务
-                            var svtItem = ServerContext.Instance.GetOne(EnumSvrType.X2D1HistoryTask);
+                            var svtItem = ServerContext.Instance.GetOne(EnumSvrType.X2D1NoRefHistoryTask);
                             if (svtItem == null)
                             {
                                 DxHelper.MsgBoxHelper.ShowWarning($"未找到注册的处理服务");
@@ -575,7 +575,7 @@ namespace XdCxRhDW.App.UserControl
                     if (tsk.TaskType == EnumTaskType.History)
                     {
                         //下发任务
-                        var svtItem = ServerContext.Instance.GetOne(EnumSvrType.X2D1HistoryTask);
+                        var svtItem = ServerContext.Instance.GetOne(EnumSvrType.X2D1NoRefHistoryTask);
                         if (svtItem == null)
                         {
                             DxHelper.MsgBoxHelper.ShowWarning($"未找到注册的处理服务");

XdCxRhDW.Framework/HttpHelper.cs

@@ -42,7 +42,6 @@ public class HttpHelper
     /// <summary>
     /// 
     /// </summary>
-    /// <typeparam name="T"></typeparam>
     /// <param name="url"></param>
     /// <param name="dto"></param>
     /// <param name="token"></param>
@@ -113,8 +112,8 @@ public class HttpHelper
     /// <param name="localFile"></param>
     /// <param name="uploadUrl"></param>
     /// <param name="timeoutSeconds"></param>
+    /// <param name="token"></param>
     /// <returns></returns>
-    /// <exception cref="Exception"></exception>
     public static async Task<string> UploadFileAsync(string localFile, string uploadUrl, int timeoutSeconds = 30, CancellationToken token = default)
     {
         try

XdCxRhDW.Sender/Form1.Designer.cs

@@ -72,17 +72,17 @@
             this.layoutControl1.Controls.Add(this.localPort1);
             this.layoutControl1.Controls.Add(this.txtAddr1);
             this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutControl1.Location = new System.Drawing.Point(77, 12);
+            this.layoutControl1.Location = new System.Drawing.Point(74, 12);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.Root = this.Root;
             this.tablePanel1.SetRow(this.layoutControl1, 0);
-            this.layoutControl1.Size = new System.Drawing.Size(537, 50);
+            this.layoutControl1.Size = new System.Drawing.Size(513, 50);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
             // txtTskType
             // 
-            this.txtTskType.Location = new System.Drawing.Point(328, 19);
+            this.txtTskType.Location = new System.Drawing.Point(314, 19);
             this.txtTskType.MenuManager = this.barManager1;
             this.txtTskType.Name = "txtTskType";
             this.txtTskType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -104,7 +104,7 @@
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem("三星双时差无参定位无星厉", "X3TwoDtoNoParNoXL", -1),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem("三星双频差定位无星厉", "X3TwoDfoNoXL", -1),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem("双星时频差定位无星厉", "X2DfoNoXL", -1)});
-            this.txtTskType.Size = new System.Drawing.Size(207, 20);
+            this.txtTskType.Size = new System.Drawing.Size(197, 20);
             this.txtTskType.StyleController = this.layoutControl1;
             this.txtTskType.TabIndex = 6;
             // 
@@ -170,11 +170,11 @@
             // 
             // localPort1
             // 
-            this.localPort1.Location = new System.Drawing.Point(210, 19);
+            this.localPort1.Location = new System.Drawing.Point(201, 19);
             this.localPort1.MenuManager = this.barManager1;
             this.localPort1.Name = "localPort1";
             this.localPort1.Properties.NullValuePrompt = "空值表示随机端口";
-            this.localPort1.Size = new System.Drawing.Size(114, 20);
+            this.localPort1.Size = new System.Drawing.Size(109, 20);
             this.localPort1.StyleController = this.layoutControl1;
             this.localPort1.TabIndex = 5;
             // 
@@ -184,7 +184,7 @@
             this.txtAddr1.Location = new System.Drawing.Point(2, 19);
             this.txtAddr1.Name = "txtAddr1";
             this.txtAddr1.Properties.NullValuePrompt = "127.0.0.1:16010";
-            this.txtAddr1.Size = new System.Drawing.Size(204, 20);
+            this.txtAddr1.Size = new System.Drawing.Size(195, 20);
             this.txtAddr1.StyleController = this.layoutControl1;
             this.txtAddr1.TabIndex = 4;
             // 
@@ -198,7 +198,7 @@
             this.layoutControlItem2});
             this.Root.Name = "Root";
             this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.Root.Size = new System.Drawing.Size(537, 50);
+            this.Root.Size = new System.Drawing.Size(513, 50);
             this.Root.Text = "星地时频差";
             this.Root.TextVisible = false;
             // 
@@ -208,7 +208,7 @@
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.MinSize = new System.Drawing.Size(112, 41);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(208, 50);
+            this.layoutControlItem1.Size = new System.Drawing.Size(199, 50);
             this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem1.Text = "推送地址";
             this.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
@@ -217,10 +217,10 @@
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.localPort1;
-            this.layoutControlItem7.Location = new System.Drawing.Point(208, 0);
+            this.layoutControlItem7.Location = new System.Drawing.Point(199, 0);
             this.layoutControlItem7.MinSize = new System.Drawing.Size(54, 44);
             this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(118, 50);
+            this.layoutControlItem7.Size = new System.Drawing.Size(113, 50);
             this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem7.Text = "本地端口";
             this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
@@ -229,9 +229,9 @@
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txtTskType;
-            this.layoutControlItem2.Location = new System.Drawing.Point(326, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(312, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(211, 50);
+            this.layoutControlItem2.Size = new System.Drawing.Size(201, 50);
             this.layoutControlItem2.Text = "定位类型";
             this.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem2.TextSize = new System.Drawing.Size(48, 14);
@@ -259,11 +259,11 @@
             // btn1
             // 
             this.tablePanel1.SetColumn(this.btn1, 2);
-            this.btn1.Location = new System.Drawing.Point(619, 36);
-            this.btn1.Margin = new System.Windows.Forms.Padding(3, 22, 3, 3);
+            this.btn1.Location = new System.Drawing.Point(592, 33);
+            this.btn1.Margin = new System.Windows.Forms.Padding(3, 17, 3, 3);
             this.btn1.Name = "btn1";
             this.tablePanel1.SetRow(this.btn1, 0);
-            this.btn1.Size = new System.Drawing.Size(50, 21);
+            this.btn1.Size = new System.Drawing.Size(80, 21);
             this.btn1.TabIndex = 4;
             this.btn1.Text = "推送";
             this.btn1.Click += new System.EventHandler(this.btn1_Click);

XdCxRhDW.Sender/UserControl1.Designer.cs

@@ -1,65 +0,0 @@
-namespace XdCxRhDW.Sender
-{
-    partial class UserControl1
-    {
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要修改
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.mapControl1 = new DevExpress.XtraMap.MapControl();
-            this.wmsDataProvider1 = new DevExpress.XtraMap.WmsDataProvider();
-            this.imageLayer1 = new DevExpress.XtraMap.ImageLayer();
-            ((System.ComponentModel.ISupportInitialize)(this.mapControl1)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // mapControl1
-            // 
-            this.mapControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.mapControl1.Layers.Add(this.imageLayer1);
-            this.mapControl1.Location = new System.Drawing.Point(0, 0);
-            this.mapControl1.Name = "mapControl1";
-            this.mapControl1.Size = new System.Drawing.Size(750, 354);
-            this.mapControl1.TabIndex = 0;
-            this.imageLayer1.DataProvider = this.wmsDataProvider1;
-            // 
-            // UserControl1
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.mapControl1);
-            this.Name = "UserControl1";
-            this.Size = new System.Drawing.Size(750, 354);
-            ((System.ComponentModel.ISupportInitialize)(this.mapControl1)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DevExpress.XtraMap.MapControl mapControl1;
-        private DevExpress.XtraMap.ImageLayer imageLayer1;
-        private DevExpress.XtraMap.WmsDataProvider wmsDataProvider1;
-    }
-}

XdCxRhDW.Sender/UserControl1.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace XdCxRhDW.Sender
-{
-    public partial class UserControl1 : UserControl
-    {
-        public UserControl1()
-        {
-            InitializeComponent();
-        }
-    }
-}

XdCxRhDW.Sender/XdCxRhDW.Sender.csproj

@@ -37,24 +37,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />
-    <Reference Include="DevExpress.BonusSkins.v23.2" />
-    <Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Data.Desktop.v23.2" />
     <Reference Include="DevExpress.Data.v23.2" />
-    <Reference Include="DevExpress.Map.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Utils.v23.2" />
-    <Reference Include="DevExpress.Sparkline.v23.2.Core" />
-    <Reference Include="DevExpress.Utils.v23.2.UI, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraCharts.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraCharts.v23.2.UI, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraCharts.v23.2.Wizard, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraEditors.v23.2" />
     <Reference Include="DevExpress.Printing.v23.2.Core" />
     <Reference Include="DevExpress.Drawing.v23.2" />
     <Reference Include="DevExpress.XtraLayout.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraMap.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
@@ -96,18 +86,6 @@
     <Compile Include="IniFiles.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UserControl1.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UserControl1.Designer.cs">
-      <DependentUpon>UserControl1.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XtraForm1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XtraForm1.Designer.cs">
-      <DependentUpon>XtraForm1.cs</DependentUpon>
-    </Compile>
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
@@ -122,12 +100,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <EmbeddedResource Include="UserControl1.resx">
-      <DependentUpon>UserControl1.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XtraForm1.resx">
-      <DependentUpon>XtraForm1.cs</DependentUpon>
-    </EmbeddedResource>
     <None Include="App.config" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">

XdCxRhDW.Sender/XtraForm1.Designer.cs

@@ -1,63 +0,0 @@
-namespace XdCxRhDW.Sender
-{
-    partial class XtraForm1
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.pictureEdit1 = new DevExpress.XtraEditors.PictureEdit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureEdit1.Properties)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // pictureEdit1
-            // 
-            this.pictureEdit1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureEdit1.Location = new System.Drawing.Point(0, 0);
-            this.pictureEdit1.Name = "pictureEdit1";
-            this.pictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.Auto;
-            this.pictureEdit1.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Zoom;
-            this.pictureEdit1.Size = new System.Drawing.Size(969, 443);
-            this.pictureEdit1.TabIndex = 0;
-            // 
-            // XtraForm1
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(969, 443);
-            this.Controls.Add(this.pictureEdit1);
-            this.Name = "XtraForm1";
-            this.Text = "XtraForm1";
-            this.Load += new System.EventHandler(this.XtraForm1_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.pictureEdit1.Properties)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DevExpress.XtraEditors.PictureEdit pictureEdit1;
-    }
-}

XdCxRhDW.Sender/XtraForm1.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
-
-namespace XdCxRhDW.Sender
-{
-    public partial class XtraForm1 : DevExpress.XtraEditors.XtraForm
-    {
-        public XtraForm1()
-        {
-            InitializeComponent();
-        }
-
-        private void XtraForm1_Load(object sender, EventArgs e)
-        {
-            Bitmap bmp = new Bitmap(1024, 768);
-            for (int x = 0; x < 1024; x++)
-            {
-                for (int y = 0; y < 768; y++)
-                {
-                    var rgbb = ColorRGB.GetSpecColor(x/1023d);
-                    int r = rgbb.R;
-                    int g = rgbb.G;
-                    int b = rgbb.B;
-                    Color c = Color.FromArgb(r, g, b);
-                    bmp.SetPixel(x, y, c);
-                }
-            }
-            this.pictureEdit1.Image = bmp;
-        }
-    }
-}

XdCxRhDW.WebApi/Startup.cs

@@ -441,18 +441,21 @@ namespace XdCxRhDW.WebApi
                 var props = type.GetProperties();
                 foreach (var prop in props)
                 {
-                    var propScheama = schema.properties[prop.Name];
-                    if (prop.PropertyType.IsClass && prop.PropertyType != typeof(string))
+                    if (schema.properties.ContainsKey(prop.Name))
                     {
-                        UpdateSchemaDescription(propScheama, prop.PropertyType);
-                    }
-                    else
-                    {
-                        if (prop.PropertyType.IsEnum)
+                        var propScheama = schema.properties[prop.Name];
+                        if (prop.PropertyType.IsClass && prop.PropertyType != typeof(string))
                         {
-                            var description = GetEnumInfo(prop.PropertyType);
-                            propScheama.description = string.IsNullOrWhiteSpace(propScheama.description) ? description : $"{propScheama.description}:{description}";
-                            propScheama.@enum = null;
+                            UpdateSchemaDescription(propScheama, prop.PropertyType);
+                        }
+                        else
+                        {
+                            if (prop.PropertyType.IsEnum)
+                            {
+                                var description = GetEnumInfo(prop.PropertyType);
+                                propScheama.description = string.IsNullOrWhiteSpace(propScheama.description) ? description : $"{propScheama.description}:{description}";
+                                propScheama.@enum = null;
+                            }
                         }
                     }
                 }

XdCxRhDW.sln

@@ -21,9 +21,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "03.XdCxRhDW.Entity", "XdCxR
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Serevice", "Serevice", "{3EB6F47A-A57D-4468-B4BE-3A63E13B692D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XdCxRhDW.X2D1TaskServer", "XdCxRhDW.X2D1TaskServer\XdCxRhDW.X2D1TaskServer.csproj", "{C1BECB5B-A11E-4A10-988F-1056FE60E689}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CpuCgServer", "Service\CpuCheckCgServer\CpuCgServer.csproj", "{993D7982-3BB0-4339-ADD8-10D0C422FA5A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XdCxRhDW.X2D1TaskServer54", "XdCxRhDW.X2D1TaskServer54\XdCxRhDW.X2D1TaskServer54.csproj", "{31871C1B-8855-4FE4-A549-DB5506C7BE0B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "X2D1NoRefTaskServer", "Service\X2D1NoRefTaskServer\X2D1NoRefTaskServer.csproj", "{C1BECB5B-A11E-4A10-988F-1056FE60E689}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "X2D1TaskServer54", "Service\X2D1TaskServer54\X2D1TaskServer54.csproj", "{31871C1B-8855-4FE4-A549-DB5506C7BE0B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -63,6 +65,10 @@ Global
 		{068C649C-81A7-4BE1-A74C-D5745959D0EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{068C649C-81A7-4BE1-A74C-D5745959D0EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{068C649C-81A7-4BE1-A74C-D5745959D0EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{993D7982-3BB0-4339-ADD8-10D0C422FA5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{993D7982-3BB0-4339-ADD8-10D0C422FA5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{993D7982-3BB0-4339-ADD8-10D0C422FA5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{993D7982-3BB0-4339-ADD8-10D0C422FA5A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C1BECB5B-A11E-4A10-988F-1056FE60E689}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C1BECB5B-A11E-4A10-988F-1056FE60E689}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C1BECB5B-A11E-4A10-988F-1056FE60E689}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -76,6 +82,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{993D7982-3BB0-4339-ADD8-10D0C422FA5A} = {3EB6F47A-A57D-4468-B4BE-3A63E13B692D}
 		{C1BECB5B-A11E-4A10-988F-1056FE60E689} = {3EB6F47A-A57D-4468-B4BE-3A63E13B692D}
 		{31871C1B-8855-4FE4-A549-DB5506C7BE0B} = {3EB6F47A-A57D-4468-B4BE-3A63E13B692D}
 	EndGlobalSection

XdCxRhDw.Dto/PosDto/RHNoParPosDto.cs

@@ -50,7 +50,7 @@ namespace XdCxRhDW.Dto
         public double SxSnr { get; set; }
 
         /// <summary>
-        /// 目标星地时差(us)
+        /// 目标主星超短时差(us)
         /// </summary>
         public double XdDto { get; set; }
 
@@ -120,6 +120,12 @@ namespace XdCxRhDW.Dto
         /// 检测结果(可空)
         /// </summary>
         public CheckResDto CheckRes { get; set; }
+
+        /// <summary>
+        /// 是否计算理论频差
+        /// </summary>
+        [Obsolete]
+        public bool TheoryDfoCalc { get; set; } = true;
     }
 
 }

XdCxRhDw.Dto/PosDto/RHNoXlNoParPosDto.cs

@@ -55,7 +55,7 @@ namespace XdCxRhDW.Dto
         public double SxSnr { get; set; }
 
         /// <summary>
-        /// 目标星地时差(us)
+        /// 目标主星超短时差(us)
         /// </summary>
         public double XdDto { get; set; }
 
@@ -96,6 +96,11 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public CheckResDto CheckRes { get; set; }
 
+        /// <summary>
+        /// 是否计算理论频差
+        /// </summary>
+        [Obsolete]
+        public bool TheoryDfoCalc { get; set; } = true;
     }
 
 }

XdCxRhDw.Dto/PosDto/RHNoXlPosDto.cs

@@ -52,7 +52,7 @@ namespace XdCxRhDW.Dto
         public double? SxSnr { get; set; }
 
         /// <summary>
-        /// 目标星地时差(us)
+        /// 目标主星超短时差(us)
         /// </summary>
         public double XdDto { get; set; }
 
@@ -145,5 +145,11 @@ namespace XdCxRhDW.Dto
         /// 检测结果(可空)
         /// </summary>
         public CheckResDto CheckRes { get; set; }
+
+        /// <summary>
+        /// 是否计算理论频差
+        /// </summary>
+        [Obsolete]
+        public bool TheoryDfoCalc { get; set; } = true;
     }
 }

XdCxRhDw.Dto/PosDto/RHPosDto.cs

@@ -52,7 +52,7 @@ namespace XdCxRhDW.Dto
         public double? SxSnr { get; set; }
 
         /// <summary>
-        /// 目标星地时差(us)
+        /// 目标主星超短时差(us)
         /// </summary>
         public double XdDto { get; set; }
 
@@ -175,6 +175,12 @@ namespace XdCxRhDW.Dto
         /// 检测结果(可空)
         /// </summary>
         public CheckResDto CheckRes { get; set; }
+
+        /// <summary>
+        /// 是否计算理论频差
+        /// </summary>
+        [Obsolete]
+        public bool TheoryDfoCalc { get; set; } = true;
     }
 
 }

XdCxRhDw.Dto/PosDto/X1D1NoParPosDto.cs

@@ -29,7 +29,7 @@ namespace XdCxRhDW.Dto
         public int MainCode { get; set; }
 
         /// <summary>
-        /// 目标星地时差(us)
+        /// 目标主星超短时差(us)
         /// </summary>
         public double XdDto { get; set; }
 

XdCxRhDw.Dto/PosDto/X1D1NoXlNoParPosDto.cs

@@ -29,7 +29,7 @@ namespace XdCxRhDW.Dto
         public int MainCode { get; set; }
 
         /// <summary>
-        /// 目标星地时差(us)
+        /// 目标主星超短时差(us)
         /// </summary>
         public double XdDto { get; set; }
 

XdCxRhDw.Dto/PosDto/X1D1NoXlPosDto.cs

@@ -30,7 +30,7 @@ namespace XdCxRhDW.Dto
         public int MainCode { get; set; }
 
         /// <summary>
-        /// 目标星地时差(us)
+        /// 目标主星超短时差(us)
         /// </summary>
         public double XdDto { get; set; }
 

XdCxRhDw.Dto/PosDto/X1D1PosDto.cs

@@ -29,7 +29,7 @@ namespace XdCxRhDW.Dto
         public int MainCode { get; set; }
 
         /// <summary>
-        /// 目标星地时差(us)
+        /// 目标主星超短时差(us)
         /// </summary>
         public double XdDto { get; set; }
 

XdCxRhDw.Dto/PosDto/X2D1NoParPosDto.cs

@@ -52,7 +52,7 @@ namespace XdCxRhDW.Dto
         public double? SxSnr { get; set; }
 
         /// <summary>
-        /// 目标星地时差(us)
+        /// 目标主星超短时差(us)
         /// </summary>
         public double XdDto { get; set; }
 
@@ -166,6 +166,12 @@ namespace XdCxRhDW.Dto
         /// 检测结果(可空)
         /// </summary>
         public CheckResDto CheckRes { get; set; }
+
+        /// <summary>
+        /// 是否计算理论频差
+        /// </summary>
+        [Obsolete]
+        public bool TheoryDfoCalc { get; set; } = true;
     }
 
 }

XdCxRhDw.Dto/PosDto/X2D1NoXlNoParlPosDto.cs

@@ -52,7 +52,7 @@ namespace XdCxRhDW.Dto
         public double? SxSnr { get; set; }
 
         /// <summary>
-        /// 目标星地时差(us)
+        /// 目标主星超短时差(us)
         /// </summary>
         public double XdDto { get; set; }
 
@@ -107,6 +107,12 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public CheckResDto CheckRes { get; set; }
 
+        /// <summary>
+        /// 是否计算理论频差
+        /// </summary>
+        [Obsolete]
+        public bool TheoryDfoCalc { get; set; } = true;
+
     }
 
 }

XdCxRhDw.Dto/PosDto/X2D1NoXlPosDto.cs

@@ -53,7 +53,7 @@ namespace XdCxRhDW.Dto
         public double? SxSnr { get; set; }
 
         /// <summary>
-        /// 目标星地时差(us)
+        /// 目标主星超短时差(us)
         /// </summary>
         public double XdDto { get; set; }
 
@@ -130,5 +130,11 @@ namespace XdCxRhDW.Dto
         /// 检测结果(可空)
         /// </summary>
         public CheckResDto CheckRes { get; set; }
+
+        /// <summary>
+        /// 是否计算理论频差
+        /// </summary>
+        [Obsolete]
+        public bool TheoryDfoCalc { get; set; } = true;
     }
 }

XdCxRhDw.Dto/PosDto/X2D1PosDto.cs

@@ -52,7 +52,7 @@ namespace XdCxRhDW.Dto
         public double? SxSnr { get; set; }
 
         /// <summary>
-        /// 目标星地时差(us)
+        /// 目标主星超短时差(us)
         /// </summary>
         public double XdDto { get; set; }
 
@@ -188,6 +188,12 @@ namespace XdCxRhDW.Dto
         /// 检测结果(可空)
         /// </summary>
         public CheckResDto CheckRes { get; set; }
+
+        /// <summary>
+        /// 是否计算理论频差
+        /// </summary>
+        [Obsolete]
+        public bool TheoryDfoCalc { get; set; } = true;
     }
 
 }

XdCxRhDw.Dto/PosDto/X2DtoDfoNoXlPosDto.cs

@@ -125,6 +125,12 @@ namespace XdCxRhDW.Dto
         /// 检测结果(可空)
         /// </summary>
         public CheckResDto CheckRes { get; set; }
+
+        /// <summary>
+        /// 是否计算理论频差
+        /// </summary>
+        [Obsolete]
+        public bool TheoryDfoCalc { get; set; } = true;
     }
 
 }

XdCxRhDw.Dto/PosDto/X2DtoDfoPosDto.cs

@@ -185,6 +185,12 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public CheckResDto CheckRes { get; set; }
 
+        /// <summary>
+        /// 是否计算理论频差
+        /// </summary>
+        [Obsolete]
+        public bool TheoryDfoCalc { get; set; } = true;
+
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDfoNoXlPosDto.cs

@@ -142,6 +142,12 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public CheckResDto CheckRes { get; set; }
 
+        /// <summary>
+        /// 是否计算理论频差
+        /// </summary>
+        [Obsolete]
+        public bool TheoryDfoCalc { get; set; } = true;
+
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDfoPosDto.cs

@@ -229,6 +229,12 @@ namespace XdCxRhDW.Dto
         /// 检测结果(可空)
         /// </summary>
         public CheckResDto CheckRes { get; set; }
+
+        /// <summary>
+        /// 是否计算理论频差
+        /// </summary>
+        [Obsolete]
+        public bool TheoryDfoCalc { get; set; } = true;
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDtoNoParPosDto.cs

@@ -191,6 +191,12 @@ namespace XdCxRhDW.Dto
         /// 检测结果(可空)
         /// </summary>
         public CheckResDto CheckRes { get; set; }
+
+        /// <summary>
+        /// 是否计算理论频差
+        /// </summary>
+        [Obsolete]
+        public bool TheoryDfoCalc { get; set; } = true;
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDtoNoXlNoParPosDto.cs

@@ -101,6 +101,12 @@ namespace XdCxRhDW.Dto
         /// 检测结果(可空)
         /// </summary>
         public CheckResDto CheckRes { get; set; }
+
+        /// <summary>
+        /// 是否计算理论频差
+        /// </summary>
+        [Obsolete]
+        public bool TheoryDfoCalc { get; set; } = true;
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDtoNoXlPosDto.cs

@@ -129,6 +129,12 @@ namespace XdCxRhDW.Dto
         /// </summary>
         public CheckResDto CheckRes { get; set; }
 
+        /// <summary>
+        /// 是否计算理论频差
+        /// </summary>
+        [Obsolete]
+        public bool TheoryDfoCalc { get; set; } = true;
+
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDtoPosDto.cs

@@ -218,6 +218,12 @@ namespace XdCxRhDW.Dto
         /// 检测结果(可空)
         /// </summary>
         public CheckResDto CheckRes { get; set; }
+
+        /// <summary>
+        /// 是否计算理论频差
+        /// </summary>
+        [Obsolete]
+        public bool TheoryDfoCalc { get; set; } = true;
     }
 
 }

XdCxRhDw.Dto/SvrStateDto.cs

@@ -45,15 +45,16 @@ namespace XdCxRhDW.Dto
     public enum EnumSvrType
     {
         /// <summary>
-        /// 两星一地离线数据处理服务
+        /// 两星一地无参离线数据处理服务
         /// </summary>
-        [Display(Name ="两星一地离线数据处理服务")]
-        X2D1HistoryTask,
+        [Display(Name = "两星一地无参离线数据处理服务")]
+        X2D1NoRefHistoryTask,
 
         /// <summary>
-        /// 三星离线数据处理服务
+        /// 三星无参离线数据处理服务
         /// </summary>
-        [Display(Name = "三星离线数据处理服务")]
-        X3HistoryTask,
+        [Display(Name = "三星无参离线数据处理服务")]
+        X3NoRefHistoryTask,
+
     }
 }