11

DW5S.App/EditForms/TaskEditor.Designer.cs

@@ -125,7 +125,7 @@
             this.btnSave.StyleController = this.layoutControl1;
             this.btnSave.TabIndex = 6;
             this.btnSave.Text = "保存";
-            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+            this.btnSave.Click += new System.EventHandler(this.btnSave_ClickAsync);
             // 
             // txtTaskName
             // 

DW5S.App/EditForms/TaskEditor.cs

@@ -24,11 +24,18 @@ using System.Windows.Forms;
 using DW5S.DTO;
 using DW5S.Entity;
 using DW5S.Repostory;
+using Microsoft.Extensions.Logging;
 
 namespace DW5S.App.EditForms
 {
     public partial class TaskEditor : DevExpress.XtraEditors.XtraForm
     {
+        [Autowired]
+        private readonly ILogger logger;
+
+        [Autowired]
+        private readonly UnitOfWork unitOfWork;
+
         public TaskInfo info;
         public List<SigInfo> selectedItem = new List<SigInfo>();
         public TaskEditor()
@@ -63,34 +70,28 @@ namespace DW5S.App.EditForms
 
         private async void TaskEditor_Load(object sender, EventArgs e)
         {
-            using (RHDWContext db = new RHDWContext())
-            {
-                var sats = await db.SatInfos.ToListAsync();
-                this.txtMainSat.UseDefault().SetData(sats, nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
-                this.txtAdja1Sat.UseDefault().SetData(sats, nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
-                this.txtAdja2Sat.UseDefault().SetData(sats, nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
-            }
+            var repsSat = unitOfWork.Reps<SatInfo>();
+            var sats = await repsSat.GetAllAsync();
+            this.txtMainSat.UseDefault().SetData(sats, nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
+            this.txtAdja1Sat.UseDefault().SetData(sats, nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
+            this.txtAdja2Sat.UseDefault().SetData(sats, nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
             if (this.Text.StartsWith("编辑任务") && info != null)
             {
-                using (RHDWContext db = new RHDWContext())
-                {
-                    var satMain = await db.SatInfos.Where(w => w.SatCode == info.MainSat).FirstOrDefaultAsync();
-                    var satAdja1 = await db.SatInfos.Where(w => w.SatCode == info.Adja1Sat).FirstOrDefaultAsync();
-                    var satAdja2 = await db.SatInfos.Where(w => w.SatCode == info.Adja2Sat).FirstOrDefaultAsync();
-
-                    this.txtTaskName.Text = info.TaskName;
-                    this.txtPosType.SelectedIndex = (int)info.PosType;
-                    this.txtTaskType.SelectedIndex = (int)info.TaskType;
-                    this.txtMainSat.EditValue = satMain;
-                    this.txtAdja1Sat.EditValue = satAdja1;
-                    this.txtAdja2Sat.EditValue = satAdja2;
-                    txtCapDir.Text = info.CapDir;
-                    txtCapDirFormat.Text = info.CapDirFormat;
-                }
+                var satMain = sats.FirstOrDefault(w => w.SatCode == info.MainSat);
+                var satAdja1 = sats.FirstOrDefault(w => w.SatCode == info.Adja1Sat);
+                var satAdja2 = sats.FirstOrDefault(w => w.SatCode == info.Adja2Sat);
+                this.txtTaskName.Text = info.TaskName;
+                this.txtPosType.SelectedIndex = (int)info.PosType;
+                this.txtTaskType.SelectedIndex = (int)info.TaskType;
+                this.txtMainSat.EditValue = satMain;
+                this.txtAdja1Sat.EditValue = satAdja1;
+                this.txtAdja2Sat.EditValue = satAdja2;
+                txtCapDir.Text = info.CapDir;
+                txtCapDirFormat.Text = info.CapDirFormat;
             }
         }
 
-        private void btnSave_Click(object sender, EventArgs e)
+        private async void btnSave_ClickAsync(object sender, EventArgs e)
         {
             try
             {
@@ -109,20 +110,20 @@ namespace DW5S.App.EditForms
 
                 if (this.Text == "添加任务")
                 {
-                    using (RHDWContext db = new RHDWContext())
+                    var repsTask = unitOfWork.Reps<TaskInfo>();
+
+                    if (await repsTask.FirstOrDefaultAsync(p => p.TaskName == txtTaskName.Text) != null)
                     {
-                        if (db.TaskInfos.Any(p => p.TaskName == txtTaskName.Text))
-                        {
-                            dxErrorProvider.SetError(txtTaskName, "任务名称重复");
-                            return;
-                        }
+                        dxErrorProvider.SetError(txtTaskName, "任务名称重复");
+                        return;
                     }
                 }
                 else
                 {
                     using (RHDWContext db = new RHDWContext())
                     {
-                        if (db.TaskInfos.Any(p => p.ID != info.ID && p.TaskName == txtTaskName.Text))
+                        if (await repsTask.FirstOrDefaultAsync(p => p.TaskName == txtTaskName.Text) != null)
+                            if (repsTask.FirstOrDefaultAsync(p => p.ID != info.ID && p.TaskName == txtTaskName.Text))
                         {
                             dxErrorProvider.SetError(txtTaskName, "任务名称重复");
                             return;

DW5S.App/EditForms/TaskEditorSignal.cs

@@ -6,7 +6,6 @@ using DevExpress.XtraEditors.Controls;
 using DevExpress.XtraEditors.DXErrorProvider;
 using DevExpress.XtraGrid;
 using DevExpress.XtraPrinting.Native;
-using DPP_YH_Core.Extensions;
 using DxHelper;
 using ExtensionsDev;
 using System;
@@ -14,7 +13,6 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Data;
-using System.Data.Entity;
 using System.Drawing;
 using System.Linq;
 using System.Reflection;

DW5S.App/ExtensionsDev/SearchLookUpEditExtension.cs

@@ -62,7 +62,7 @@ namespace ExtensionsDev
         /// <param name="ctrl"></param>
         /// <param name="data">数据源</param>
         /// <param name="displayField"></param>
-        public static SearchLookUpEdit SetData<T>(this SearchLookUpEdit ctrl, List<T> data, string displayField = "")
+        public static SearchLookUpEdit SetData<T>(this SearchLookUpEdit ctrl, IEnumerable<T> data, string displayField = "")
         {
             ctrl.QueryPopUp += Ctrl_QueryPopUp;
             ctrl.Properties.DataSource = data;

DW5S.App/Program.cs

@@ -8,8 +8,6 @@ using System.IO;
 using System.Reflection;
 using System.Security.Principal;
 using System.Windows.Forms;
-using DW5S.Framework;
-using DW5S.UI.Lib;
 using DW5S.WebApi;
 
 namespace DW5S