zoule 5 months ago
parent
commit
86acc3c2e4

+ 3 - 3
DW5S.App/CorTools/XlCalculateForm.cs

@@ -34,8 +34,8 @@ namespace DW5S.App.CorTools
         {
             InitializeComponent();
             this.itemTle.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
-            var list1 = unitOfWork.Reps<SatInfo>().GetAllAsync(p => p.SatCode).Result;
-            var repsXl = unitOfWork.Reps<XlInfo>() as XlRepository;
+            var list1 = unitOfWork.Of<SatInfo>().GetAllAsync(p => p.SatCode).Result;
+            var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
             var list2 = repsXl.GetAllSat().Result;//所有卫星
             list2.RemoveAll(p => list1.Select(t => t.SatCode).Contains(p.SatCode));
             list2.InsertRange(0, list1);
@@ -113,7 +113,7 @@ namespace DW5S.App.CorTools
             listEph.Clear();
             try
             {
-                var repsXl = unitOfWork.Reps<XlInfo>() as XlRepository;
+                var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
                 if (!string.IsNullOrEmpty(txtEndTime.Text) && !string.IsNullOrEmpty(txtSpanSeconds.Text))
                 {
                     var XlCalcMultDto = new XlCalcMultDto()

+ 2 - 2
DW5S.App/EditForms/FixedStationEditor.cs

@@ -43,10 +43,10 @@ namespace DW5S.App.EditForms
         private async void SatEditor_Load(object sender, EventArgs e)
         {
             infos = new List<FixedStation>();
-            var repsFixed = unitOfWork.Reps<FixedStation>();
+            var repsFixed = unitOfWork.Of<FixedStation>();
             var res = await repsFixed.GetAllAsync();
             infos.AddRange(res);
-            var repsSig = unitOfWork.Reps<SigInfo>();
+            var repsSig = unitOfWork.Of<SigInfo>();
            var sigs = await repsSig.GetAllAsync();
             this.txtFreqUp.UseDefault().SetData(sigs, nameof(SigInfo.FreqUpDis)).UseDoubleClickToSelectAll();
             if (this.Text == "固定站编辑" && info != null)

+ 2 - 2
DW5S.App/EditForms/SatEditor.cs

@@ -43,7 +43,7 @@ namespace DW5S.App.EditForms
         }
         private async void SatEditor_Load(object sender, EventArgs e)
         {
-            var repsXl = unitOfWork.Reps<XlInfo>() as XlRepository;
+            var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
             var listXl = await repsXl.GetAllSat();
             this.searchLookUpEdit1.UseDefault().SetData(listXl, nameof(XlInfo.Sat)).UseDoubleClickToSelectAll();
             if (this.Text == "编辑卫星" && info != null)
@@ -55,7 +55,7 @@ namespace DW5S.App.EditForms
             }
 
             infos = new List<SatInfo>();
-            var res = await unitOfWork.Reps<SatInfo>().GetAllAsync();
+            var res = await unitOfWork.Of<SatInfo>().GetAllAsync();
             infos.AddRange(res);
         }
 

+ 2 - 2
DW5S.App/EditForms/SigDelayEditor.cs

@@ -47,7 +47,7 @@ namespace DW5S.App.EditForms
         }
         private async void SatEditor_Load(object sender, EventArgs e)
         {
-            var repsSat = unitOfWork.Reps<SatInfo>();
+            var repsSat = unitOfWork.Of<SatInfo>();
             var sats = await repsSat.GetAllAsync();
             this.txtSat.UseDefault().SetData(sats, nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
             if (this.Text == "编辑转发延迟" && info != null)
@@ -78,7 +78,7 @@ namespace DW5S.App.EditForms
                 }
                 var satInfo = (SatInfo)txtSat.EditValue;
 
-                var repsSigDelay = unitOfWork.Reps<SigDelay>();
+                var repsSigDelay = unitOfWork.Of<SigDelay>();
 
                 var list = await repsSigDelay.FindAsync(w => w.SigInfoId == sigId);
                 if (list.Where(w => w.Id != info.Id).Any(a => a.SatInfoSatCode == satInfo.SatCode))

+ 1 - 1
DW5S.App/EditForms/SigEditor.cs

@@ -62,7 +62,7 @@ namespace DW5S.App.EditForms
                 }
             }
             infos = new List<SigInfo>();
-            var repsSig = unitOfWork.Reps<SigInfo>();
+            var repsSig = unitOfWork.Of<SigInfo>();
             var res = await repsSig.GetAllAsync();
             infos.AddRange(res);
         }

+ 3 - 3
DW5S.App/EditForms/TaskEditor.cs

@@ -70,7 +70,7 @@ namespace DW5S.App.EditForms
 
         private async void TaskEditor_Load(object sender, EventArgs e)
         {
-            var repsSat = unitOfWork.Reps<SatInfo>();
+            var repsSat = unitOfWork.Of<SatInfo>();
             var sats = await repsSat.GetAllAsync();
             this.txtMainSat.UseDefault().SetData(sats, nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
             this.txtAdja1Sat.UseDefault().SetData(sats, nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
@@ -110,7 +110,7 @@ namespace DW5S.App.EditForms
 
                 if (this.Text == "添加任务")
                 {
-                    var repsTask = unitOfWork.Reps<TaskInfo>();
+                    var repsTask = unitOfWork.Of<TaskInfo>();
                     if (await repsTask.FirstOrDefaultAsync(p => p.TaskName == txtTaskName.Text) != null)
                     {
                         dxErrorProvider.SetError(txtTaskName, "任务名称重复");
@@ -119,7 +119,7 @@ namespace DW5S.App.EditForms
                 }
                 else
                 {
-                    var repsTask = unitOfWork.Reps<TaskInfo>();
+                    var repsTask = unitOfWork.Of<TaskInfo>();
                     if (await repsTask.FirstOrDefaultAsync(p => p.Id != info.Id && p.TaskName == txtTaskName.Text) != null)
                     {
                         dxErrorProvider.SetError(txtTaskName, "任务名称重复");

+ 2 - 2
DW5S.App/EditForms/TaskEditorSignal.cs

@@ -63,10 +63,10 @@ namespace DW5S.App.EditForms
             try
             {
                 gridTaskSignal.UseDefault(listSigInfo).UseMultiSelect().UseRowNumber().DrawGridColumnHeaderCheckBox();
-               var repsFixed= unitOfWork.Reps<FixedStation>();
+               var repsFixed= unitOfWork.Of<FixedStation>();
                 var fixedStations = await repsFixed.FindAsync(p => p.Enable);
 
-                var repsSig = unitOfWork.Reps<SigInfo>();
+                var repsSig = unitOfWork.Of<SigInfo>();
                 var items = await repsSig.GetAllAsync(p => p.FreqUp);
                 listSigInfo.AddRange(items);
                 foreach (var item in listSigInfo)

+ 1 - 1
DW5S.App/EditForms/X3DfoParamEditor.cs

@@ -287,7 +287,7 @@ namespace DW5S.App.EditForms
             var sigTime = this.sigTime.DateTime;
             try
             {
-                var repsXl = unitOfWork.Reps<XlInfo>() as XlRepository;
+                var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
 
                 var xlInfo = await repsXl.GetLatestAsync(cg.MainCode.Value, sigTime);
                 if (xlInfo == null)

+ 26 - 26
DW5S.App/UserControl/CtrlHome.cs

@@ -73,7 +73,7 @@ namespace DW5S.App.UserControl
                 var find = list.FirstOrDefault(p => p.Id == id);
                 if (find == null) return;
 
-                var repsTask = unitOfWork.Reps<TaskInfo>();
+                var repsTask = unitOfWork.Of<TaskInfo>();
                 var item = await repsTask.FirstOrDefaultAsync(p => p.Id == id);
                 if (item == null) return;
                 find.TaskState = item.TaskState;
@@ -133,7 +133,7 @@ namespace DW5S.App.UserControl
             {
                 mapControl1.UseCluster();
             }
-            var settings = await unitOfWork.Reps<SysSetings>().FirstOrDefaultAsync();
+            var settings = await unitOfWork.Of<SysSetings>().FirstOrDefaultAsync();
             if (settings == null)
             {
                 mapControl1.UseLocalDb();
@@ -145,7 +145,7 @@ namespace DW5S.App.UserControl
             try
             {
                 List<TxInfo> txList = new List<TxInfo>();
-                var repsTask = unitOfWork.Reps<TaskInfo>();
+                var repsTask = unitOfWork.Of<TaskInfo>();
                 var items = await repsTask.GetAllAsync(p => p.UpdateTime, false);
                 list.AddRange(items);
                 var runningList = items.Where(p => p.TaskState == EnumTaskState.Running);
@@ -154,9 +154,9 @@ namespace DW5S.App.UserControl
                     item.TaskState = EnumTaskState.Stopped;
                     repsTask.Update(item);
                 }
-                var repsSat = unitOfWork.Reps<SatInfo>();
+                var repsSat = unitOfWork.Of<SatInfo>();
                 var satres = await repsSat.GetAllAsync(p => p.SatName);
-                var repsTx = unitOfWork.Reps<TxInfo>();
+                var repsTx = unitOfWork.Of<TxInfo>();
                 var txres = await repsTx.GetAllAsync();
                 txList.AddRange(txres);
                 mapControl1.AddRectMenu<ModelPosRes>("删除定位点", SvgHelper.CreateClose(), async items => await DeletePosRes(items.ToList()))
@@ -368,7 +368,7 @@ namespace DW5S.App.UserControl
                 mapControl1.SetPosDataSource(listPos);
             }
 
-            var repsSat = unitOfWork.Reps<SatInfo>();
+            var repsSat = unitOfWork.Of<SatInfo>();
             var sat1 = await repsSat.FirstOrDefaultAsync(p => p.SatCode == tsk.MainSat);
             var sat2 = await repsSat.FirstOrDefaultAsync(p => p.SatCode == tsk.Adja1Sat);
             var sat3 = await repsSat.FirstOrDefaultAsync(p => p.SatCode == tsk.Adja2Sat);
@@ -411,7 +411,7 @@ namespace DW5S.App.UserControl
             mapControl1.DelFixedImg("Tx");
             var posItem = (e.Row as ModelPosRes);
             if (posItem == null) return;
-            var repsStation = unitOfWork.Reps<StationRes>();
+            var repsStation = unitOfWork.Of<StationRes>();
             var station = await repsStation.FirstOrDefaultAsync(p => p.Id == posItem.StationResID);
             if (station != null)
             {
@@ -478,7 +478,7 @@ namespace DW5S.App.UserControl
                     {
                         addItem.Adja2Sat = null;
                     }
-                    var repsTask = unitOfWork.Reps<TaskInfo>();
+                    var repsTask = unitOfWork.Of<TaskInfo>();
                     var taskInfo = await repsTask.AddAsync(addItem);
 
                     List<TaskSig> sigList = new List<TaskSig>();
@@ -493,7 +493,7 @@ namespace DW5S.App.UserControl
                         };
                         sigList.Add(taskSig);
                     }
-                    var repsTaskSig = unitOfWork.Reps<TaskSig>();
+                    var repsTaskSig = unitOfWork.Of<TaskSig>();
                     await repsTaskSig.AddRangeAsync(sigList);
                     await unitOfWork.SaveAsync();
                     list.Insert(0, addItem);
@@ -513,14 +513,14 @@ namespace DW5S.App.UserControl
                 {
                     var editItem = gridView1.GetFocusedRow() as TaskInfo;
                     if (editItem == null) return;
-                    var repsTaskSig = unitOfWork.Reps<TaskSig>();
+                    var repsTaskSig = unitOfWork.Of<TaskSig>();
                     var sigs = await repsTaskSig.AsQueryable().Include(p => p.SigInfo).Where(p => p.TaskInfoID == editItem.Id).Select(p => p.SigInfo).ToListAsync();
-                    var repsSig = unitOfWork.Reps<SigInfo>();
+                    var repsSig = unitOfWork.Of<SigInfo>();
                     TaskEditor frm = new TaskEditor(editItem, sigs);
                     if (frm.ShowDialog() != DialogResult.OK) return;
                     editItem = frm.info;
                     var editItemSig = frm.selectedItem;
-                    var repsTask = unitOfWork.Reps<TaskInfo>();
+                    var repsTask = unitOfWork.Of<TaskInfo>();
                     if (await repsTask.AnyAsync(p => p.Id != editItem.Id && p.TaskName == editItem.TaskName))
                     {
                         DxHelper.MsgBoxHelper.ShowWarning("任务名称重复");
@@ -583,9 +583,9 @@ namespace DW5S.App.UserControl
                     if (tsk == null) return;
                     if (!DxHelper.MsgBoxHelper.ShowConfirm($"删除任务[{tsk.TaskName}]?"))
                         return;
-                    var repsTask = unitOfWork.Reps<TaskInfo>();
+                    var repsTask = unitOfWork.Of<TaskInfo>();
                     await repsTask.DeleteAsync(p => p.Id == tsk.Id);
-                    var repsTaskSig = unitOfWork.Reps<TaskSig>();
+                    var repsTaskSig = unitOfWork.Of<TaskSig>();
                     await repsTaskSig.DeleteAsync(p => p.TaskInfoID == tsk.Id);
                     await unitOfWork.SaveAsync();
                     gridView1.DeleteSelectedRows();
@@ -604,8 +604,8 @@ namespace DW5S.App.UserControl
         private async void btn_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
             var tsk = gridView1.GetFocusedRow() as TaskInfo;
-            var repsTask = unitOfWork.Reps<TaskInfo>();
-            var repsTaskSig = unitOfWork.Reps<TaskSig>();
+            var repsTask = unitOfWork.Of<TaskInfo>();
+            var repsTaskSig = unitOfWork.Of<TaskSig>();
             if (e.Item.Caption == "启动任务")
             {
                 try
@@ -635,13 +635,13 @@ namespace DW5S.App.UserControl
                                 sigDto.BandHz = taskSig.SigInfo.Band.Value;
                             else
                                 sigDto.BandHz = 25000;
-                            var repsSigDelay = unitOfWork.Reps<SigDelay>();
+                            var repsSigDelay = unitOfWork.Of<SigDelay>();
                             var sigDelay = await repsSigDelay.FindAsync(p => p.SigInfoId == taskSig.SigInfo.Id);
                             sigDto.SigDelay.AddRange(sigDelay.To<List<SigDelayDto>>());
                             tskSigsDto.Add(sigDto);
                         }
 
-                        var repsTx = unitOfWork.Reps<TxInfo>();
+                        var repsTx = unitOfWork.Of<TxInfo>();
                         tx = await repsTx.FirstOrDefaultAsync(p => p.TxType == EnumTxType.Rec);
                         cdb = await repsTx.FirstOrDefaultAsync(p => p.TxType == EnumTxType.Cdb);
                         if (tx == null || cdb == null)
@@ -649,7 +649,7 @@ namespace DW5S.App.UserControl
                             DxHelper.MsgBoxHelper.ShowWarning($"未配置天线信息");
                             return;
                         }
-                        var repsFixed = unitOfWork.Reps<FixedStation>();
+                        var repsFixed = unitOfWork.Of<FixedStation>();
                         var fixedStations = await repsFixed.FindAsync(p => p.Enable);
                         if (tsk.PosType == EnumPosType.X2D1)
                         {
@@ -951,7 +951,7 @@ namespace DW5S.App.UserControl
             {
                 var ids = items.Select(m => m.Id).ToList();
 
-                var repsPos = unitOfWork.Reps<PosRes>();
+                var repsPos = unitOfWork.Of<PosRes>();
                 await repsPos.DeleteAsync(p => ids.Contains(p.Id));
                 mapControl1.DelPosItem<PosRes>(p => ids.Contains(p.Id));
                 return true;
@@ -1115,7 +1115,7 @@ namespace DW5S.App.UserControl
                         RefLon = item.StationRes.RefLon,
                         RefLat = item.StationRes.RefLat,
                     };
-                    var repsXl = unitOfWork.Reps<XlInfo>() as XlRepository;
+                    var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
                     var mainxlInfo = await repsXl.GetLatestAsync(item.CgRes.MainCode.Value, item.SigTime);
                     if (mainxlInfo == null)
                     {
@@ -1305,7 +1305,7 @@ namespace DW5S.App.UserControl
                             break;
                     }
                 }
-                var repsPos = unitOfWork.Reps<PosRes>();
+                var repsPos = unitOfWork.Of<PosRes>();
                 foreach (var item in items)
                 {
                     var posItem = await repsPos.FirstOrDefaultAsync(p => p.Id == item.Id);
@@ -1393,14 +1393,14 @@ namespace DW5S.App.UserControl
             {
                 if (items.Count == 0) return;
                 long? targetID = 0;
-                var repsPos = unitOfWork.Reps<PosRes>();
+                var repsPos = unitOfWork.Of<PosRes>();
                 var idRes = items.First().Id;
                 var target = await repsPos.FirstOrDefaultAsync(p => p.Id == idRes);
                 targetID = target.TargetInfoID;
                 TargetInfo info = null;
                 if (targetID != null)
                 {
-                    var repsTarget = unitOfWork.Reps<TargetInfo>();
+                    var repsTarget = unitOfWork.Of<TargetInfo>();
                     info = await repsTarget.FirstOrDefaultAsync(p => p.Id == target.Id);
                 }
                 EditorTar frm = new EditorTar(info);
@@ -1475,7 +1475,7 @@ namespace DW5S.App.UserControl
             {
                 if (!MsgBoxHelper.ShowConfirm($"确认使用镜像点?共{items.Count}条记录")) return;
                 var ids = items.Select(p => p.Id);
-                var repsPos = unitOfWork.Reps<PosRes>();
+                var repsPos = unitOfWork.Of<PosRes>();
                 var updateItems = await repsPos.FindAsync(p => ids.Contains(p.Id));
                 UseMirror(updateItems);
                 mapControl1.UpdatePosItem(items);
@@ -1504,7 +1504,7 @@ namespace DW5S.App.UserControl
             {
                 if (!MsgBoxHelper.ShowConfirm($"确认删除定位点?共{items.Count}条记录")) return;
                 var ids = items.Select(p => p.Id);
-                var repsPos = unitOfWork.Reps<PosRes>();
+                var repsPos = unitOfWork.Of<PosRes>();
                 await repsPos.DeleteAsync(p => ids.Contains(p.Id));
                 await unitOfWork.SaveAsync();
                 mapControl1.DelPosItem(items);

+ 2 - 2
DW5S.Controller/FindRefController.cs

@@ -34,7 +34,7 @@ namespace DW5S.App.Controllers
             var id = dtos.First().TaskID.Value;
             try
             {
-                var repsTask = unitOfWork.Reps<TaskInfo>();
+                var repsTask = unitOfWork.Of<TaskInfo>();
                 var runTask=await repsTask.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                         && p.PosType == EnumPosType.X2D1 && p.TaskState == EnumTaskState.Running);
                 if (runTask == null)
@@ -79,7 +79,7 @@ namespace DW5S.App.Controllers
             try
             {
 
-                var repsTask = unitOfWork.Reps<TaskInfo>();
+                var repsTask = unitOfWork.Of<TaskInfo>();
                 var runTask = await repsTask.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
                         && p.PosType == EnumPosType.X2D1 && p.TaskState == EnumTaskState.Running);
                 if (runTask == null)

+ 4 - 4
DW5S.Controller/LogController.cs

@@ -39,7 +39,7 @@ namespace DW5S.App.Controllers
         {
             try
             {
-                var repsLog = unitOfWork.Reps<LogRes>();
+                var repsLog = unitOfWork.Of<LogRes>();
                 await repsLog.AddAsync(new LogRes()
                 {
                     LogTime = dto.LogTime,
@@ -67,7 +67,7 @@ namespace DW5S.App.Controllers
         {
             try
             {
-                var query = unitOfWork.Reps<LogRes>().AsQueryable();
+                var query = unitOfWork.Of<LogRes>().AsQueryable();
                 if (!string.IsNullOrWhiteSpace(dto.Module) && dto.Module != "全部")
                     query = query.Where(p => p.Module == dto.Module);
                 if (dto.LogTimeBegin != null && dto.LogTimeBegin != DateTime.MinValue)
@@ -103,7 +103,7 @@ namespace DW5S.App.Controllers
         {
             try
             {
-                var repsLog = unitOfWork.Reps<LogRes>();
+                var repsLog = unitOfWork.Of<LogRes>();
                 var res = await repsLog.GetDistinctAsync(p => p.Module);
                 var dtoRes = res.Select(p => new LogModulesResDto()
                 {
@@ -132,7 +132,7 @@ namespace DW5S.App.Controllers
             if (dto == null || !dto.Any()) return Success();
             try
             {
-                var repsLog = unitOfWork.Reps<LogRes>();
+                var repsLog = unitOfWork.Of<LogRes>();
                 var ids = dto.Select(p => p.ID);
                 await repsLog.DeleteAsync(p => ids.Contains(p.Id));
                 await unitOfWork.SaveAsync();

+ 35 - 35
DW5S.Controller/PosController.cs

@@ -38,7 +38,7 @@ namespace DW5S.App.Controllers
         public async Task<AjaxResult> PosX1D1Async(X1D1NoXlPosDto dto)
         {
             TaskInfo runTask;
-            var repsTask = unitOfWork.Reps<TaskInfo>();
+            var repsTask = unitOfWork.Of<TaskInfo>();
             if (dto.TaskID == null)
             {
                 runTask = await repsTask.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
@@ -60,7 +60,7 @@ namespace DW5S.App.Controllers
                     return Error(msg);
                 }
             }
-            var repsXl = unitOfWork.Reps<XlInfo>() as XlRepository;
+            var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
             var xl1 = await repsXl.GetLatestAsync(dto.MainCode, dto.SigTime);
             if (xl1 == null)
             {
@@ -77,7 +77,7 @@ namespace DW5S.App.Controllers
                 logger.LogError(msg);
                 return Error(msg);
             }
-            var repsStationRes = unitOfWork.Reps<StationRes>();
+            var repsStationRes = unitOfWork.Of<StationRes>();
             var stationRes = await repsStationRes.AddAsync(new StationRes
             {
                 SatTxLon = dto.SatTxLon,
@@ -90,7 +90,7 @@ namespace DW5S.App.Controllers
                 RefLat = dto.RefLat,
             });
 
-            var repsCheckRes = unitOfWork.Reps<CheckRes>();
+            var repsCheckRes = unitOfWork.Of<CheckRes>();
             var ckRes = await repsCheckRes.AddAsync(new CheckRes
             {
                 FileName = dto.CheckRes?.FileName,
@@ -104,7 +104,7 @@ namespace DW5S.App.Controllers
                 Snr = dto.CheckRes?.Snr
             });
 
-            var repsCgRes = unitOfWork.Reps<CgRes>();
+            var repsCgRes = unitOfWork.Of<CgRes>();
             var cgRes = await repsCgRes.AddAsync(new CgRes
             {
                 SigTime = dto.SigTime,
@@ -126,7 +126,7 @@ namespace DW5S.App.Controllers
                 TarFreqDown = dto.FreqDown,
             });
 
-            var repsCxRes = unitOfWork.Reps<CxRes>();
+            var repsCxRes = unitOfWork.Of<CxRes>();
             var cxRes = await repsCxRes.AddAsync(new CxRes()
             {
                 SigTime = dto.SigTime,
@@ -135,7 +135,7 @@ namespace DW5S.App.Controllers
 
             var res = PosApi.X1D1_Pos(cgRes, stationRes, cxRes, dto.CalcConfidence);
 
-            var repsPosRes = unitOfWork.Reps<PosRes>();
+            var repsPosRes = unitOfWork.Of<PosRes>();
             var posRes = await repsPosRes.AddAsync(new PosRes
             {
                 FreqUpHz = (long)cgRes.TarFreqUp.Value,
@@ -170,7 +170,7 @@ namespace DW5S.App.Controllers
         {
             TargetInfo target = null;
             TaskInfo runTask;
-            var repsTask = unitOfWork.Reps<TaskInfo>();
+            var repsTask = unitOfWork.Of<TaskInfo>();
             if (dto.TaskID == null)
             {
                 runTask = await repsTask.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
@@ -194,7 +194,7 @@ namespace DW5S.App.Controllers
             }
             if (!string.IsNullOrWhiteSpace(dto.Target))
             {
-                var repsTarget = unitOfWork.Reps<TargetInfo>();
+                var repsTarget = unitOfWork.Of<TargetInfo>();
                 target = await repsTarget.FirstOrDefaultAsync(p => p.TargetName == dto.Target.Trim());
                 if (target == null)
                 {
@@ -205,7 +205,7 @@ namespace DW5S.App.Controllers
                     });
                 }
             }
-            var repsXl = unitOfWork.Reps<XlInfo>() as XlRepository;
+            var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
             var xl1 = await repsXl.GetLatestAsync(dto.MainCode, dto.SigTime);
             if (xl1 == null)
             {
@@ -260,7 +260,7 @@ namespace DW5S.App.Controllers
             //dto.MainYbDto = Math.Round(refdt1 * 1e6, 3);
             //dto.AdjaYbDto = Math.Round(refdt2 * 1e6, 3);
 
-            var repsStationRes = unitOfWork.Reps<StationRes>();
+            var repsStationRes = unitOfWork.Of<StationRes>();
             var stationRes = await repsStationRes.AddAsync(new StationRes
             {
                 SatTxLon = dto.SatTxLon,
@@ -271,7 +271,7 @@ namespace DW5S.App.Controllers
                 RefLat = dto.RefLat,
             });
 
-            var repsCheckRes = unitOfWork.Reps<CheckRes>();
+            var repsCheckRes = unitOfWork.Of<CheckRes>();
             var ckRes = await repsCheckRes.AddAsync(new CheckRes
             {
                 FileName = dto.CheckRes?.FileName,
@@ -285,7 +285,7 @@ namespace DW5S.App.Controllers
                 Snr = dto.CheckRes?.Snr
             });
 
-            var repsCgRes = unitOfWork.Reps<CgRes>();
+            var repsCgRes = unitOfWork.Of<CgRes>();
             var cgRes = await repsCgRes.AddAsync(new CgRes
             {
                 SigTime = dto.SigTime,
@@ -321,7 +321,7 @@ namespace DW5S.App.Controllers
 
             var res = PosApi.X2D1_Pos(cgRes, stationRes, dto.CalcConfidence);
 
-            var repsPosRes = unitOfWork.Reps<PosRes>();
+            var repsPosRes = unitOfWork.Of<PosRes>();
             var posRes = await repsPosRes.AddAsync(new PosRes
             {
                 FreqUpHz = (long)cgRes.TarFreqUp.Value,
@@ -353,7 +353,7 @@ namespace DW5S.App.Controllers
         {
             TargetInfo target = null;
             TaskInfo runTask;
-            var repsTask = unitOfWork.Reps<TaskInfo>();
+            var repsTask = unitOfWork.Of<TaskInfo>();
             if (dto.TaskID == null)
             {
                 runTask = await repsTask.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
@@ -377,7 +377,7 @@ namespace DW5S.App.Controllers
             }
             if (!string.IsNullOrWhiteSpace(dto.Target))
             {
-                var repsTarget = unitOfWork.Reps<TargetInfo>();
+                var repsTarget = unitOfWork.Of<TargetInfo>();
                 target = await repsTarget.FirstOrDefaultAsync(p => p.TargetName == dto.Target.Trim());
                 if (target == null)
                 {
@@ -388,7 +388,7 @@ namespace DW5S.App.Controllers
                     });
                 }
             }
-            var repsXl = unitOfWork.Reps<XlInfo>() as XlRepository;
+            var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
             var xl1 = await repsXl.GetLatestAsync(dto.MainCode, dto.SigTime);
             if (xl1 == null)
             {
@@ -435,7 +435,7 @@ namespace DW5S.App.Controllers
             //var dto2 = dt1 - dt3;
             //dto.SxDto = dto1 * 1e6 + r.Next(-10, 10) + Math.Round(r.NextDouble(), 3);
             //dto.XdDto = dto2 * 1e6 + r.Next(-10, 10) + Math.Round(r.NextDouble(), 3);
-            var repsStationRes = unitOfWork.Reps<StationRes>();
+            var repsStationRes = unitOfWork.Of<StationRes>();
             var stationRes = await repsStationRes.AddAsync(new StationRes
             {
                 SatTxLon = dto.SatTxLon,
@@ -444,7 +444,7 @@ namespace DW5S.App.Controllers
                 CdbTxLat = dto.CdbTxLat,
             });
 
-            var repsCheckRes = unitOfWork.Reps<CheckRes>();
+            var repsCheckRes = unitOfWork.Of<CheckRes>();
             var ckRes = await repsCheckRes.AddAsync(new CheckRes
             {
                 FileName = dto.CheckRes?.FileName,
@@ -458,7 +458,7 @@ namespace DW5S.App.Controllers
                 Snr = dto.CheckRes?.Snr
             });
 
-            var repsCgRes = unitOfWork.Reps<CgRes>();
+            var repsCgRes = unitOfWork.Of<CgRes>();
             var cgRes = await repsCgRes.AddAsync(new CgRes
             {
                 SigTime = dto.SigTime,
@@ -493,7 +493,7 @@ namespace DW5S.App.Controllers
             var res = PosApi.X2D1_PosNoRef_ZL(cgRes, stationRes, dto.CalcConfidence);
 
 
-            var repsPosRes = unitOfWork.Reps<PosRes>();
+            var repsPosRes = unitOfWork.Of<PosRes>();
             var posRes = await repsPosRes.AddAsync(new PosRes
             {
                 FreqUpHz = (long)cgRes.TarFreqUp.Value,
@@ -529,7 +529,7 @@ namespace DW5S.App.Controllers
         {
             TargetInfo target = null;
             TaskInfo runTask;
-            var repsTask = unitOfWork.Reps<TaskInfo>();
+            var repsTask = unitOfWork.Of<TaskInfo>();
             if (dto.TaskID == null)
             {
                 runTask = await repsTask.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
@@ -553,7 +553,7 @@ namespace DW5S.App.Controllers
             }
             if (!string.IsNullOrWhiteSpace(dto.Target))
             {
-                var repsTarget = unitOfWork.Reps<TargetInfo>();
+                var repsTarget = unitOfWork.Of<TargetInfo>();
                 target = await repsTarget.FirstOrDefaultAsync(p => p.TargetName == dto.Target.Trim());
                 if (target == null)
                 {
@@ -564,7 +564,7 @@ namespace DW5S.App.Controllers
                     });
                 }
             }
-            var repsXl = unitOfWork.Reps<XlInfo>() as XlRepository;
+            var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
             var xl1 = await repsXl.GetLatestAsync(dto.MainCode, dto.SigTime);
             if (xl1 == null)
             {
@@ -617,7 +617,7 @@ namespace DW5S.App.Controllers
                 return Error(msg);
             }
 
-            var repsStationRes = unitOfWork.Reps<StationRes>();
+            var repsStationRes = unitOfWork.Of<StationRes>();
             var stationRes = await repsStationRes.AddAsync(new StationRes
             {
                 SatTxLon = dto.SatTxLon,
@@ -626,7 +626,7 @@ namespace DW5S.App.Controllers
                 RefLat = dto.RefLat,
             });
 
-            var repsCheckRes = unitOfWork.Reps<CheckRes>();
+            var repsCheckRes = unitOfWork.Of<CheckRes>();
             var ckRes = await repsCheckRes.AddAsync(new CheckRes
             {
                 FileName = dto.CheckRes?.FileName,
@@ -640,7 +640,7 @@ namespace DW5S.App.Controllers
                 Snr = dto.CheckRes?.Snr
             });
 
-            var repsCgRes = unitOfWork.Reps<CgRes>();
+            var repsCgRes = unitOfWork.Of<CgRes>();
             var cgRes = await repsCgRes.AddAsync(new CgRes
             {
                 SigTime = dto.SigTime,
@@ -684,7 +684,7 @@ namespace DW5S.App.Controllers
             });
             var res = PosApi.X3_Pos(cgRes, stationRes, dto.CalcConfidence);
 
-            var repsPosRes = unitOfWork.Reps<PosRes>();
+            var repsPosRes = unitOfWork.Of<PosRes>();
             var posRes = await repsPosRes.AddAsync(new PosRes
             {
                 FreqUpHz = (long)cgRes.TarFreqUp.Value,
@@ -717,7 +717,7 @@ namespace DW5S.App.Controllers
 
             TargetInfo target = null;
             TaskInfo runTask;
-            var repsTask = unitOfWork.Reps<TaskInfo>();
+            var repsTask = unitOfWork.Of<TaskInfo>();
             if (dto.TaskID == null)
             {
                 runTask = await repsTask.FirstOrDefaultAsync(p => p.TaskType == EnumTaskType.Group
@@ -741,7 +741,7 @@ namespace DW5S.App.Controllers
             }
             if (!string.IsNullOrWhiteSpace(dto.Target))
             {
-                var repsTarget = unitOfWork.Reps<TargetInfo>();
+                var repsTarget = unitOfWork.Of<TargetInfo>();
                 target = await repsTarget.FirstOrDefaultAsync(p => p.TargetName == dto.Target.Trim());
                 if (target == null)
                 {
@@ -752,7 +752,7 @@ namespace DW5S.App.Controllers
                     });
                 }
             }
-            var repsXl = unitOfWork.Reps<XlInfo>() as XlRepository;
+            var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
             var xl1 = await repsXl.GetLatestAsync(dto.MainCode, dto.SigTime);
             if (xl1 == null)
             {
@@ -805,14 +805,14 @@ namespace DW5S.App.Controllers
                 return Error(msg);
             }
 
-            var repsStationRes = unitOfWork.Reps<StationRes>();
+            var repsStationRes = unitOfWork.Of<StationRes>();
             var stationRes = await repsStationRes.AddAsync(new StationRes
             {
                 SatTxLon = dto.SatTxLon,
                 SatTxLat = dto.SatTxLat,
             });
 
-            var repsCheckRes = unitOfWork.Reps<CheckRes>();
+            var repsCheckRes = unitOfWork.Of<CheckRes>();
             var ckRes = await repsCheckRes.AddAsync(new CheckRes
             {
                 FileName = dto.CheckRes?.FileName,
@@ -826,7 +826,7 @@ namespace DW5S.App.Controllers
                 Snr = dto.CheckRes?.Snr
             });
 
-            var repsCgRes = unitOfWork.Reps<CgRes>();
+            var repsCgRes = unitOfWork.Of<CgRes>();
             var cgRes = await repsCgRes.AddAsync(new CgRes
             {
                 SigTime = dto.SigTime,
@@ -867,7 +867,7 @@ namespace DW5S.App.Controllers
             });
             var res = PosApi.X3_PosNoRef(cgRes, stationRes, dto.CalcConfidence);
 
-            var repsPosRes = unitOfWork.Reps<PosRes>();
+            var repsPosRes = unitOfWork.Of<PosRes>();
             var posRes = await repsPosRes.AddAsync(new PosRes
             {
                 FreqUpHz = (long)cgRes.TarFreqUp.Value,

+ 7 - 7
DW5S.Controller/ResultController.cs

@@ -36,7 +36,7 @@ namespace DW5S.App.Controllers
         {
             try
             {
-                var query = unitOfWork.Reps<PosRes>().AsQueryable();
+                var query = unitOfWork.Of<PosRes>().AsQueryable();
                 query = query.Where(p => p.SigTime >= dto.BeginTime && p.SigTime <= dto.EndTime && p.TaskInfoID == dto.TaskInfoID);
                 if (!dto.IncludeInvalidate)
                     query = query.Where(p => p.PosLon != 999);
@@ -67,7 +67,7 @@ namespace DW5S.App.Controllers
         {
             try
             {
-                var query = unitOfWork.Reps<PosRes>().AsQueryable();
+                var query = unitOfWork.Of<PosRes>().AsQueryable();
                 var listFrequp = await query.Where(p => p.TaskInfoID == dto.TaskInfoID).Select(p => p.FreqUpHz).Distinct().ToListAsync();
                 var res = listFrequp.Select(p => new TaskFreqResDto() { FreqUpHz = p }).OrderBy(o => o.FreqUpHz).ToList();
                 return Success(res);
@@ -88,7 +88,7 @@ namespace DW5S.App.Controllers
         {
             try
             {
-                var res = await unitOfWork.Reps<TaskInfo>().FindAsync(p => p.TaskState == EnumTaskState.Running);
+                var res = await unitOfWork.Of<TaskInfo>().FindAsync(p => p.TaskState == EnumTaskState.Running);
                 var resDto = res.Select(t => new TaskQueryResDto()
                 {
                     TaskID = t.Id,
@@ -161,8 +161,8 @@ namespace DW5S.App.Controllers
         {
             try
             {
-                var targets = await unitOfWork.Reps<TargetInfo>().GetAllAsync();
-                var query = unitOfWork.Reps<PosRes>().AsQueryable();
+                var targets = await unitOfWork.Of<TargetInfo>().GetAllAsync();
+                var query = unitOfWork.Of<PosRes>().AsQueryable();
                 query = query.Where(p => p.SigTime >= dto.BeginTime && p.SigTime <= dto.EndTime && p.TaskInfoID == dto.TaskInfoID);
                 if (!dto.IncludeInvalidate)
                     query = query.Where(p => p.PosLon != 999);
@@ -204,8 +204,8 @@ namespace DW5S.App.Controllers
         {
             try
             {
-                var targets = await unitOfWork.Reps<TargetInfo>().GetAllAsync();
-                var query = unitOfWork.Reps<PosRes>().AsQueryable();
+                var targets = await unitOfWork.Of<TargetInfo>().GetAllAsync();
+                var query = unitOfWork.Of<PosRes>().AsQueryable();
                 query = query.Where(p => p.TaskInfoID == dto.TaskInfoID);
                 if (!dto.IncludeInvalidate)
                 {

+ 1 - 1
DW5S.Controller/TaskController.cs

@@ -59,7 +59,7 @@ namespace DW5S.App.Controllers
         {
             try
             {
-                var repsTask = unitOfWork.Reps<TaskInfo>();
+                var repsTask = unitOfWork.Of<TaskInfo>();
                 var item = await repsTask.GetByIdAsync(dto.ID);
                 if (item == null)
                 {

+ 2 - 2
DW5S.Controller/XlController.cs

@@ -74,7 +74,7 @@ namespace DW5S.App.Controllers
                          xl.TimeUTC = dt;
                          tmp.Add(xl);
                      }
-                     var repsXl = unitOfWork.Reps<XlInfo>();
+                     var repsXl = unitOfWork.Of<XlInfo>();
                     await repsXl.AddRangeAsync(tmp);
                     
                      return tmp.Count;
@@ -162,7 +162,7 @@ namespace DW5S.App.Controllers
         {
             try
             {
-                var repsXl = unitOfWork.Reps<XlInfo>() as XlRepository;
+                var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
                 var xl1 = await repsXl.GetLatestAsync(dto.SatCode, dto.SigTime);
                 if (xl1 == null)
                 {

+ 2 - 2
DW5S.Repostory/UnitOfWork.cs

@@ -9,14 +9,14 @@ namespace DW5S.Repostory
 {
     public interface IUnitOfWork : IAsyncDisposable
     {
-        IRepository<TEntity> Reps<TEntity>();
+        IRepository<TEntity> Of<TEntity>();
         Task<int> SaveAsync();
     }
     public class UnitOfWork : IUnitOfWork
     {
         private readonly OracleContext ctx;
 
-        public IRepository<TEntity> Reps<TEntity>() 
+        public IRepository<TEntity> Of<TEntity>() 
         {
             throw new NotImplementedException();
         }