11

DW5S.App/EditForms/CdbEditor.cs

@@ -21,17 +21,17 @@ namespace DW5S.App.EditForms
         
         
 
-        public TxInfo info;
-        private List<TxInfo> infos;
+        public CdbTxViewModel info;
+        private List<CdbTxViewModel> infos;
         public CdbEditor()
         {
             InitializeComponent();
             this.layoutControl1.UseDefault();
             this.Text = "添加超短波";
-            info = new TxInfo();
+            info = new CdbTxViewModel();
             this.StartPosition = FormStartPosition.CenterParent;
         }
-        public CdbEditor(TxInfo info)
+        public CdbEditor(CdbTxViewModel info)
            : this()
         {
             this.Text = "编辑超短波";
@@ -47,11 +47,11 @@ namespace DW5S.App.EditForms
                 this.txtLat.Text = info.Lat.ToString();
                 this.txtRemark.EditValue = info.Remark;
             }
-            infos = new List<TxInfo>();
+            infos = new List<CdbTxViewModel>();
             var unitOfWork = IocContainer.UnitOfWork;
             var repsCdb = unitOfWork.Of<TxInfo>();
-            var res = await repsCdb.GetAllAsync(p => p.Name);
-            infos.AddRange(res);
+            var res = await repsCdb.FindAsync(f => f.TxType == EnumTxType.Cdb);
+            infos.AddRange(res.To<List<CdbTxViewModel>>());
         }
 
         private void btnOk_Click(object sender, EventArgs e)
@@ -67,7 +67,6 @@ namespace DW5S.App.EditForms
                 info.Lon=Convert.ToDouble(txtLon.Text);
                 info.Lat = Convert.ToDouble(txtLat.Text);
                 info.Remark = txtRemark.Text;
-                info.TxType = EnumTxType.Cdb;
                 this.DialogResult = DialogResult.OK;
             }
             catch (Exception ex)

DW5S.App/EditForms/CxEditor.cs

@@ -18,17 +18,17 @@ namespace DW5S.App.EditForms
 {  
     public partial class CxEditor : DevExpress.XtraEditors.XtraForm
     {
-        public TxInfo info;
-        private List<TxInfo> infos;
+        public CxTxViewModel info;
+        private List<CxTxViewModel> infos;
         public CxEditor()
         {
             InitializeComponent();
             this.layoutControl1.UseDefault();
             this.Text = "添加测向站";
-            info = new TxInfo();
+            info = new CxTxViewModel();
             this.StartPosition = FormStartPosition.CenterParent;
         }
-        public CxEditor(TxInfo info)
+        public CxEditor(CxTxViewModel info)
            : this()
         {
             this.Text = "编辑测向站";
@@ -44,11 +44,11 @@ namespace DW5S.App.EditForms
                 this.txtLat.Text = info.Lat.ToString();
                 this.txtRemark.EditValue = info.Remark;
             }
-            infos = new List<TxInfo>();
+            infos = new List<CxTxViewModel>();
             var unitOfWork = IocContainer.UnitOfWork;
             var repsCx = unitOfWork.Of<TxInfo>();
-            var res = await repsCx.GetAllAsync(p => p.Name);
-            infos.AddRange(res);
+            var res = await repsCx.FindAsync(f=>f.TxType== EnumTxType.Cx);
+            infos.AddRange(res.To<List<CxTxViewModel>>());
         }
 
         private void btnOk_Click(object sender, EventArgs e)
@@ -64,7 +64,6 @@ namespace DW5S.App.EditForms
                 info.Lon=Convert.ToDouble(txtLon.Text);
                 info.Lat = Convert.ToDouble(txtLat.Text);
                 info.Remark = txtRemark.Text;
-                info.TxType = EnumTxType.Cx;
                 this.DialogResult = DialogResult.OK;
             }
             catch (Exception ex)

DW5S.App/EditForms/RecEditor.cs

@@ -19,21 +19,21 @@ namespace DW5S.App.EditForms
 {
     public partial class RecEditor : DevExpress.XtraEditors.XtraForm
     {
-        public TxInfo info;
-        private List<TxInfo> infos;
+        public RecTxViewModel info;
+        private List<RecTxViewModel> infos;
         public RecEditor()
         {
             InitializeComponent();
             this.layoutControl1.UseDefault();
             this.Text = "添加接收站";
-            info = new TxInfo();
+            info = new RecTxViewModel();
             this.StartPosition = FormStartPosition.CenterParent;
         }
         public RecEditor(RecTxViewModel info)
            : this()
         {
             this.Text = "编辑接收站";
-            this.info = info.To<TxInfo>();
+            this.info = info.To<RecTxViewModel>();
         }
 
         private async void RecEditor_Load(object sender, EventArgs e)
@@ -45,11 +45,11 @@ namespace DW5S.App.EditForms
                 this.txtLat.Text = info.Lat.ToString();
                 this.txtRemark.EditValue = info.Remark;
             }
-            infos = new List<TxInfo>();
+            infos = new List<RecTxViewModel>();
             var unitOfWork = IocContainer.UnitOfWork;
             var repsRec = unitOfWork.Of<TxInfo>();
-            var res = await repsRec.FindAsync(f => f.TxType == EnumTxType.Rec, p => p.Name);
-            infos.AddRange(res);
+            var res = await repsRec.FindAsync(f => f.TxType == EnumTxType.Rec);
+            infos.AddRange(res.To<List<RecTxViewModel>>());
         }
 
         private void btnOk_Click(object sender, EventArgs e)
@@ -65,7 +65,6 @@ namespace DW5S.App.EditForms
                 info.Lon = Convert.ToDouble(txtLon.Text);
                 info.Lat = Convert.ToDouble(txtLat.Text);
                 info.Remark = txtRemark.Text;
-                info.TxType = EnumTxType.Rec;
                 this.DialogResult = DialogResult.OK;
             }
             catch (Exception ex)

DW5S.App/EditForms/RefEditor.cs

@@ -20,17 +20,17 @@ namespace DW5S.App.EditForms
     {
         
         
-        public TxInfo info;
-        private List<TxInfo> infos;
+        public RefTxViewModel info;
+        private List<RefTxViewModel> infos;
         public RefEditor()
         {
             InitializeComponent();
             this.layoutControl1.UseDefault();
             this.Text = "添加参考站";
-            info = new TxInfo();
+            info = new RefTxViewModel();
             this.StartPosition = FormStartPosition.CenterParent;
         }
-        public RefEditor(TxInfo info)
+        public RefEditor(RefTxViewModel info)
            : this()
         {
             this.Text = "编辑参考站";
@@ -46,11 +46,11 @@ namespace DW5S.App.EditForms
                 this.txtLat.Text = info.Lat.ToString();
                 this.txtRemark.EditValue = info.Remark;
             }
-            infos = new List<TxInfo>();
+            infos = new List<RefTxViewModel>();
             var unitOfWork = IocContainer.UnitOfWork;
             var repsRef = unitOfWork.Of<TxInfo>();
-            var res = await repsRef.GetAllAsync();
-            infos.AddRange(res);
+            var res = await repsRef.FindAsync(f=>f.TxType== EnumTxType.Ref);
+            infos.AddRange(res.To<List<RefTxViewModel>>());
         }
 
         private void btnOk_Click(object sender, EventArgs e)
@@ -66,7 +66,6 @@ namespace DW5S.App.EditForms
                 info.Lon=Convert.ToDouble(txtLon.Text);
                 info.Lat = Convert.ToDouble(txtLat.Text);
                 info.Remark = txtRemark.Text;
-                info.TxType = EnumTxType.Ref;
                 this.DialogResult = DialogResult.OK;
             }
             catch (Exception ex)

DW5S.App/UserControl/CtrlCdbTx.cs

@@ -15,7 +15,7 @@ namespace DW5S.App.UserControl
 {
     public partial class CtrlCdbTx : DevExpress.XtraEditors.XtraUserControl
     {
-        readonly List<TxInfo> list = new List<TxInfo>();
+        readonly List<CdbTxViewModel> list = new List<CdbTxViewModel>();
         public CtrlCdbTx()
         {
             InitializeComponent();
@@ -26,12 +26,12 @@ namespace DW5S.App.UserControl
             {
                 gridCdbTx.UseDefault(list).UseMultiSelect().UseRowNumber()
                     .UseAddAsync(Add)
-                    .UseEditAsync<TxInfo>(Edit)
-                    .UseDeleteAsync<TxInfo>(Delete);
+                    .UseEditAsync<CdbTxViewModel>(Edit)
+                    .UseDeleteAsync<CdbTxViewModel>(Delete);
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsCdbTx = unitOfWork.Of<TxInfo>();
                 var items = await repsCdbTx.FindAsync(f => f.TxType == EnumTxType.Cdb, p => p.Name);
-                list.AddRange(items);
+                list.AddRange(items.To<List<CdbTxViewModel>>());
 
             }
             catch (Exception ex)
@@ -42,18 +42,19 @@ namespace DW5S.App.UserControl
             }
         }
 
-        private async Task<TxInfo> Add()
+        private async Task<CdbTxViewModel> Add()
         {
             try
             {
                 CdbEditor frm = new CdbEditor();
                 if (frm.ShowDialog() != DialogResult.OK) return null;
-                var addItem = frm.info;
+                var addItem = frm.info.To<TxInfo>();
+                addItem.TxType = EnumTxType.Cdb;
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsCdbTx = unitOfWork.Of<TxInfo>();
-                await repsCdbTx.AddOrUpdateAsync(addItem);
+               var res = await repsCdbTx.AddOrUpdateAsync(addItem);
                 await unitOfWork.SaveAsync();
-                return addItem;
+                return res.To<CdbTxViewModel>();
             }
             catch (Exception ex)
             {
@@ -64,7 +65,7 @@ namespace DW5S.App.UserControl
             }
         }
 
-        private async Task<TxInfo> Edit(TxInfo editItem)
+        private async Task<CdbTxViewModel> Edit(CdbTxViewModel editItem)
         {
             try
             {
@@ -80,7 +81,6 @@ namespace DW5S.App.UserControl
                 find.Remark = editItem.Remark;
                 await repsCdbTx.AddOrUpdateAsync(find);
                 await unitOfWork.SaveAsync();
-
                 return editItem;
             }
             catch (Exception ex)
@@ -92,13 +92,13 @@ namespace DW5S.App.UserControl
             }
         }
 
-        private async Task<bool> Delete(List<TxInfo> list)
+        private async Task<bool> Delete(List<CdbTxViewModel> list)
         {
             try
             {
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsCdbTx = unitOfWork.Of<TxInfo>();
-                await repsCdbTx.DeleteAsync(list);
+                await repsCdbTx.DeleteAsync(list.To<List<TxInfo>>());
                 await unitOfWork.SaveAsync();
                 return true;
             }
@@ -113,7 +113,7 @@ namespace DW5S.App.UserControl
 
         private async void gridView1_DoubleClick(object sender, EventArgs e)
         {
-            var editItem = gridView.GetFocusedRow() as TxInfo;
+            var editItem = gridView.GetFocusedRow() as CdbTxViewModel;
             if (editItem == null) return;
             await Edit(editItem);
         }

DW5S.App/UserControl/CtrlCxTx.cs

@@ -17,7 +17,7 @@ namespace DW5S.App.UserControl
     {
         
         
-        readonly List<TxInfo> list = new List<TxInfo>();
+        readonly List<CxTxViewModel> list = new List<CxTxViewModel>();
         public CtrlCxTx()
         {
             InitializeComponent();
@@ -28,12 +28,12 @@ namespace DW5S.App.UserControl
             {
                 gridRefTx.UseDefault(list).UseMultiSelect().UseRowNumber()
                     .UseAddAsync(Add)
-                    .UseEditAsync<TxInfo>(Edit)
-                    .UseDeleteAsync<TxInfo>(Delete);
+                    .UseEditAsync<CxTxViewModel>(Edit)
+                    .UseDeleteAsync<CxTxViewModel>(Delete);
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsCxTx = unitOfWork.Of<TxInfo>();
                 var items = await repsCxTx.FindAsync(f=>f.TxType== EnumTxType.Cx, p => p.Name);
-                list.AddRange(items);
+                list.AddRange(items.To<List<CxTxViewModel>>());
             }
             catch (Exception ex)
             {
@@ -43,18 +43,19 @@ namespace DW5S.App.UserControl
             }
         }
 
-        private async Task<TxInfo> Add()
+        private async Task<CxTxViewModel> Add()
         {
             try
             {
                 CxEditor frm = new CxEditor();
                 if (frm.ShowDialog() != DialogResult.OK) return null;
-                var addItem = frm.info;
+                var addItem = frm.info.To<TxInfo>();
+                addItem.TxType = EnumTxType.Cx;
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsCxTx = unitOfWork.Of<TxInfo>();
-                await repsCxTx.AddOrUpdateAsync(addItem);
+                var res = await repsCxTx.AddOrUpdateAsync(addItem);
                 await unitOfWork.SaveAsync();
-                return addItem;
+                return res.To<CxTxViewModel>();
             }
             catch (Exception ex)
             {
@@ -65,7 +66,7 @@ namespace DW5S.App.UserControl
             }
         }
 
-        private async Task<TxInfo> Edit(TxInfo editItem)
+        private async Task<CxTxViewModel> Edit(CxTxViewModel editItem)
         {
             try
             {
@@ -92,13 +93,13 @@ namespace DW5S.App.UserControl
             }
         }
 
-        private async Task<bool> Delete(List<TxInfo> list)
+        private async Task<bool> Delete(List<CxTxViewModel> list)
         {
             try
             {
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsCxTx = unitOfWork.Of<TxInfo>();
-                await repsCxTx.DeleteAsync(list);
+                await repsCxTx.DeleteAsync(list.To<List<TxInfo>>());
                 await unitOfWork.SaveAsync();
                 return true;
             }
@@ -113,7 +114,7 @@ namespace DW5S.App.UserControl
 
         private async void gridView1_DoubleClick(object sender, EventArgs e)
         {
-            var editItem = gridView.GetFocusedRow() as TxInfo;
+            var editItem = gridView.GetFocusedRow() as CxTxViewModel;
             if (editItem == null) return;
             await Edit(editItem);
         }

DW5S.App/UserControl/CtrlRecTx.cs

@@ -48,12 +48,13 @@ namespace DW5S.App.UserControl
             {
                 RecEditor frm = new RecEditor();
                 if (frm.ShowDialog() != DialogResult.OK) return null;
-                var addItem = frm.info;
+                var addItem = frm.info.To<TxInfo>();
+                addItem.TxType = EnumTxType.Rec;
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsRecTx = unitOfWork.Of<TxInfo>();
                var res = await repsRecTx.AddOrUpdateAsync(addItem);
                 await unitOfWork.SaveAsync();
-                return addItem.To<RecTxViewModel>();
+                return res.To<RecTxViewModel>();
             }
             catch (Exception ex)
             {
@@ -78,7 +79,6 @@ namespace DW5S.App.UserControl
                 find.Lon = editItem.Lon;
                 find.Lat = editItem.Lat;
                 find.Remark = editItem.Remark;
-                find.TxType = EnumTxType.Rec;
                 await repsRecTx.AddOrUpdateAsync(find);
                 await unitOfWork.SaveAsync();
                 return editItem.To<RecTxViewModel>();

DW5S.App/UserControl/CtrlRefTx.cs

@@ -15,7 +15,7 @@ namespace DW5S.App.UserControl
 {
     public partial class CtrlRefTx : DevExpress.XtraEditors.XtraUserControl
     {
-        readonly List<TxInfo> list = new List<TxInfo>();
+        readonly List<RefTxViewModel> list = new List<RefTxViewModel>();
         public CtrlRefTx()
         {
             InitializeComponent();
@@ -26,12 +26,12 @@ namespace DW5S.App.UserControl
             {
                 gridRefTx.UseDefault(list).UseMultiSelect().UseRowNumber()
                     .UseAddAsync(Add)
-                    .UseEditAsync<TxInfo>(Edit)
-                    .UseDeleteAsync<TxInfo>(Delete);
+                    .UseEditAsync<RefTxViewModel>(Edit)
+                    .UseDeleteAsync<RefTxViewModel>(Delete);
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsRefTx = unitOfWork.Of<TxInfo>();
                 var items = await repsRefTx.FindAsync(f => f.TxType == EnumTxType.Ref, p => p.Name);
-                list.AddRange(items);
+                list.AddRange(items.To<List<RefTxViewModel>>());
             }
             catch (Exception ex)
             {
@@ -41,18 +41,19 @@ namespace DW5S.App.UserControl
             }
         }
 
-        private async Task<TxInfo> Add()
+        private async Task<RefTxViewModel> Add()
         {
             try
             {
                 RefEditor frm = new RefEditor();
                 if (frm.ShowDialog() != DialogResult.OK) return null;
-                var addItem = frm.info;
+                var addItem = frm.info.To<TxInfo>();
+                addItem.TxType = EnumTxType.Ref;
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsRefTx = unitOfWork.Of<TxInfo>();
-              var ss=  await repsRefTx.AddOrUpdateAsync(addItem);
-               var res= await unitOfWork.SaveAsync();
-                return addItem;
+                var res=  await repsRefTx.AddOrUpdateAsync(addItem);
+                await unitOfWork.SaveAsync();
+                return res.To<RefTxViewModel>();
             }
             catch (Exception ex)
             {
@@ -63,7 +64,7 @@ namespace DW5S.App.UserControl
             }
         }
 
-        private async Task<TxInfo> Edit(TxInfo editItem)
+        private async Task<RefTxViewModel> Edit(RefTxViewModel editItem)
         {
             try
             {
@@ -90,13 +91,13 @@ namespace DW5S.App.UserControl
             }
         }
 
-        private async Task<bool> Delete(List<TxInfo> list)
+        private async Task<bool> Delete(List<RefTxViewModel> list)
         {
             try
             {
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsRefTx = unitOfWork.Of<TxInfo>();
-                await repsRefTx.DeleteAsync(list);
+                await repsRefTx.DeleteAsync(list.To<List<TxInfo>>());
                 await unitOfWork.SaveAsync();
                 return true;
             }
@@ -111,7 +112,7 @@ namespace DW5S.App.UserControl
 
         private async void gridView1_DoubleClick(object sender, EventArgs e)
         {
-            var editItem = gridView.GetFocusedRow() as TxInfo;
+            var editItem = gridView.GetFocusedRow() as RefTxViewModel;
             if (editItem == null) return;
             await Edit(editItem);
         }