11

DW5S.App/EditForms/FixedStationEditor.cs

@@ -20,9 +20,6 @@ namespace DW5S.App.EditForms
 {
     public partial class FixedStationEditor : DevExpress.XtraEditors.XtraForm
     {
-
-
-
         public FixedStationViewModel info;
         private List<FixedStationViewModel> infos;
         public FixedStationEditor()
@@ -48,14 +45,15 @@ namespace DW5S.App.EditForms
             infos.AddRange(res.To<List<FixedStationViewModel>>());
             var repsSig = unitOfWork.Of<SigInfo>();
            var sigs = await repsSig.GetAllAsync();
-            this.txtFreqUp.UseDefault().SetData(sigs.To<List<SigViewModel>>(), displayField: nameof(SigViewModel.FreqUpDis)).UseDoubleClickToSelectAll();
+            var sigsData = sigs.To<List<SigViewModel>>();
+            this.txtFreqUp.UseDefault().SetData(sigsData, displayField: nameof(SigViewModel.FreqUpDis)).UseDoubleClickToSelectAll();
             if (this.Text == "固定站编辑" && info != null)
             {
                 this.txtName.Text = info.StationName;
                 this.txtLon.Text = info.Lon.ToString();
                 this.txtLat.Text = info.Lat.ToString();
                 this.txtValue.Text = info.Value.ToString();
-                this.txtFreqUp.EditValue = sigs.FirstOrDefault(p => p.FreqUp == info.FreqUpHz);
+                this.txtFreqUp.EditValue = sigsData.FirstOrDefault(p => p.FreqUp == info.FreqUpHz);
                 this.txtEnable.Checked = info.Enable;
             }
         }
@@ -76,7 +74,7 @@ namespace DW5S.App.EditForms
                     DxHelper.MsgBoxHelper.ShowError($"已经存在名称为[{name}]的固定站!");
                     return;
                 }
-                var freqUpHz = (txtFreqUp.EditValue as SigInfo).FreqUp;
+                var freqUpHz = (txtFreqUp.EditValue as SigViewModel).FreqUp;
                 if (infos.Any(i => i.Id != info.Id && i.FreqUpHz == freqUpHz))
                 {
                     DxHelper.MsgBoxHelper.ShowError($"已经存在上行频点为[{freqUpHz / 1e6:f3}MHz]的固定站!");

DW5S.App/UserControl/CtrlFixedStation.cs

@@ -55,9 +55,9 @@ namespace DW5S.App.UserControl
                 var addItem = frm.info;
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsFix = unitOfWork.Of<FixedStation>();
-                await repsFix.AddOrUpdateAsync(addItem.To<FixedStation>());
+                var res =  await repsFix.AddOrUpdateAsync(addItem.To<FixedStation>());
                 await unitOfWork.SaveAsync();
-                return addItem;
+                return res.To<FixedStationViewModel>();
             }
             catch (Exception ex)
             {
@@ -101,17 +101,16 @@ namespace DW5S.App.UserControl
         {
             try
             {
-                var ids = list.Select(p => p.Id);
                 var unitOfWork = IocContainer.UnitOfWork;
-                var repsSat = unitOfWork.Of<SatInfo>();
-                await repsSat.DeleteAsync(p => ids.Contains(p.Id));
+                var repsFixed = unitOfWork.Of<FixedStation>();
+                await repsFixed.DeleteAsync(list.To<List<FixedStation>>());
                 await unitOfWork.SaveAsync();
                 return true;
             }
             catch (Exception ex)
             {
-                IocContainer.Logger.Error(ex,"删除卫星信息异常");
-                DxHelper.MsgBoxHelper.ShowError("删除卫星信息异常");
+                IocContainer.Logger.Error(ex, "删除固定站信息异常");
+                DxHelper.MsgBoxHelper.ShowError("删除固定站信息异常");
                 return false;
             }
         }

DW5S.ViewModel/FixedStationViewModel.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace DW5S.ViewModel
 {
-    public class FixedStationViewModel : BaseViewModel
+    public class FixedStationViewModel : BaseViewModel<int>
     {
 
         [Display(Name = "名称")]
@@ -31,7 +31,7 @@ namespace DW5S.ViewModel
         /// <summary>
         /// 固定站信号判定规则(突发信号和前一个突发超过Value秒则认为是固定站发出的信号)
         /// </summary>
-        [Display(Name = "固定站信号判定规则")]
+        [Display(Name = "信号判定规则")]
         public double Value { get; set; }
 
         /// <summary>