111

Service/X3LeoTaskServer54/Service/TaskService.cs

@@ -354,7 +354,7 @@ namespace X3LeoTaskServer54.Service
                 var errResRsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(baseUrl + "Ellipse/X3TwoDtoNoRef", dto);
                 if (errResRsp.code != 200)
                 {
-                    //await LogHelper.Error(errResRsp.msg);
+                    await LogHelper.Error(errResRsp.msg);
                 }
                 else
                 {

Service/X3TaskServer54/Service/TaskService.cs

@@ -333,7 +333,7 @@ namespace X3TaskServer54.Service
                                                     var errResRsp = await HttpHelper.PostRequestAsync<ErrEllipseResDto>(baseUrl + "Ellipse/X3TwoDtoNoRef", errDto);
                                                     if (errResRsp.code != 200)
                                                     {
-                                                        //await LogHelper.Error(errResRsp.msg);
+                                                        await LogHelper.Error(errResRsp.msg);
                                                     }
                                                     else
                                                     {

XdCxRhDW.Api/AddIns/GDOP误差椭圆/ErrEllipseHepler.cs

@@ -84,7 +84,7 @@ namespace XdCxRhDW.Api
         /// <param name="Pe">0.5</param>
         /// <param name="LOP_Len"></param>
         /// <returns></returns>
-        [DllImport(ErrellipDll, EntryPoint = "Error_Ellipse_3X_2DTO", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport(ErrellipDll, EntryPoint = "Error_Ellipse_3X_NoRef", CallingConvention = CallingConvention.Cdecl)]
         private extern static IntPtr Error_Ellipse_3X_2DTONoRef(double[] main_eph, double[] neigh_eph1, double[] neigh_eph2, double[] Select_Point, double dto_err,
         double eph_err, double Pe, ref int LOP_Len);
 

XdCxRhDW.App/Controllers/EllipseController.cs

@@ -137,21 +137,15 @@ namespace XdCxRhDW.App.Controllers
         /// <returns></returns>
         public async Task<AjaxResult<ErrEllipseResDto>> X3TwoDtoNoRef(ErrEllipseX3NoRefDto dto)
         {
-#warning 三星双时差误差椭圆缺少无参的算法
             return await Task.Run(() =>
             {
-                return Error<ErrEllipseResDto>("三星双时差误差椭圆缺少无参的算法");
+                double[] mainEcef = new double[3] { dto.MainX, dto.MainY, dto.MainZ };
+                double[] adja1Ecef = new double[3] { dto.Adja1X, dto.Adja1Y, dto.Adja1Z };
+                double[] adja2Ecef = new double[3] { dto.Adja2X, dto.Adja2Y, dto.Adja2Z };
+                var res = ErrEllipseHepler.ErrorEllipseX3NoRef(dto.PosLon, dto.PosLat, mainEcef, adja1Ecef, adja2Ecef,
+                     dto.DtoErrus, dto.EphErr, dto.OutputErrPoint, dto.Pe);
+                return Success(res);
             });
-
-            //return await Task.Run(() =>
-            //{
-            //    double[] mainEcef = new double[3] { dto.MainX, dto.MainY, dto.MainZ };
-            //    double[] adja1Ecef = new double[3] { dto.Adja1X, dto.Adja1Y, dto.Adja1Z };
-            //    double[] adja2Ecef = new double[3] { dto.Adja2X, dto.Adja2Y, dto.Adja2Z };
-            //    var res = ErrEllipseHepler.ErrorEllipseX3NoRef(dto.PosLon, dto.PosLat, mainEcef, adja1Ecef, adja2Ecef,
-            //         dto.DtoErrus, dto.EphErr, dto.OutputErrPoint, dto.Pe);
-            //    return Success(res);
-            //});
         }
     }
 }