更新版本

API/TaskManager.EntityFramework/Repository/Repository.cs

@@ -55,10 +55,6 @@ namespace TaskManager.EntityFramework.Repository
 
         public async Task UpdateAsync(TEntity entity)
         {
-            //product 已前台更新后
-            _context.Attach(entity);
-            _context.Entry(entity).State = EntityState.Modified;
-
             _dbSet.Update(entity);
             await _context.SaveChangesAsync();
         }

API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs

@@ -151,7 +151,7 @@ namespace TaskManager.Controllers
                 return;
             }
             var sublist = _jobDbContext.TaskSub.Where(p => taskName.Contains(p.TaskName)  && p.WriteState == false && p.Subscriber == client ).ToList();
-            int pageSize = 50; 
+            int pageSize = 10; 
             if (!sublist.Any())
             {
                 foreach (var sub in sublist)

API/Wood.Service/Controllers/NormalBaseController.cs

@@ -74,17 +74,23 @@ namespace Wood.Service.Controllers
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        [HttpPut("{id}")]
+        [HttpPut]
+        [Route("Update/{UId}")]
         public async virtual Task<IActionResult> Update(T entity)
         {
+            if (entity.UId == 0)
+            {
+                throw new Exception("更新时，实体主键UId不能为空或0");
+            }
             var _first = await _repository.GetByIdAsync(entity.UId);
             if (_first == null)
             {
+                throw new Exception($"NormalBaseController.Update报错：根据UId{entity.UId}没有找到记录");
                 return new JsonResult(new { Code = 400, Message = "修改失败!" });
             }
+            EntityMapper.Trans(_first, entity, "UId");
 
-
-            await _repository.UpdateAsync(entity);
+            await _repository.UpdateAsync(_first);
             return new JsonResult(new { Code = 200, Message = "修改成功!" });
         }
         /// <summary>
@@ -313,6 +319,7 @@ namespace Wood.Service.Controllers
             }
             catch (Exception ex)
             {
+                throw new Exception("NormalBaseController.Import报错：" + ex.Message);
                // await _logger.AddError(ex.Message, TaskName);
                 return new JsonResult(new { Code = 400, Message = "导入失败!" });
             }

API/Wood.Service/Datas/SupplierEmployeeDtService.cs

@@ -82,7 +82,7 @@ namespace Wood.Service.Datas
                 //添加任务明细
                 foreach (var empDtObj in entityLst)
                 {
-                    SUPPLIER_EMPLOYEE empObj = ExpressionGenericMapper<SUPPLIER_EMPLOYEE_DT, SUPPLIER_EMPLOYEE>.Trans(empDtObj);
+                    SUPPLIER_EMPLOYEE empObj = EntityMapper<SUPPLIER_EMPLOYEE_DT, SUPPLIER_EMPLOYEE>.Trans(empDtObj);
                     empObj.TaskId = taskSubObj.TaskId;
                     await _supplierEmployeeRepository.AddAsync(empObj);
                 }
@@ -131,7 +131,7 @@ namespace Wood.Service.Datas
                 TaskSub taskSubObj = _commonService.BuildTaskSub(1, _taskName);
                 await _taskSubRepository.AddAsync(taskSubObj);
                 //添加任务明细
-                SUPPLIER_EMPLOYEE empObj = ExpressionGenericMapper<SUPPLIER_EMPLOYEE_DT, SUPPLIER_EMPLOYEE>.Trans(entity);
+                SUPPLIER_EMPLOYEE empObj = EntityMapper<SUPPLIER_EMPLOYEE_DT, SUPPLIER_EMPLOYEE>.Trans(entity);
                 empObj.TaskId = taskSubObj.TaskId;
                 await _supplierEmployeeRepository.AddAsync(empObj);
 
@@ -173,7 +173,7 @@ namespace Wood.Service.Datas
                 TaskSub taskSubObj = _commonService.BuildTaskSub(1, _taskName);
                 await _taskSubRepository.AddAsync(taskSubObj);
                 //添加任务明细
-                SUPPLIER_EMPLOYEE empObj = ExpressionGenericMapper<SUPPLIER_EMPLOYEE_DT, SUPPLIER_EMPLOYEE>.Trans(entity);
+                SUPPLIER_EMPLOYEE empObj = EntityMapper<SUPPLIER_EMPLOYEE_DT, SUPPLIER_EMPLOYEE>.Trans(entity);
                 empObj.TaskId = taskSubObj.TaskId;
                 await _supplierEmployeeRepository.AddAsync(empObj);
 

API/Wood.Service/Datas/SupplierInfoDtService.cs

@@ -81,7 +81,7 @@ namespace Wood.Service.Datas
                 //添加任务明细
                 foreach (var empDtObj in entityLst)
                 {
-                    SUPPLIER_INFO empObj = ExpressionGenericMapper<SUPPLIER_INFO_DT, SUPPLIER_INFO>.Trans(empDtObj);
+                    SUPPLIER_INFO empObj = EntityMapper<SUPPLIER_INFO_DT, SUPPLIER_INFO>.Trans(empDtObj);
                     empObj.TaskId = taskSubObj.TaskId;
                     await _supplierInfoRepository.AddAsync(empObj);
                 }
@@ -131,7 +131,7 @@ namespace Wood.Service.Datas
                 await _taskSubRepository.AddAsync(taskSubObj);
 
                 //添加任务明细
-                SUPPLIER_INFO empObj = ExpressionGenericMapper<SUPPLIER_INFO_DT, SUPPLIER_INFO>.Trans(entity);
+                SUPPLIER_INFO empObj = EntityMapper<SUPPLIER_INFO_DT, SUPPLIER_INFO>.Trans(entity);
                 empObj.TaskId = taskSubObj.TaskId;
                 await _supplierInfoRepository.AddAsync(empObj);
 
@@ -172,7 +172,7 @@ namespace Wood.Service.Datas
                 TaskSub taskSubObj = _commonService.BuildTaskSub(1, _taskName);
                 await _taskSubRepository.AddAsync(taskSubObj);
                 //添加任务明细
-                SUPPLIER_INFO empObj = ExpressionGenericMapper<SUPPLIER_INFO_DT, SUPPLIER_INFO>.Trans(entity);
+                SUPPLIER_INFO empObj = EntityMapper<SUPPLIER_INFO_DT, SUPPLIER_INFO>.Trans(entity);
                 empObj.TaskId = taskSubObj.TaskId;
                 await _supplierInfoRepository.AddAsync(empObj);
 

API/Wood.Service/Datas/SupplierProAttachmentDataDtService.cs

@@ -82,7 +82,7 @@ namespace Wood.Service.Datas
                 //添加任务明细
                 foreach (var empDtObj in entityLst)
                 {
-                    SUPPLIER_PRO_ATTACHMENT_DATA empObj = ExpressionGenericMapper<SUPPLIER_PRO_ATTACHMENT_DATA_DT, SUPPLIER_PRO_ATTACHMENT_DATA>.Trans(empDtObj);
+                    SUPPLIER_PRO_ATTACHMENT_DATA empObj = EntityMapper<SUPPLIER_PRO_ATTACHMENT_DATA_DT, SUPPLIER_PRO_ATTACHMENT_DATA>.Trans(empDtObj);
                     empObj.TaskId = taskSubObj.TaskId;
                     await _supplierProAttachmentDataRepository.AddAsync(empObj);
                 }
@@ -114,7 +114,7 @@ namespace Wood.Service.Datas
                 TaskSub taskSubObj = _commonService.BuildTaskSub(1, _taskName);
                 await _taskSubRepository.AddAsync(taskSubObj);
                 //添加任务明细
-                SUPPLIER_PRO_ATTACHMENT_DATA empObj = ExpressionGenericMapper<SUPPLIER_PRO_ATTACHMENT_DATA_DT, SUPPLIER_PRO_ATTACHMENT_DATA>.Trans(entity);
+                SUPPLIER_PRO_ATTACHMENT_DATA empObj = EntityMapper<SUPPLIER_PRO_ATTACHMENT_DATA_DT, SUPPLIER_PRO_ATTACHMENT_DATA>.Trans(entity);
                 empObj.TaskId = taskSubObj.TaskId;
                 await _supplierProAttachmentDataRepository.AddAsync(empObj);
 

API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs

@@ -82,7 +82,7 @@ namespace Wood.Service.Datas
                 //添加任务明细
                 foreach (var empDtObj in entityLst)
                 {
-                    SUPPLIER_PRO_PROCESS_EQUIPMENT empObj = ExpressionGenericMapper<SUPPLIER_PRO_PROCESS_EQUIPMENT_DT, SUPPLIER_PRO_PROCESS_EQUIPMENT>.Trans(empDtObj);
+                    SUPPLIER_PRO_PROCESS_EQUIPMENT empObj = EntityMapper<SUPPLIER_PRO_PROCESS_EQUIPMENT_DT, SUPPLIER_PRO_PROCESS_EQUIPMENT>.Trans(empDtObj);
                     empObj.TaskId = taskSubObj.TaskId;
                     await _supplierProProcessEquipmentRepository.AddAsync(empObj);
                 }
@@ -129,7 +129,7 @@ namespace Wood.Service.Datas
                 TaskSub taskSubObj = _commonService.BuildTaskSub(1, _taskName);
                 await _taskSubRepository.AddAsync(taskSubObj);
                 //添加任务明细
-                SUPPLIER_PRO_PROCESS_EQUIPMENT empObj = ExpressionGenericMapper<SUPPLIER_PRO_PROCESS_EQUIPMENT_DT, SUPPLIER_PRO_PROCESS_EQUIPMENT>.Trans(entity);
+                SUPPLIER_PRO_PROCESS_EQUIPMENT empObj = EntityMapper<SUPPLIER_PRO_PROCESS_EQUIPMENT_DT, SUPPLIER_PRO_PROCESS_EQUIPMENT>.Trans(entity);
                 empObj.TaskId = taskSubObj.TaskId;
                 await _supplierProProcessEquipmentRepository.AddAsync(empObj);
 
@@ -169,7 +169,7 @@ namespace Wood.Service.Datas
                 TaskSub taskSubObj = _commonService.BuildTaskSub(1, _taskName);
                 await _taskSubRepository.AddAsync(taskSubObj);
                 //添加任务明细
-                SUPPLIER_PRO_PROCESS_EQUIPMENT empObj = ExpressionGenericMapper<SUPPLIER_PRO_PROCESS_EQUIPMENT_DT, SUPPLIER_PRO_PROCESS_EQUIPMENT>.Trans(entity);
+                SUPPLIER_PRO_PROCESS_EQUIPMENT empObj = EntityMapper<SUPPLIER_PRO_PROCESS_EQUIPMENT_DT, SUPPLIER_PRO_PROCESS_EQUIPMENT>.Trans(entity);
                 empObj.TaskId = taskSubObj.TaskId;
                 await _supplierProProcessEquipmentRepository.AddAsync(empObj);
 

API/Wood.Util/CommonHelper.cs

@@ -65,10 +65,10 @@ namespace Wood.Util
     /// </summary>
     /// <typeparam name="TIn"></typeparam>
     /// <typeparam name="TOut"></typeparam>
-    public class ExpressionGenericMapper<TIn, TOut>//Mapper`2
+    public class EntityMapper<TIn, TOut>//Mapper`2
     {
         private static Func<TIn, TOut> _FUNC = null;
-        static ExpressionGenericMapper()
+        static EntityMapper()
         {
             ParameterExpression parameterExpression = Expression.Parameter(typeof(TIn), "p");
             List<MemberBinding> memberBindingList = new List<MemberBinding>();
@@ -96,4 +96,43 @@ namespace Wood.Util
             return _FUNC(t);
         }
     }
+
+
+    /// <summary>
+    /// 反射实现Mapper
+    /// </summary>
+    public class EntityMapper
+    {
+        /// <summary>
+        /// 反射
+        /// </summary>
+        /// <typeparam name="TIn"></typeparam>
+        /// <typeparam name="TOut"></typeparam>
+        /// <param name="tIn"></param>
+        /// <returns></returns>
+        public static void Trans<TIn, TOut>(TIn tIn, TOut tOut, string excludeMembers = "")
+        {
+            string[] excludeMemberArr = excludeMembers.Split(",").Select(itm => itm.Trim()).ToArray();
+
+            foreach (var itemOut in tOut.GetType().GetProperties())
+            {
+                if (excludeMemberArr.Contains(itemOut.Name))
+                {
+                    continue;
+                }
+                var propIn = tIn.GetType().GetProperty(itemOut.Name);
+                itemOut.SetValue(tOut, propIn.GetValue(tIn, null), null);
+            }
+
+            foreach (var itemOut in tOut.GetType().GetFields())
+            {
+                if (excludeMemberArr.Contains(itemOut.Name))
+                {
+                    continue;
+                }
+                var fieldIn = tIn.GetType().GetField(itemOut.Name);
+                itemOut.SetValue(tOut, fieldIn.GetValue(tIn));
+            }
+        }
+    }
 }