11

XdCxRhDW.App/Controllers/PosController.cs

@@ -14,6 +14,7 @@ using XdCxRhDW.Entity;
 using XdCxRhDW.Api;
 using XdCxRhDw.Dto;
 using XdCxRhDW.WebApi;
+using DPP_YH_Core.Extensions;
 
 namespace XdCxRhDW.App.Controllers
 {
@@ -68,6 +69,21 @@ namespace XdCxRhDW.App.Controllers
                     RefLon = dto.RefLon,
                     RefLat = dto.RefLat,
                 });
+                CheckRes CheckRes = null;
+                if (dto.CheckRes != null)
+                {
+                    //var CheckRes = db.CheckRes.Add(dto.CheckRes.MapTo<Entity.CheckRes>());
+                    CheckRes cres = new CheckRes();
+                    cres.SigTime = dto.CheckRes.SigTime;
+                    cres.FileName = dto.CheckRes.FileName;
+                    cres.StartSamp = dto.CheckRes.StartSamp;
+                    cres.SampCount = dto.CheckRes.SampCount;
+                    if (dto.CheckRes.DetectionWay.HasValue)
+                        cres.DetectionWay = (EnumDetectionWay)dto.CheckRes.DetectionWay;
+                    else
+                        cres.DetectionWay = null;
+                    CheckRes = db.CheckRes.Add(cres);
+                }
 
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
@@ -94,6 +110,7 @@ namespace XdCxRhDW.App.Controllers
 
                 var res = PosApi.X1D1_Pos(cgRes, StationRes, cxRes);
 
+                long? checkResId = null;
                 PosRes posRes = new PosRes()
                 {
                     FreqUpHz = (long)cgRes.TarFreqUp.Value,
@@ -101,6 +118,7 @@ namespace XdCxRhDW.App.Controllers
                     TaskInfoID = runTask.ID,
                     CxResID = cxRes.ID,
                     CgResID = cgRes.ID,
+                    CheckResID = CheckRes == null ? checkResId : CheckRes.ID,
                     TarName = string.IsNullOrWhiteSpace(dto.TarName) ? "未知目标" : dto.TarName,
                     TsName = dto.TsName,
                     PosLon = res[0],
@@ -177,6 +195,21 @@ namespace XdCxRhDW.App.Controllers
                     RefLat = dto.RefLat,
                 });
 
+                CheckRes CheckRes = null;
+                if (dto.CheckRes != null)
+                {
+                    CheckRes cres = new CheckRes();
+                    cres.SigTime = dto.CheckRes.SigTime;
+                    cres.FileName = dto.CheckRes.FileName;
+                    cres.StartSamp = dto.CheckRes.StartSamp;
+                    cres.SampCount = dto.CheckRes.SampCount;
+                    if (dto.CheckRes.DetectionWay.HasValue)
+                        cres.DetectionWay = (EnumDetectionWay)dto.CheckRes.DetectionWay;
+                    else
+                        cres.DetectionWay = null;
+                    CheckRes = db.CheckRes.Add(cres);
+                }
+
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
@@ -205,6 +238,7 @@ namespace XdCxRhDW.App.Controllers
 
                 var res = PosApi.X1D1_Pos(cgRes, StationRes, cxRes);
 
+                long? checkResId = null;
                 PosRes posRes = new PosRes()
                 {
                     FreqUpHz = (long)cgRes.TarFreqUp.Value,
@@ -212,6 +246,7 @@ namespace XdCxRhDW.App.Controllers
                     TaskInfoID = runTask.ID,
                     CgResID = cgRes.ID,
                     CxResID = cxRes.ID,
+                    CheckResID = CheckRes == null ? checkResId : CheckRes.ID,
                     TarName = string.IsNullOrWhiteSpace(dto.TarName) ? "未知目标" : dto.TarName,
                     TsName = dto.TsName,
                     PosLon = res[0],
@@ -274,6 +309,21 @@ namespace XdCxRhDW.App.Controllers
                     RefLat = dto.RefLat,
                 });
 
+                CheckRes CheckRes = null;
+                if (dto.CheckRes != null)
+                {
+                    CheckRes cres = new CheckRes();
+                    cres.SigTime = dto.CheckRes.SigTime;
+                    cres.FileName = dto.CheckRes.FileName;
+                    cres.StartSamp = dto.CheckRes.StartSamp;
+                    cres.SampCount = dto.CheckRes.SampCount;
+                    if (dto.CheckRes.DetectionWay.HasValue)
+                        cres.DetectionWay = (EnumDetectionWay)dto.CheckRes.DetectionWay;
+                    else
+                        cres.DetectionWay = null;
+                    CheckRes = db.CheckRes.Add(cres);
+                }
+
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
@@ -307,12 +357,14 @@ namespace XdCxRhDW.App.Controllers
 
                 var res = PosApi.X2D1_Pos(cgRes, StationRes);
 
+                long? checkResId = null;
                 PosRes posRes = new PosRes()
                 {
                     FreqUpHz = (long)cgRes.TarFreqUp.Value,
                     SigTime = cgRes.SigTime,
                     TaskInfoID = runTask.ID,
                     CgResID = cgRes.ID,
+                     CheckResID = CheckRes == null ? checkResId : CheckRes.ID,
                     TarName = string.IsNullOrWhiteSpace(dto.TarName) ? "未知目标" : dto.TarName,
                     TsName = dto.TsName,
                     PosLon = res[0],
@@ -402,6 +454,21 @@ namespace XdCxRhDW.App.Controllers
                     RefLat = dto.RefLat,
                 });
 
+                CheckRes CheckRes = null;
+                if (dto.CheckRes != null)
+                {
+                    CheckRes cres = new CheckRes();
+                    cres.SigTime = dto.CheckRes.SigTime;
+                    cres.FileName = dto.CheckRes.FileName;
+                    cres.StartSamp = dto.CheckRes.StartSamp;
+                    cres.SampCount = dto.CheckRes.SampCount;
+                    if (dto.CheckRes.DetectionWay.HasValue)
+                        cres.DetectionWay = (EnumDetectionWay)dto.CheckRes.DetectionWay;
+                    else
+                        cres.DetectionWay = null;
+                    CheckRes = db.CheckRes.Add(cres);
+                }
+
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
@@ -435,12 +502,14 @@ namespace XdCxRhDW.App.Controllers
 
                 var res = PosApi.X2D1_Pos(cgRes, StationRes);
 
+                long? checkResId = null;
                 PosRes posRes = new PosRes()
                 {
                     FreqUpHz = (long)cgRes.TarFreqUp.Value,
                     SigTime = dto.SigTime,
                     TaskInfoID = runTask.ID,
                     CgResID = cgRes.ID,
+                     CheckResID = CheckRes == null ? checkResId : CheckRes.ID,
                     TarName = string.IsNullOrWhiteSpace(dto.TarName) ? "未知目标" : dto.TarName,
                     TsName = dto.TsName,
                     PosLon = res[0],
@@ -499,6 +568,22 @@ namespace XdCxRhDW.App.Controllers
                     CdbTxLon = dto.CdbTxLon,
                     CdbTxLat = dto.CdbTxLat,
                 });
+
+                CheckRes CheckRes = null;
+                if (dto.CheckRes != null)
+                {
+                    CheckRes cres = new CheckRes();
+                    cres.SigTime = dto.CheckRes.SigTime;
+                    cres.FileName = dto.CheckRes.FileName;
+                    cres.StartSamp = dto.CheckRes.StartSamp;
+                    cres.SampCount = dto.CheckRes.SampCount;
+                    if (dto.CheckRes.DetectionWay.HasValue)
+                        cres.DetectionWay = (EnumDetectionWay)dto.CheckRes.DetectionWay;
+                    else
+                        cres.DetectionWay = null;
+                    CheckRes = db.CheckRes.Add(cres);
+                }
+
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
@@ -528,12 +613,15 @@ namespace XdCxRhDW.App.Controllers
                     TarFreqDown = dto.FreqDown,
                 });
                 var res = PosApi.X2D1_PosNoRef(cgRes, StationRes);
+
+                long? checkResId = null;
                 PosRes posRes = new PosRes()
                 {
                     FreqUpHz = (long)cgRes.TarFreqUp.Value,
                     SigTime = cgRes.SigTime,
                     TaskInfoID = runTask.ID,
                     CgResID = cgRes.ID,
+                     CheckResID = CheckRes == null ? checkResId : CheckRes.ID,
                     TarName = string.IsNullOrWhiteSpace(dto.TarName) ? "未知目标" : dto.TarName,
                     TsName = dto.TsName,
                     PosLon = res[0],
@@ -621,6 +709,21 @@ namespace XdCxRhDW.App.Controllers
                     CdbTxLat = dto.CdbTxLat,
                 });
 
+                CheckRes CheckRes = null;
+                if (dto.CheckRes != null)
+                {
+                    CheckRes cres = new CheckRes();
+                    cres.SigTime = dto.CheckRes.SigTime;
+                    cres.FileName = dto.CheckRes.FileName;
+                    cres.StartSamp = dto.CheckRes.StartSamp;
+                    cres.SampCount = dto.CheckRes.SampCount;
+                    if (dto.CheckRes.DetectionWay.HasValue)
+                        cres.DetectionWay = (EnumDetectionWay)dto.CheckRes.DetectionWay;
+                    else
+                        cres.DetectionWay = null;
+                    CheckRes = db.CheckRes.Add(cres);
+                }
+
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
@@ -652,12 +755,14 @@ namespace XdCxRhDW.App.Controllers
 
                 var res = PosApi.X2D1_PosNoRef(cgRes, StationRes);
 
+                long? checkResId = null;
                 PosRes posRes = new PosRes()
                 {
                     FreqUpHz = (long)cgRes.TarFreqUp.Value,
                     SigTime = dto.SigTime,
                     TaskInfoID = runTask.ID,
                     CgResID = cgRes.ID,
+                     CheckResID = CheckRes == null ? checkResId : CheckRes.ID,
                     TarName = string.IsNullOrWhiteSpace(dto.TarName) ? "未知目标" : dto.TarName,
                     TsName = dto.TsName,
                     PosLon = res[0],
@@ -723,6 +828,21 @@ namespace XdCxRhDW.App.Controllers
                     RefLat = dto.RefLat,
                 });
 
+                CheckRes CheckRes = null;
+                if (dto.CheckRes != null)
+                {
+                    CheckRes cres = new CheckRes();
+                    cres.SigTime = dto.CheckRes.SigTime;
+                    cres.FileName = dto.CheckRes.FileName;
+                    cres.StartSamp = dto.CheckRes.StartSamp;
+                    cres.SampCount = dto.CheckRes.SampCount;
+                    if (dto.CheckRes.DetectionWay.HasValue)
+                        cres.DetectionWay = (EnumDetectionWay)dto.CheckRes.DetectionWay;
+                    else
+                        cres.DetectionWay = null;
+                    CheckRes = db.CheckRes.Add(cres);
+                }
+
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
@@ -756,6 +876,7 @@ namespace XdCxRhDW.App.Controllers
 
                 var res = PosApi.RH_Pos(cgRes, StationRes, cxRes);
 
+                long? checkResId = null;
                 PosRes posRes = new PosRes()
                 {
                     FreqUpHz = (long)cgRes.TarFreqUp.Value,
@@ -763,6 +884,7 @@ namespace XdCxRhDW.App.Controllers
                     TaskInfoID = runTask.ID,
                     CxResID = cxRes.ID,
                     CgResID = cgRes.ID,
+                     CheckResID = CheckRes == null ? checkResId : CheckRes.ID,
                     TarName = string.IsNullOrWhiteSpace(dto.TarName) ? "未知目标" : dto.TarName,
                     TsName = dto.TsName,
                     PosLon = res[0],
@@ -853,6 +975,22 @@ namespace XdCxRhDW.App.Controllers
                     RefLon = dto.RefLon,
                     RefLat = dto.RefLat,
                 });
+
+                CheckRes CheckRes = null;
+                if (dto.CheckRes != null)
+                {
+                    CheckRes cres = new CheckRes();
+                    cres.SigTime = dto.CheckRes.SigTime;
+                    cres.FileName = dto.CheckRes.FileName;
+                    cres.StartSamp = dto.CheckRes.StartSamp;
+                    cres.SampCount = dto.CheckRes.SampCount;
+                    if (dto.CheckRes.DetectionWay.HasValue)
+                        cres.DetectionWay = (EnumDetectionWay)dto.CheckRes.DetectionWay;
+                    else
+                        cres.DetectionWay = null;
+                    CheckRes = db.CheckRes.Add(cres);
+                }
+
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
@@ -889,6 +1027,8 @@ namespace XdCxRhDW.App.Controllers
                     Fx = dto.CxRes,
                 });
                 var res = PosApi.RH_Pos(cgRes, StationRes, cxRes);
+
+                long? checkResId = null;
                 PosRes posRes = new PosRes()
                 {
                     FreqUpHz = (long)cgRes.TarFreqUp.Value,
@@ -896,6 +1036,7 @@ namespace XdCxRhDW.App.Controllers
                     TaskInfoID = runTask.ID,
                     CxResID = cxRes.ID,
                     CgResID = cgRes.ID,
+                     CheckResID = CheckRes == null ? checkResId : CheckRes.ID,
                     TarName = string.IsNullOrWhiteSpace(dto.TarName) ? "未知目标" : dto.TarName,
                     TsName = dto.TsName,
                     PosLon = res[0],
@@ -957,6 +1098,21 @@ namespace XdCxRhDW.App.Controllers
                     RefLat = dto.RefLat,
                 });
 
+                CheckRes CheckRes = null;
+                if (dto.CheckRes != null)
+                {
+                    CheckRes cres = new CheckRes();
+                    cres.SigTime = dto.CheckRes.SigTime;
+                    cres.FileName = dto.CheckRes.FileName;
+                    cres.StartSamp = dto.CheckRes.StartSamp;
+                    cres.SampCount = dto.CheckRes.SampCount;
+                    if (dto.CheckRes.DetectionWay.HasValue)
+                        cres.DetectionWay = (EnumDetectionWay)dto.CheckRes.DetectionWay;
+                    else
+                        cres.DetectionWay = null;
+                    CheckRes = db.CheckRes.Add(cres);
+                }
+
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
@@ -998,12 +1154,14 @@ namespace XdCxRhDW.App.Controllers
 
                 var res = PosApi.X3_Pos(cgRes, StationRes);
 
+                long? checkResId = null;
                 PosRes posRes = new PosRes()
                 {
                     FreqUpHz = (long)cgRes.TarFreqUp.Value,
                     SigTime = cgRes.SigTime,
                     TaskInfoID = runTask.ID,
                     CgResID = cgRes.ID,
+                     CheckResID = CheckRes == null ? checkResId : CheckRes.ID,
                     TarName = string.IsNullOrWhiteSpace(dto.TarName) ? "未知目标" : dto.TarName,
                     TsName = dto.TsName,
                     PosLon = res[0],
@@ -1105,6 +1263,21 @@ namespace XdCxRhDW.App.Controllers
                     RefLat = dto.RefLat,
                 });
 
+                CheckRes CheckRes = null;
+                if (dto.CheckRes != null)
+                {
+                    CheckRes cres = new CheckRes();
+                    cres.SigTime = dto.CheckRes.SigTime;
+                    cres.FileName = dto.CheckRes.FileName;
+                    cres.StartSamp = dto.CheckRes.StartSamp;
+                    cres.SampCount = dto.CheckRes.SampCount;
+                    if (dto.CheckRes.DetectionWay.HasValue)
+                        cres.DetectionWay = (EnumDetectionWay)dto.CheckRes.DetectionWay;
+                    else
+                        cres.DetectionWay = null;
+                    CheckRes = db.CheckRes.Add(cres);
+                }
+
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
@@ -1146,12 +1319,14 @@ namespace XdCxRhDW.App.Controllers
 
                 var res = PosApi.X3_Pos(cgRes, StationRes);
 
+                long? checkResId = null;
                 PosRes posRes = new PosRes()
                 {
                     FreqUpHz = (long)cgRes.TarFreqUp.Value,
                     SigTime = dto.SigTime,
                     TaskInfoID = runTask.ID,
                     CgResID = cgRes.ID,
+                     CheckResID = CheckRes == null ? checkResId : CheckRes.ID,
                     TarName = string.IsNullOrWhiteSpace(dto.TarName) ? "未知目标" : dto.TarName,
                     TsName = dto.TsName,
                     PosLon = res[0],
@@ -1209,6 +1384,21 @@ namespace XdCxRhDW.App.Controllers
                     SatTxLat = dto.SatTxLat,
                 });
 
+                CheckRes CheckRes = null;
+                if (dto.CheckRes != null)
+                {
+                    CheckRes cres = new CheckRes();
+                    cres.SigTime = dto.CheckRes.SigTime;
+                    cres.FileName = dto.CheckRes.FileName;
+                    cres.StartSamp = dto.CheckRes.StartSamp;
+                    cres.SampCount = dto.CheckRes.SampCount;
+                    if (dto.CheckRes.DetectionWay.HasValue)
+                        cres.DetectionWay = (EnumDetectionWay)dto.CheckRes.DetectionWay;
+                    else
+                        cres.DetectionWay = null;
+                    CheckRes = db.CheckRes.Add(cres);
+                }
+
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
@@ -1247,12 +1437,14 @@ namespace XdCxRhDW.App.Controllers
 
                 var res = PosApi.X3_PosNoRef(cgRes, StationRes);
 
+                long? checkResId = null;
                 PosRes posRes = new PosRes()
                 {
                     FreqUpHz = (long)cgRes.TarFreqUp.Value,
                     SigTime = cgRes.SigTime,
                     TaskInfoID = runTask.ID,
                     CgResID = cgRes.ID,
+                     CheckResID = CheckRes == null ? checkResId : CheckRes.ID,
                     TarName = string.IsNullOrWhiteSpace(dto.TarName) ? "未知目标" : dto.TarName,
                     TsName = dto.TsName,
                     PosLon = res[0],
@@ -1352,6 +1544,21 @@ namespace XdCxRhDW.App.Controllers
                     SatTxLat = dto.SatTxLat,
                 });
 
+                CheckRes CheckRes = null;
+                if (dto.CheckRes != null)
+                {
+                    CheckRes cres = new CheckRes();
+                    cres.SigTime = dto.CheckRes.SigTime;
+                    cres.FileName = dto.CheckRes.FileName;
+                    cres.StartSamp = dto.CheckRes.StartSamp;
+                    cres.SampCount = dto.CheckRes.SampCount;
+                    if (dto.CheckRes.DetectionWay.HasValue)
+                        cres.DetectionWay = (EnumDetectionWay)dto.CheckRes.DetectionWay;
+                    else
+                        cres.DetectionWay = null;
+                    CheckRes = db.CheckRes.Add(cres);
+                }
+
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
@@ -1390,12 +1597,14 @@ namespace XdCxRhDW.App.Controllers
 
                 var res = PosApi.X3_PosNoRef(cgRes, StationRes);
 
+                long? checkResId = null;
                 PosRes posRes = new PosRes()
                 {
                     FreqUpHz = (long)cgRes.TarFreqUp.Value,
                     SigTime = dto.SigTime,
                     TaskInfoID = runTask.ID,
                     CgResID = cgRes.ID,
+                     CheckResID = CheckRes == null ? checkResId : CheckRes.ID,
                     TarName = string.IsNullOrWhiteSpace(dto.TarName) ? "未知目标" : dto.TarName,
                     TsName = dto.TsName,
                     PosLon = res[0],
@@ -1457,6 +1666,21 @@ namespace XdCxRhDW.App.Controllers
                     RefLat = dto.RefLat,
                 });
 
+                CheckRes CheckRes = null;
+                if (dto.CheckRes != null)
+                {
+                    CheckRes cres = new CheckRes();
+                    cres.SigTime = dto.CheckRes.SigTime;
+                    cres.FileName = dto.CheckRes.FileName;
+                    cres.StartSamp = dto.CheckRes.StartSamp;
+                    cres.SampCount = dto.CheckRes.SampCount;
+                    if (dto.CheckRes.DetectionWay.HasValue)
+                        cres.DetectionWay = (EnumDetectionWay)dto.CheckRes.DetectionWay;
+                    else
+                        cres.DetectionWay = null;
+                    CheckRes = db.CheckRes.Add(cres);
+                }
+
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
@@ -1500,12 +1724,14 @@ namespace XdCxRhDW.App.Controllers
 
                 var res = PosApi.X3_PosTwoDfo(cgRes, StationRes);
 
+                long? checkResId = null;
                 PosRes posRes = new PosRes()
                 {
                     FreqUpHz = (long)cgRes.TarFreqUp.Value,
                     SigTime = cgRes.SigTime,
                     TaskInfoID = runTask.ID,
                     CgResID = cgRes.ID,
+                     CheckResID = CheckRes == null ? checkResId : CheckRes.ID,
                     TarName = string.IsNullOrWhiteSpace(dto.TarName) ? "未知目标" : dto.TarName,
                     TsName = dto.TsName,
                     PosLon = res[0],
@@ -1607,6 +1833,21 @@ namespace XdCxRhDW.App.Controllers
                     RefLat = dto.RefLat,
                 });
 
+                CheckRes CheckRes = null;
+                if (dto.CheckRes != null)
+                {
+                    CheckRes cres = new CheckRes();
+                    cres.SigTime = dto.CheckRes.SigTime;
+                    cres.FileName = dto.CheckRes.FileName;
+                    cres.StartSamp = dto.CheckRes.StartSamp;
+                    cres.SampCount = dto.CheckRes.SampCount;
+                    if (dto.CheckRes.DetectionWay.HasValue)
+                        cres.DetectionWay = (EnumDetectionWay)dto.CheckRes.DetectionWay;
+                    else
+                        cres.DetectionWay = null;
+                    CheckRes = db.CheckRes.Add(cres);
+                }
+
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
@@ -1650,12 +1891,14 @@ namespace XdCxRhDW.App.Controllers
 
                 var res = PosApi.X3_PosTwoDfo(cgRes, StationRes);
 
+                long? checkResId = null;
                 PosRes posRes = new PosRes()
                 {
                     FreqUpHz = (long)cgRes.TarFreqUp.Value,
                     SigTime = dto.SigTime,
                     TaskInfoID = runTask.ID,
                     CgResID = cgRes.ID,
+                     CheckResID = CheckRes == null ? checkResId : CheckRes.ID,
                     TarName = string.IsNullOrWhiteSpace(dto.TarName) ? "未知目标" : dto.TarName,
                     TsName = dto.TsName,
                     PosLon = res[0],
@@ -1717,6 +1960,21 @@ namespace XdCxRhDW.App.Controllers
                     RefLat = dto.RefLat,
                 });
 
+                CheckRes CheckRes = null;
+                if (dto.CheckRes != null)
+                {
+                    CheckRes cres = new CheckRes();
+                    cres.SigTime = dto.CheckRes.SigTime;
+                    cres.FileName = dto.CheckRes.FileName;
+                    cres.StartSamp = dto.CheckRes.StartSamp;
+                    cres.SampCount = dto.CheckRes.SampCount;
+                    if (dto.CheckRes.DetectionWay.HasValue)
+                        cres.DetectionWay = (EnumDetectionWay)dto.CheckRes.DetectionWay;
+                    else
+                        cres.DetectionWay = null;
+                    CheckRes = db.CheckRes.Add(cres);
+                }
+
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
@@ -1751,12 +2009,14 @@ namespace XdCxRhDW.App.Controllers
 
                 var res = PosApi.X2_PosDtoDfo(cgRes, StationRes);
 
+                long? checkResId = null;
                 PosRes posRes = new PosRes()
                 {
                     FreqUpHz = (long)cgRes.TarFreqUp.Value,
                     SigTime = cgRes.SigTime,
                     TaskInfoID = runTask.ID,
                     CgResID = cgRes.ID,
+                     CheckResID = CheckRes == null ? checkResId : CheckRes.ID,
                     TarName = string.IsNullOrWhiteSpace(dto.TarName) ? "未知目标" : dto.TarName,
                     TsName = dto.TsName,
                     PosLon = res[0],
@@ -1844,6 +2104,21 @@ namespace XdCxRhDW.App.Controllers
                     RefLat = dto.RefLat,
                 });
 
+                CheckRes CheckRes = null;
+                if (dto.CheckRes != null)
+                {
+                    CheckRes cres = new CheckRes();
+                    cres.SigTime = dto.CheckRes.SigTime;
+                    cres.FileName = dto.CheckRes.FileName;
+                    cres.StartSamp = dto.CheckRes.StartSamp;
+                    cres.SampCount = dto.CheckRes.SampCount;
+                    if (dto.CheckRes.DetectionWay.HasValue)
+                        cres.DetectionWay = (EnumDetectionWay)dto.CheckRes.DetectionWay;
+                    else
+                        cres.DetectionWay = null;
+                    CheckRes = db.CheckRes.Add(cres);
+                }
+
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
@@ -1877,13 +2152,14 @@ namespace XdCxRhDW.App.Controllers
                 });
 
                 var res = PosApi.X2_PosDtoDfo(cgRes, StationRes);
-
+                long? checkResId = null;
                 PosRes posRes = new PosRes()
                 {
                     FreqUpHz = (long)cgRes.TarFreqUp.Value,
                     SigTime = dto.SigTime,
                     TaskInfoID = runTask.ID,
                     CgResID = cgRes.ID,
+                    CheckResID = CheckRes == null ? checkResId : CheckRes.ID,
                     TarName = string.IsNullOrWhiteSpace(dto.TarName) ? "未知目标" : dto.TarName,
                     TsName = dto.TsName,
                     PosLon = res[0],

XdCxRhDW.Entity/CheckRes.cs

@@ -15,7 +15,7 @@ namespace XdCxRhDW.Entity
         public DateTime SigTime { get; set; }
 
         [Display(Name = "文件名称")]
-        public double FileName { get; set; }
+        public string FileName { get; set; }
 
         [Display(Name = "开始样点")]
         public long StartSamp { get; set; }
@@ -24,6 +24,6 @@ namespace XdCxRhDW.Entity
         public long SampCount { get; set; }
 
         [Display(Name ="检测类型")]
-        public EnumDetectionWay DetectionWay { get; set; }
+        public EnumDetectionWay? DetectionWay { get; set; }
     }
 }

XdCxRhDW.Entity/PosRes.cs

@@ -88,5 +88,8 @@ namespace XdCxRhDW.Entity
 
         [Display(Name = "检测结果")]
         public long? CheckResID { get; set; }
+
+        [Display(AutoGenerateField = false)]
+        public virtual CheckRes CheckRes { get; set; }
     }
 }

XdCxRhDW.Repostory/EFContext/RHDWContext.cs

@@ -104,7 +104,7 @@ namespace XdCxRhDW.Repostory
         public DbSet<CgRes> CgRes { get; set; }
         public DbSet<CgXgfRes> CgXgfRes { get; set; }
         public DbSet<PosRes> PosRes { get; set; }
-
+        public DbSet<CheckRes> CheckRes { get; set; }
     }
 
 

XdCxRhDW.Sender/Form1.cs

@@ -45,11 +45,11 @@ namespace XdCxRhDW.Sender
                     string tskType = txtTskType.EditValue.ToString();
                     await Task.Run(async () =>
                     {
-                        while (true)
-                        {
-                            if (cts1.IsCancellationRequested)
-                                break;
-                            using (var client = new HttpClient())
+                    //while (true)
+                    //{
+                    //    if (cts1.IsCancellationRequested)
+                    //        break;
+                        using (var client = new HttpClient())
                             {
                                 try
                                 {
@@ -64,7 +64,15 @@ namespace XdCxRhDW.Sender
                                             if (cts1.IsCancellationRequested) break;
                                             if (string.IsNullOrWhiteSpace(line)) continue;
                                             var items = line.Split(" ".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
-                                            X1D1PosDto dto = new X1D1PosDto()
+                                        CheckResDto checkResDto = new CheckResDto()
+                                        {
+                                            SigTime = DateTime.Now,
+                                            FileName = "test",
+                                            StartSamp = 1,
+                                            SampCount = 2,
+                                            DetectionWay = DmcTypeDto.DAMA| DmcTypeDto.Ky5758,
+                                        };
+                                        X1D1PosDto dto = new X1D1PosDto()
                                             {
                                                 SigTime = DateTime.Now,
                                                 MainCode = 23467,
@@ -86,6 +94,7 @@ namespace XdCxRhDW.Sender
                                                 CxLat = IniFiles.ReadValue<double>("Station_Data2023.ini", "侧向站", "Lat"),
                                                 RefLon = IniFiles.ReadValue<double>("Station_Data2023.ini", "参考站", "Lon"),
                                                 RefLat = IniFiles.ReadValue<double>("Station_Data2023.ini", "参考站", "Lat"),
+                                                CheckRes= checkResDto
                                             };
                                             var result = await HttpHelper.PostRequestAsync<PosResDto>(url, dto);
                                             if (result.code != 200)
@@ -93,7 +102,7 @@ namespace XdCxRhDW.Sender
                                                 Log($"{result.msg}");
                                                 return;
                                             }
-                                            Thread.Sleep(1000);
+                                           // Thread.Sleep(1000);
                                             Log($"已向[{txtAddr1.Text}]发送第{idx++}条仿真结果");
                                         }
                                     }
@@ -460,8 +469,8 @@ namespace XdCxRhDW.Sender
                                     Log($"向[{txtAddr1.Text}]发送结果失败.{ex.Message}");
                                 }
                             }
-                            await Task.Delay(1000);
-                        }
+                        //    await Task.Delay(1000);
+                        //}
                     });
                 }
                 catch (Exception ex)

XdCxRhDw.Dto/02.XdCxRhDW.Dto.csproj

@@ -58,6 +58,7 @@
     <Compile Include="DetectResDto.cs" />
     <Compile Include="CpuCgResDto.cs" />
     <Compile Include="FileUploadResDto.cs" />
+    <Compile Include="PosDto\CheckResDto.cs" />
     <Compile Include="PosDto\RHNoXlPosDto.cs" />
     <Compile Include="PosDto\RHNoXlNoParPosDto.cs" />
     <Compile Include="PosDto\RHNoParPosDto.cs" />

XdCxRhDw.Dto/PosDto/CheckResDto.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XdCxRhDW.Dto
+{
+   
+    public class CheckResDto 
+    {
+        [Display(Name = "信号时刻")]
+        public DateTime SigTime { get; set; }
+
+        [Display(Name = "文件名称")]
+        public string FileName { get; set; }
+
+        [Display(Name = "开始样点")]
+        public long StartSamp { get; set; }
+
+        [Display(Name = "样点长度")]
+        public long SampCount { get; set; }
+
+        [Display(Name ="检测类型")]
+        public DmcTypeDto? DetectionWay { get; set; }
+    }
+}

XdCxRhDw.Dto/PosDto/RHNoXlPosDto.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -149,5 +150,11 @@ namespace XdCxRhDW.Dto
         /// </summary>
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
+
+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        [Display(AutoGenerateField = false)]
+        public CheckResDto CheckRes { get; set; } = null;
     }
 }

XdCxRhDw.Dto/PosDto/RHPosDto.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -179,6 +180,12 @@ namespace XdCxRhDW.Dto
         /// </summary>
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
+
+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        [Display(AutoGenerateField = false)]
+        public CheckResDto CheckRes { get; set; } = null;
     }
 
 }

XdCxRhDw.Dto/PosDto/X1D1NoXlPosDto.cs

@@ -123,5 +123,11 @@ namespace XdCxRhDW.Dto
         /// </summary>
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
+
+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        [Display(AutoGenerateField = false)]
+        public CheckResDto CheckRes { get; set; } = null;
     }
 }

XdCxRhDw.Dto/PosDto/X1D1PosDto.cs

@@ -137,6 +137,12 @@ namespace XdCxRhDW.Dto
         /// </summary>
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
+
+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        [Display(AutoGenerateField = false)]
+        public CheckResDto CheckRes { get; set; } = null;
     }
 
 }

XdCxRhDw.Dto/PosDto/X2D1NoParPosDto.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -170,6 +171,12 @@ namespace XdCxRhDW.Dto
         /// </summary>
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double CdbTxLat { get; set; }
+
+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        [Display(AutoGenerateField = false)]
+        public CheckResDto CheckRes { get; set; } = null;
     }
 
 }

XdCxRhDw.Dto/PosDto/X2D1NoXlNoParlPosDto.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -111,6 +112,12 @@ namespace XdCxRhDW.Dto
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double CdbTxLat { get; set; }
 
+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        [Display(AutoGenerateField = false)]
+        public CheckResDto CheckRes { get; set; } = null;
+
     }
 
 }

XdCxRhDw.Dto/PosDto/X2D1NoXlPosDto.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -134,5 +135,11 @@ namespace XdCxRhDW.Dto
         /// </summary>
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
+
+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        [Display(AutoGenerateField = false)]
+        public CheckResDto CheckRes { get; set; } = null;
     }
 }

XdCxRhDw.Dto/PosDto/X2D1PosDto.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -193,6 +194,11 @@ namespace XdCxRhDW.Dto
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
 
+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        [Display(AutoGenerateField = false)]
+        public CheckResDto CheckRes { get; set; } = null;
     }
 
 }

XdCxRhDw.Dto/PosDto/X2DtoDfoNoXlPosDto.cs

@@ -130,6 +130,12 @@ namespace XdCxRhDW.Dto
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
 
+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        [Display(AutoGenerateField = false)]
+        public CheckResDto CheckRes { get; set; } = null;
+
     }
 
 }

XdCxRhDw.Dto/PosDto/X2DtoDfoPosDto.cs

@@ -190,6 +190,12 @@ namespace XdCxRhDW.Dto
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
 
+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        [Display(AutoGenerateField = false)]
+        public CheckResDto CheckRes { get; set; } = null;
+
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDfoNoXlPosDto.cs

@@ -147,6 +147,12 @@ namespace XdCxRhDW.Dto
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
 
+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        [Display(AutoGenerateField = false)]
+        public CheckResDto CheckRes { get; set; } = null;
+
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDfoPosDto.cs

@@ -234,6 +234,12 @@ namespace XdCxRhDW.Dto
         /// </summary>
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
+
+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        [Display(AutoGenerateField = false)]
+        public CheckResDto CheckRes { get; set; } = null;
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDtoNoParPosDto.cs

@@ -197,6 +197,11 @@ namespace XdCxRhDW.Dto
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        [Display(AutoGenerateField = false)]
+        public CheckResDto CheckRes { get; set; } = null;
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDtoNoXlNoParPosDto.cs

@@ -107,6 +107,11 @@ namespace XdCxRhDW.Dto
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double SatTxLat { get; set; }
 
+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        [Display(AutoGenerateField = false)]
+        public CheckResDto CheckRes { get; set; } = null;
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDtoNoXlPosDto.cs

@@ -134,6 +134,12 @@ namespace XdCxRhDW.Dto
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
 
+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        [Display(AutoGenerateField = false)]
+        public CheckResDto CheckRes { get; set; } = null;
+
     }
 
 }

XdCxRhDw.Dto/PosDto/X3TwoDtoPosDto.cs

@@ -223,6 +223,12 @@ namespace XdCxRhDW.Dto
         /// </summary>
         [RangeDouble(-90, 90, IncludeMin = true)]
         public double RefLat { get; set; }
+
+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        [Display(AutoGenerateField = false)]
+        public CheckResDto CheckRes { get; set; } = null;
     }
 
 }