基础信息管理

DW5S.App/EditForms/CdbEditor.cs

@@ -2,6 +2,7 @@
 using DW5S.Entity;
 using DW5S.Repostory;
 using DW5S.Service;
+using DW5S.ViewModel;
 using ExtensionsDev;
 using Serilog;
 using System;

DW5S.App/EditForms/CxEditor.cs

@@ -2,6 +2,7 @@
 using DW5S.Entity;
 using DW5S.Repostory;
 using DW5S.Service;
+using DW5S.ViewModel;
 using ExtensionsDev;
 using Serilog;
 using System;

DW5S.App/EditForms/RecEditor.cs

@@ -2,6 +2,7 @@
 using DW5S.Entity;
 using DW5S.Repostory;
 using DW5S.Service;
+using DW5S.ViewModel;
 using ExtensionsDev;
 using Newtonsoft.Json;
 using Serilog;

DW5S.App/EditForms/RefEditor.cs

@@ -2,6 +2,7 @@
 using DW5S.Entity;
 using DW5S.Repostory;
 using DW5S.Service;
+using DW5S.ViewModel;
 using ExtensionsDev;
 using Serilog;
 using System;

DW5S.App/EditForms/TargetEditor.cs

@@ -16,6 +16,7 @@ using DW5S.Entity;
 using DW5S.Repostory;
 using Serilog;
 using DW5S.Service;
+using DW5S.ViewModel;
 
 namespace DW5S.App.EditForms
 {
@@ -23,18 +24,18 @@ namespace DW5S.App.EditForms
     {
         
         
-        public TargetInfo info;
+        public TargetViewModel info;
 
-        List<TargetInfo> infos;
+        List<TargetViewModel> infos;
         public TargetEditor()
         {
             InitializeComponent();
             this.layoutControl1.UseDefault();
             this.Text = "添加目标";
-            info = new TargetInfo();
+            info = new TargetViewModel();
             this.StartPosition = FormStartPosition.CenterParent;
         }
-        public TargetEditor(TargetInfo info)
+        public TargetEditor(TargetViewModel info)
             : this()
         {
             this.Text = "编辑目标";
@@ -48,11 +49,11 @@ namespace DW5S.App.EditForms
                 var clolrRes = ColorTranslator.FromHtml(info.TargeColor);
                 this.txtTarColor.EditValue = clolrRes;
             }
-            infos = new List<TargetInfo>();
+            infos = new List<TargetViewModel>();
             var unitOfWork = IocContainer.UnitOfWork;
             var repsTarget = unitOfWork.Of<TargetInfo>();
             var res = await repsTarget.GetAllAsync();
-            infos.AddRange(res);
+            infos.AddRange(res.To<List<TargetViewModel>>());
         }
 
         private void btnCancel_Click(object sender, EventArgs e)

DW5S.App/UserControl/CtrlCdbTx.cs

@@ -3,6 +3,7 @@ using DW5S.App.EditForms;
 using DW5S.Entity;
 using DW5S.Repostory;
 using DW5S.Service;
+using DW5S.ViewModel;
 using Serilog;
 using System;
 using System.Collections.Generic;

DW5S.App/UserControl/CtrlCxTx.cs

@@ -3,6 +3,7 @@ using DW5S.App.EditForms;
 using DW5S.Entity;
 using DW5S.Repostory;
 using DW5S.Service;
+using DW5S.ViewModel;
 using Serilog;
 using System;
 using System.Collections.Generic;

DW5S.App/UserControl/CtrlRecTx.cs

@@ -11,6 +11,7 @@ using DW5S.Repostory;
 using Microsoft.Extensions.Logging;
 using DW5S.Service;
 using Newtonsoft.Json;
+using DW5S.ViewModel;
 
 namespace DW5S.App.UserControl
 {

DW5S.App/UserControl/CtrlRefTx.cs

@@ -3,6 +3,7 @@ using DW5S.App.EditForms;
 using DW5S.Entity;
 using DW5S.Repostory;
 using DW5S.Service;
+using DW5S.ViewModel;
 using Serilog;
 using System;
 using System.Collections.Generic;

DW5S.App/UserControl/CtrlTarget.cs

@@ -18,12 +18,13 @@ using DW5S.Entity;
 using DW5S.Repostory;
 using Serilog;
 using DW5S.Service;
+using DW5S.ViewModel;
 
 namespace DW5S.App.UserControl
 {
     public partial class CtrlTarget : DevExpress.XtraEditors.XtraUserControl
     {
-        readonly List<TargetInfo> list = new List<TargetInfo>();
+        readonly List<TargetViewModel> list = new List<TargetViewModel>();
         public CtrlTarget()
         {
             InitializeComponent();
@@ -33,12 +34,14 @@ namespace DW5S.App.UserControl
             try
             {
                 gridTar.UseDefault(list).UseMultiSelect().UseRowNumber()
-                    .UseAddAsync(Add).UseEditAsync<TargetInfo>(Edit).UseDeleteAsync<TargetInfo>(Del);
+                    .UseAddAsync(Add)
+                    .UseEditAsync<TargetViewModel>(Edit)
+                    .UseDeleteAsync<TargetViewModel>(Del);
 
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsTarget = unitOfWork.Of<TargetInfo>();
                 var res = await repsTarget.GetAllAsync(p => p.TargetName);
-                list.AddRange(res);
+                list.AddRange(res.To<List<TargetViewModel>>());
                 gridView1.RefreshData();
             }
             catch (Exception ex)
@@ -49,7 +52,7 @@ namespace DW5S.App.UserControl
             }
         }
 
-        private async Task<TargetInfo> Add()
+        private async Task<TargetViewModel> Add()
         {
             try
             {
@@ -58,9 +61,9 @@ namespace DW5S.App.UserControl
                 var addItem = frm.info;
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsTarget = unitOfWork.Of<TargetInfo>();
-                await repsTarget.AddOrUpdateAsync(addItem);
+                var res = await repsTarget.AddOrUpdateAsync(addItem.To<TargetInfo>());
                 await unitOfWork.SaveAsync();
-                return addItem;
+                return res.To<TargetViewModel>();
             }
             catch (Exception ex)
             {
@@ -70,7 +73,7 @@ namespace DW5S.App.UserControl
                 return null;
             }
         }
-        private async Task<TargetInfo> Edit(TargetInfo editItem)
+        private async Task<TargetViewModel> Edit(TargetViewModel editItem)
         {
             try
             {
@@ -95,14 +98,13 @@ namespace DW5S.App.UserControl
                 return null;
             }
         }
-        private async Task<bool> Del(List<TargetInfo> list)
+        private async Task<bool> Del(List<TargetViewModel> list)
         {
             try
             {
-                var ids = list.Select(p => p.Id);
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsTarget = unitOfWork.Of<TargetInfo>();
-                await repsTarget.DeleteAsync(list);
+                await repsTarget.DeleteAsync(list.To<List<TargetInfo>>());
                 await unitOfWork.SaveAsync();
                 return true;
             }
@@ -127,7 +129,7 @@ namespace DW5S.App.UserControl
 
         private async void gridView1_DoubleClick(object sender, EventArgs e)
         {
-            var editItem = gridView1.GetFocusedRow() as TargetInfo;
+            var editItem = gridView1.GetFocusedRow() as TargetViewModel;
             if (editItem == null) return;
             await Edit(editItem);
         }

DW5S.ViewModel/CdbTxViewModel.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DW5S.Entity
+namespace DW5S.ViewModel
 {
     public class CdbTxViewModel : BaseViewModel<int>
     {

DW5S.ViewModel/CxTxViewModel.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DW5S.Entity
+namespace DW5S.ViewModel
 {
     public class CxTxViewModel :  BaseViewModel<int>
     {

DW5S.ViewModel/RecTxViewModel.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DW5S.Entity
+namespace DW5S.ViewModel
 {
     /// <summary>
     /// 天线信息

DW5S.ViewModel/RefTxViewModel.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DW5S.Entity
+namespace DW5S.ViewModel
 {
     public class RefTxViewModel  : BaseViewModel<int>
     {

DW5S.ViewModel/TargetViewModel.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Drawing;
+
+namespace DW5S.ViewModel
+{
+    /// <summary>
+    /// 目标信息
+    /// </summary>
+    public class TargetViewModel : BaseViewModel<int>
+    {
+        /// <summary>
+        /// 目标名称
+        /// </summary>
+        [Display(Name = "目标名称")]
+        public string TargetName { get; set; }
+
+        /// <summary>
+        /// 目标颜色
+        /// </summary>
+        [Display(Name = "目标颜色")]
+        public string TargeColor { get; set; }
+    }
+}