feat(api): Repository仓库添加，还未结束

aehyok · Jan 22, 2022 · 32314dc · 32314dc
1 parent 25d995a
commit 32314dc
Show file tree

Hide file tree

Showing 23 changed files with 163 additions and 46 deletions.
diff --git a/dotnet6/aehyok.Base/BaseEntity.cs b/dotnet6/aehyok.Base/BaseEntity.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace aehyok.Base
+{
+    public abstract class BaseEntity
+    {
+        [Key]
+        public string Id { get; set; }
+
+        public BaseEntity()
+        {
+            Id = Guid.NewGuid().ToString();
+        }
+    }
+}
diff --git a/dotnet6/aehyok.Core/Data/IDependency.cs → dotnet6/aehyok.Base/IDependency.cs b/dotnet6/aehyok.Core/Data/IDependency.cs → dotnet6/aehyok.Base/IDependency.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace aehyok.Core.Data
+namespace aehyok.Base
 {
     /// <summary>
     /// 依赖注入接口，表示该接口的实现类将自动注册到IoC容器中

diff --git a/dotnet6/aehyok.Base/aehyok.Base.csproj b/dotnet6/aehyok.Base/aehyok.Base.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/....EntityFrameCore.MySql/Data/MyDbConext.cs → ...EntityFrameCore.MySql/Data/MyDbContext.cs b/....EntityFrameCore.MySql/Data/MyDbConext.cs → ...EntityFrameCore.MySql/Data/MyDbContext.cs
@@ -6,13 +6,13 @@
 
 namespace aehyok.Core.EntityFrameCore.MySql.Data
 {
-    public partial class MyDbConext : DbContext
+    public partial class MyDbContext : DbContext
     {
-        public MyDbConext()
+        public MyDbContext()
         {
         }
 
-        public MyDbConext(DbContextOptions<MyDbConext> options)
+        public MyDbContext(DbContextOptions<MyDbContext> options)
             : base(options)
         {
         }

diff --git a/dotnet6/aehyok.Core.EntityFrameCore.MySql/IRepository.cs b/dotnet6/aehyok.Core.EntityFrameCore.MySql/IRepository.cs
@@ -0,0 +1,27 @@
+using System;
+using Microsoft.EntityFrameworkCore;
+using aehyok.Base;
+
+namespace aehyok.Core.EntityFrameCore.MySql
+{
+    public interface IRepository<TEntity> where TEntity : BaseEntity
+    {
+        DbSet<TEntity> Entities { get; }
+
+        //增加单个实体
+        Task<int> Insert(TEntity entity);
+
+        //增加多个实体
+        //int Insert(IEnumerable<TEntity> entities);
+
+        //更新实体
+        Task<int> Update(TEntity entity);
+
+        //删除
+        Task<int> Delete(object id);
+
+        //根据逐渐获取实体
+        Task<TEntity> GetByKey(object key);
+    }
+}
+
diff --git a/dotnet6/aehyok.Core.EntityFrameCore.MySql/Models/FlowEntityType.cs b/dotnet6/aehyok.Core.EntityFrameCore.MySql/Models/FlowEntityType.cs
@@ -1,11 +1,12 @@
 using System;
 using System.Collections.Generic;
+using aehyok.Base;
 
 namespace aehyok.Core.EntityFrameCore.MySql.Models
 {
-    public partial class FlowEntityType
+    public partial class FlowEntityType: BaseEntity
     {
-        public string Id { get; set; } = null!;
+        //public string Id { get; set; } = null!;
         public string? FlowName { get; set; }
         public string? Description { get; set; }
         public int? DisplayOrder { get; set; }

diff --git a/dotnet6/aehyok.Core.EntityFrameCore.MySql/Repository.cs b/dotnet6/aehyok.Core.EntityFrameCore.MySql/Repository.cs
@@ -0,0 +1,55 @@
+using System;
+using aehyok.Base;
+using aehyok.Core.EntityFrameCore.MySql.Data;
+using Microsoft.EntityFrameworkCore;
+
+namespace aehyok.Core.EntityFrameCore.MySql
+{
+    public abstract class Repository<TEntity> : IRepository<TEntity> where TEntity : BaseEntity
+    {
+        MyDbContext EF = new MyDbContext();
+
+        public DbSet<TEntity> Entities
+        {
+            get { return EF.Set<TEntity>(); }
+        }
+
+        DbSet<TEntity> IRepository<TEntity>.Entities => throw new NotImplementedException();
+
+        public async Task<int> Insert(TEntity entity)
+        {
+            Entities.Add(entity);
+            return await EF.SaveChangesAsync();
+        }
+
+        public async Task<int> Insert(IEnumerable<TEntity> entities)
+        {
+            Entities.AddRange(entities);
+            return await EF.SaveChangesAsync();
+        }
+
+        public async Task<int> Update(TEntity entity)
+        {
+            EF.Entry(entity).State = EntityState.Modified;
+            return await EF.SaveChangesAsync();
+        }
+
+        public async Task<int> Delete(object id)
+        {
+            ///删除操作实现
+            var item = await Entities.FindAsync(id);
+            if(item != null)
+            {
+                EF.Remove<TEntity>(item);
+                return await EF.SaveChangesAsync();
+            }
+            return 0;
+        }
+
+        public async Task<TEntity> GetByKey(object key)
+        {
+            return await Entities.FindAsync(key);
+        }
+    }
+}
+
diff --git a/dotnet6/aehyok.Core.EntityFrameCore.MySql/aehyok.Core.EntityFrameCore.MySql.csproj b/dotnet6/aehyok.Core.EntityFrameCore.MySql/aehyok.Core.EntityFrameCore.MySql.csproj
@@ -19,4 +19,7 @@
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\aehyok.Base\aehyok.Base.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/dotnet6/aehyok.Core.Manager.sln b/dotnet6/aehyok.Core.Manager.sln
@@ -32,6 +32,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "aehyok.Lib", "aehyok.Lib\ae
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aehyok.Core.EntityFrameCore.MySql", "aehyok.Core.EntityFrameCore.MySql\aehyok.Core.EntityFrameCore.MySql.csproj", "{E140DF87-F4B0-4263-89DB-C23F33F6D7B3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aehyok.Base", "aehyok.Base\aehyok.Base.csproj", "{6690349F-F5F1-4674-B96B-1019810DD127}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -86,6 +88,10 @@ Global
 		{E140DF87-F4B0-4263-89DB-C23F33F6D7B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E140DF87-F4B0-4263-89DB-C23F33F6D7B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E140DF87-F4B0-4263-89DB-C23F33F6D7B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6690349F-F5F1-4674-B96B-1019810DD127}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6690349F-F5F1-4674-B96B-1019810DD127}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6690349F-F5F1-4674-B96B-1019810DD127}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6690349F-F5F1-4674-B96B-1019810DD127}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/dotnet6/aehyok.Core.Repository/FlowRepository.cs b/dotnet6/aehyok.Core.Repository/FlowRepository.cs
@@ -14,7 +14,7 @@ public class FlowRepository : IFlowRepository
     {
         public async Task<int> DeleteFlowEntityType(string flowId)
         {
-            var context = new MyDbConext();
+            var context = new MyDbContext();
             var item = context.FlowEntityTypes.FirstOrDefault(t => t.Id == flowId);
             context.FlowEntityTypes.Remove(item);
             var result = await context.SaveChangesAsync();
@@ -23,48 +23,48 @@ public async Task<int> DeleteFlowEntityType(string flowId)
 
         public Task<FlowEntityState> GetFlowEntityState(string stateId)
         {
-            var context = new MyDbConext();
+            var context = new MyDbContext();
             var result = context.FlowEntityStates.FirstOrDefaultAsync(t => t.Id == stateId);
             return result;
         }
 
         public async Task<List<FlowEntityState>> GetFlowEntityStateList(string flowId)
         {
-            var context = new MyDbConext();
+            var context = new MyDbContext();
             var list = await context.FlowEntityStates.Where(item => item.FlowId == flowId).ToListAsync();
             return list;
         }
 
         public Task<List<FlowStateTransition>> GetFlowEntityTransitionList(string stateId)
         {
-            var context = new MyDbConext();
+            var context = new MyDbContext();
             var result = context.FlowStateTransitions.Where(t => t.StateId == stateId).ToListAsync();
             return result;
         }
 
         public async Task<List<FlowStateTransition>> GetFlowEntityTransitions(string stateId)
         {
-            var context = new MyDbConext();
+            var context = new MyDbContext();
             var list = await context.FlowStateTransitions.Where(item => item.StateId == stateId).ToListAsync();
             return list;
         }
 
         public Task<FlowEntityType> GetFlowEntityType(string flowId)
         {
-            var context = new MyDbConext();
+            var context = new MyDbContext();
             return context.FlowEntityTypes.FirstOrDefaultAsync(t => t.Id == flowId);
         }
 
         public async Task<List<FlowEntityType>> GetFlowEntityTypeList()
         {
-            var context = new MyDbConext();
+            var context = new MyDbContext();
             var list = await context.FlowEntityTypes.ToListAsync();
             return list;
         }
 
         public Task<FlowStateTransition> GetFlowStateTransition(string actionId)
         {
-            var context = new MyDbConext();
+            var context = new MyDbContext();
             var result = context.FlowStateTransitions.FirstOrDefaultAsync(t => t.Id == actionId);
             return result;
         }
@@ -73,14 +73,14 @@ public async Task<int> SaveFlowEntityState(FlowEntityState flowEntityState)
         {
             if (flowEntityState != null && flowEntityState.Id != null)
             {
-                var context = new MyDbConext();
+                var context = new MyDbContext();
                 context.Update(flowEntityState);
                 var result = await context.SaveChangesAsync();
                 return result;
             }
             else
             {
-                var context = new MyDbConext();
+                var context = new MyDbContext();
                 await context.FlowEntityStates.AddAsync(flowEntityState);
                 var result = await context.SaveChangesAsync();
                 return result;
@@ -91,14 +91,14 @@ public async Task<int> SaveFlowEntityType(FlowEntityType flowEntityType)
         {
             if (flowEntityType != null && flowEntityType.Id != null)
             {
-                var context = new MyDbConext();
+                var context = new MyDbContext();
                 context.Update(flowEntityType);
                 var result = await context.SaveChangesAsync();
                 return result;
             }
             else
             {
-                var context = new MyDbConext();
+                var context = new MyDbContext();
                 await context.FlowEntityTypes.AddAsync(flowEntityType);
                 var result = await context.SaveChangesAsync();
                 return result;
@@ -110,14 +110,14 @@ public async Task<int> SaveFlowStateTransition(FlowStateTransition flowStateTran
         {
             if (flowStateTransition != null && flowStateTransition.Id != null)
             {
-                var context = new MyDbConext();
+                var context = new MyDbContext();
                 context.Update(flowStateTransition);
                 var result = await context.SaveChangesAsync();
                 return result;
             }
             else
             {
-                var context = new MyDbConext();
+                var context = new MyDbContext();
                 await context.FlowStateTransitions.AddAsync(flowStateTransition);
                 var result = await context.SaveChangesAsync();
                 return result;

diff --git a/dotnet6/aehyok.Core.Repository/aehyok.Core.Repository.csproj b/dotnet6/aehyok.Core.Repository/aehyok.Core.Repository.csproj
@@ -8,5 +8,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\aehyok.Core\aehyok.Core.csproj" />
+    <ProjectReference Include="..\aehyok.Core.EntityFrameCore.MySql\aehyok.Core.EntityFrameCore.MySql.csproj" />
   </ItemGroup>
 </Project>
diff --git a/dotnet6/aehyok.Core.WebApi/Controllers/FlowController.cs b/dotnet6/aehyok.Core.WebApi/Controllers/FlowController.cs
@@ -1,4 +1,5 @@
-using aehyok.Core.EntityFrameCore.MySql.Models;
+using aehyok.Core.EntityFrameCore.MySql;
+using aehyok.Core.EntityFrameCore.MySql.Models;
 using aehyok.Core.IRepository;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
@@ -13,6 +14,7 @@ namespace aehyok.Core.WebApi.Controllers
     public class FlowController : BaseApiController
     {
         private readonly IFlowRepository _flowRepository;
+        //private readonly IRepository<FlowEntityType> _repository;
 
         public FlowController(IFlowRepository flowRepository)
         {

diff --git a/dotnet6/aehyok.Core.WebApi/Controllers/UserController.cs b/dotnet6/aehyok.Core.WebApi/Controllers/UserController.cs
@@ -27,7 +27,7 @@ public List<BaseUser> GetUserList(int pageIndex =0 )
         {
             try
             {
-                var context = new MyDbConext();
+                var context = new MyDbContext();
                 int pagesize = 10; 
                 var list = context.BaseUsers.Where(item=> item.IsDeleted==false).OrderByDescending(item => item.CreatedAt).Skip(pagesize * pageIndex).Take(pagesize).ToList();
                 this._logger.Info(list.Count);
@@ -50,7 +50,7 @@ public async Task<BaseUser> GetUser(int id)
         {
             try
             {
-                var context = new MyDbConext();
+                var context = new MyDbContext();
                 var user = await context.BaseUsers.FindAsync(id);
                 return user;
             }
@@ -74,7 +74,7 @@ public async Task<bool> SaveUser(BaseUser user)
                 this._logger.Info(user.Id);
                 if(user!=null  && user.Id > 0)
                 {
-                    var context = new MyDbConext();
+                    var context = new MyDbContext();
                     user.CreatedAt = DateTime.Now;
                     user.IsDeleted = false;
                     user.UpdatedAt = DateTime.Now;
@@ -85,7 +85,7 @@ public async Task<bool> SaveUser(BaseUser user)
                 else
                 {
                     this._logger.Info(user);
-                    var context = new MyDbConext();
+                    var context = new MyDbContext();
                     user.IsDeleted = false;
                     user.CreatedAt= DateTime.Now;
                     user.UpdatedAt = DateTime.Now;
@@ -111,7 +111,7 @@ public async Task<bool> SaveUser(BaseUser user)
         [AllowAnonymous]
         public async Task<bool> DeleteUser(int id)
         {
-            var context = new MyDbConext();
+            var context = new MyDbContext();
             var user = await context.BaseUsers.FindAsync(id);
             user.IsDeleted = true;
             context.Update(user);

diff --git a/dotnet6/aehyok.Core/Data/BaseEntity.cs b/dotnet6/aehyok.Core/Data/BaseEntity.cs
diff --git a/dotnet6/aehyok.Core/DataBase/IDbAccossor.cs b/dotnet6/aehyok.Core/DataBase/IDbAccossor.cs
@@ -1,4 +1,5 @@
-using aehyok.Core.Data;
+using aehyok.Base;
+using aehyok.Core.Data;
 using System;
 using System.Collections.Generic;
 using System.Data;

diff --git a/dotnet6/aehyok.Core/IRepository/IAccountRepository.cs b/dotnet6/aehyok.Core/IRepository/IAccountRepository.cs
@@ -1,4 +1,5 @@
-using aehyok.Core.Data;
+using aehyok.Base;
+using aehyok.Core.Data;
 using System;
 using System.Collections.Generic;
 using System.Text;