From 9c2d044d12248e29a47e41b359e6c69e627586dc Mon Sep 17 00:00:00 2001 From: yubaolee Date: Sat, 13 Mar 2021 16:21:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9B=AA=E8=8A=B1=E7=AE=97?= =?UTF-8?q?=E6=B3=95https://gitee.com/yitter/idgenerator=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AF=B9=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=BB=E9=94=AE?= =?UTF-8?q?=E4=B8=BAnumberic=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Infrastructure/Snowflake/IIdGenerator.cs | 11 + Infrastructure/Snowflake/ISnowWorker.cs | 13 + .../Snowflake/IdGeneratorOptions.cs | 65 ++++ Infrastructure/Snowflake/OverCostActionArg.cs | 26 ++ Infrastructure/Snowflake/SnowWorkerM1.cs | 296 ++++++++++++++++++ Infrastructure/Snowflake/SnowWorkerM2.cs | 49 +++ Infrastructure/Snowflake/YitIdGenerator.cs | 83 +++++ Infrastructure/Test/TestSnowflake.cs | 27 ++ OpenAuth.App/{ => Base}/BaseApp.cs | 252 +++++++-------- OpenAuth.App/Base/BaseLongApp.cs | 128 ++++++++ OpenAuth.App/{ => Base}/BaseTreeApp.cs | 0 OpenAuth.App/BuilderTableApp.cs | 2 +- OpenAuth.Repository/Core/LongEntity.cs | 32 ++ OpenAuth.Repository/Core/StringEntity.cs | 31 ++ OpenAuth.Repository/Core/TreeEntity.cs | 2 +- OpenAuth.Repository/Domain/Application.cs | 2 +- OpenAuth.Repository/Domain/BuilderTable.cs | 2 +- .../Domain/BuilderTableColumn.cs | 2 +- OpenAuth.Repository/Domain/Category.cs | 2 +- OpenAuth.Repository/Domain/CategoryType.cs | 2 +- .../Domain/DataPrivilegeRule.cs | 2 +- OpenAuth.Repository/Domain/FlowInstance.cs | 2 +- .../Domain/FlowInstanceOperationHistory.cs | 2 +- .../Domain/FlowInstanceTransitionHistory.cs | 2 +- OpenAuth.Repository/Domain/FlowScheme.cs | 2 +- OpenAuth.Repository/Domain/Form.cs | 2 +- OpenAuth.Repository/Domain/FrmLeaveReq.cs | 2 +- OpenAuth.Repository/Domain/ModuleElement.cs | 2 +- OpenAuth.Repository/Domain/OpenJob.cs | 2 +- OpenAuth.Repository/Domain/Relevance.cs | 2 +- OpenAuth.Repository/Domain/Role.cs | 2 +- OpenAuth.Repository/Domain/SysLog.cs | 2 +- OpenAuth.Repository/Domain/SysMessage.cs | 2 +- OpenAuth.Repository/Domain/UploadFile.cs | 2 +- OpenAuth.Repository/Domain/User.cs | 2 +- .../Domain/WmsInboundOrderDtbl.cs | 2 +- .../Domain/WmsInboundOrderTbl.cs | 2 +- OpenAuth.Repository/OpenAuthDBContext.cs | 1 - 38 files changed, 911 insertions(+), 151 deletions(-) create mode 100644 Infrastructure/Snowflake/IIdGenerator.cs create mode 100644 Infrastructure/Snowflake/ISnowWorker.cs create mode 100644 Infrastructure/Snowflake/IdGeneratorOptions.cs create mode 100644 Infrastructure/Snowflake/OverCostActionArg.cs create mode 100644 Infrastructure/Snowflake/SnowWorkerM1.cs create mode 100644 Infrastructure/Snowflake/SnowWorkerM2.cs create mode 100644 Infrastructure/Snowflake/YitIdGenerator.cs create mode 100644 Infrastructure/Test/TestSnowflake.cs rename OpenAuth.App/{ => Base}/BaseApp.cs (96%) create mode 100644 OpenAuth.App/Base/BaseLongApp.cs rename OpenAuth.App/{ => Base}/BaseTreeApp.cs (100%) create mode 100644 OpenAuth.Repository/Core/LongEntity.cs create mode 100644 OpenAuth.Repository/Core/StringEntity.cs diff --git a/Infrastructure/Snowflake/IIdGenerator.cs b/Infrastructure/Snowflake/IIdGenerator.cs new file mode 100644 index 00000000..a5ac5298 --- /dev/null +++ b/Infrastructure/Snowflake/IIdGenerator.cs @@ -0,0 +1,11 @@ +using System; + +namespace Yitter.IdGenerator +{ + public interface IIdGenerator + { + Action GenIdActionAsync { get; set; } + + long NewLong(); + } +} diff --git a/Infrastructure/Snowflake/ISnowWorker.cs b/Infrastructure/Snowflake/ISnowWorker.cs new file mode 100644 index 00000000..77393436 --- /dev/null +++ b/Infrastructure/Snowflake/ISnowWorker.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Yitter.IdGenerator +{ + internal interface ISnowWorker + { + Action GenAction { get; set; } + + long NextId(); + } +} diff --git a/Infrastructure/Snowflake/IdGeneratorOptions.cs b/Infrastructure/Snowflake/IdGeneratorOptions.cs new file mode 100644 index 00000000..f1b0a59e --- /dev/null +++ b/Infrastructure/Snowflake/IdGeneratorOptions.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Yitter.IdGenerator +{ + public class IdGeneratorOptions + { + /// + /// 雪花计算方法 + /// （1|2） + /// + public short Method { get; set; } = 1; + + /// + /// 开始时间（UTC格式） + /// 不能超过当前系统时间 + /// + public DateTime StartTime { get; set; } = DateTime.MinValue; + + /// + /// 机器码 + /// 与 WorkerIdBitLength 有关系 + /// + public ushort WorkerId { get; set; } = 0; + + /// + /// 机器码位长 + /// 范围：2-21（要求：序列数位长+机器码位长不超过22）。 + /// 建议范围：6-12。 + /// + public byte WorkerIdBitLength { get; set; } = 6;//10; + + /// + /// 序列数位长 + /// 范围：2-21（要求：序列数位长+机器码位长不超过22）。 + /// 建议范围：6-14。 + /// + public byte SeqBitLength { get; set; } = 6;//10; + + /// + /// 最大序列数（含） + /// （由SeqBitLength计算的最大值） + /// + public int MaxSeqNumber { get; set; } = 0; + + /// + /// 最小序列数（含） + /// 默认11，不小于5，不大于MaxSeqNumber-2 + /// + public ushort MinSeqNumber { get; set; } = 11; + + /// + /// 最大漂移次数（含）， + /// 默认2000，推荐范围500-10000（与计算能力有关） + /// + public int TopOverCostCount { get; set; } = 2000; + + + public IdGeneratorOptions() + { + + } + } +} diff --git a/Infrastructure/Snowflake/OverCostActionArg.cs b/Infrastructure/Snowflake/OverCostActionArg.cs new file mode 100644 index 00000000..89b5ea69 --- /dev/null +++ b/Infrastructure/Snowflake/OverCostActionArg.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Yitter.IdGenerator +{ + public class OverCostActionArg + { + public int ActionType { get; set; } + public long TimeTick { get; set; } + public ushort WorkerId { get; set; } + public int OverCostCountInOneTerm { get; set; } + public int GenCountInOneTerm { get; set; } + public int TermIndex { get; set; } + + public OverCostActionArg(ushort workerId, long timeTick, int actionType = 0, int overCostCountInOneTerm = 0, int genCountWhenOverCost = 0,int index=0) + { + ActionType = actionType; + TimeTick = timeTick; + WorkerId = workerId; + OverCostCountInOneTerm = overCostCountInOneTerm; + GenCountInOneTerm = genCountWhenOverCost; + TermIndex = index; + } + } +} diff --git a/Infrastructure/Snowflake/SnowWorkerM1.cs b/Infrastructure/Snowflake/SnowWorkerM1.cs new file mode 100644 index 00000000..765c52c0 --- /dev/null +++ b/Infrastructure/Snowflake/SnowWorkerM1.cs @@ -0,0 +1,296 @@ +using System; +using System.Threading; +using System.Threading.Tasks; + +namespace Yitter.IdGenerator +{ + /// + /// 雪花漂移算法 + /// + internal class SnowWorkerM1 : ISnowWorker + { + /// + /// 基础时间 + /// + protected readonly DateTime StartTimeUtc = new DateTime(2020, 2, 20, 2, 20, 2, 20, DateTimeKind.Utc); + + /// + /// 机器码 + /// + protected readonly ushort WorkerId = 0; + + /// + /// 机器码位长 + /// （机器码+序列数<=22位） + /// + protected readonly byte WorkerIdBitLength = 0; + + /// + /// 自增序列数位长 + /// （机器码+序列数<=22位） + /// + protected readonly byte SeqBitLength = 0; + + /// + /// 最大序列数（含此值） + /// 超过最大值，就会从MinSeqNumber开始 + /// + protected readonly int MaxSeqNumber = 0; + + /// + /// 最小序列数（含此值） + /// + protected readonly ushort MinSeqNumber = 0; + + /// + /// 最大漂移次数 + /// + protected readonly int TopOverCostCount = 0; + + protected readonly byte _TimestampShift = 0; + protected static object _SyncLock = new object(); + + protected ushort _CurrentSeqNumber; + protected long _LastTimeTick = -1L; + protected long _TurnBackTimeTick = -1L; + + protected bool _IsOverCost = false; + protected int _OverCostCountInOneTerm = 0; + protected int _GenCountInOneTerm = 0; + protected int _TermIndex = 0; + public Action GenAction { get; set; } + + public SnowWorkerM1(IdGeneratorOptions options) + { + WorkerId = options.WorkerId; + WorkerIdBitLength = options.WorkerIdBitLength; + SeqBitLength = options.SeqBitLength; + MaxSeqNumber = options.MaxSeqNumber; + MinSeqNumber = options.MinSeqNumber; + _CurrentSeqNumber = options.MinSeqNumber; + TopOverCostCount = options.TopOverCostCount; + + if (options.StartTime != DateTime.MinValue) + { + StartTimeUtc = options.StartTime; + } + + if (WorkerId < 1) + { + WorkerId = (ushort)DateTime.Now.Millisecond; + } + + if (SeqBitLength == 0) + { + SeqBitLength = 10; + } + + if (WorkerIdBitLength == 0) + { + WorkerIdBitLength = 10; + } + + if (MaxSeqNumber == 0) + { + MaxSeqNumber = (int)Math.Pow(2, SeqBitLength); + } + + _TimestampShift = (byte)(WorkerIdBitLength + SeqBitLength); + } + + + private void DoGenIdAction(OverCostActionArg arg) + { + Task.Run(() => + { + GenAction(arg); + }); + } + + private void BeginOverCostCallBack(in long useTimeTick) + { + if (GenAction == null) + { + return; + } + + DoGenIdAction(new OverCostActionArg( + WorkerId, + useTimeTick, + 1, + _OverCostCountInOneTerm, + _GenCountInOneTerm, + _TermIndex)); + } + + private void EndOverCostCallBack(in long useTimeTick) + { + if (_TermIndex > 10000) + { + _TermIndex = 0; + } + + if (GenAction == null) + { + return; + } + + DoGenIdAction(new OverCostActionArg( + WorkerId, + useTimeTick, + 2, + _OverCostCountInOneTerm, + _GenCountInOneTerm, + _TermIndex)); + } + + private void TurnBackCallBack(in long useTimeTick) + { + if (GenAction == null) + { + return; + } + + DoGenIdAction(new OverCostActionArg( + WorkerId, + useTimeTick, + 8, + _OverCostCountInOneTerm, + _GenCountInOneTerm, + _TermIndex)); + } + + private long NextOverCostId() + { + long currentTimeTick = GetCurrentTimeTick(); + + if (currentTimeTick > _LastTimeTick) + { + EndOverCostCallBack(currentTimeTick); + + _LastTimeTick = currentTimeTick; + _CurrentSeqNumber = MinSeqNumber; + _IsOverCost = false; + _OverCostCountInOneTerm = 0; + _GenCountInOneTerm = 0; + + return CalcId(_LastTimeTick); + } + + if (_OverCostCountInOneTerm >= TopOverCostCount) + { + EndOverCostCallBack(currentTimeTick); + + _LastTimeTick = GetNextTimeTick(); + _CurrentSeqNumber = MinSeqNumber; + _IsOverCost = false; + _OverCostCountInOneTerm = 0; + _GenCountInOneTerm = 0; + + return CalcId(_LastTimeTick); + } + + if (_CurrentSeqNumber > MaxSeqNumber) + { + _LastTimeTick++; + _CurrentSeqNumber = MinSeqNumber; + _IsOverCost = true; + _OverCostCountInOneTerm++; + _GenCountInOneTerm++; + + return CalcId(_LastTimeTick); + } + + _GenCountInOneTerm++; + return CalcId(_LastTimeTick); + } + + private long NextNormalId() + { + long currentTimeTick = GetCurrentTimeTick(); + + if (currentTimeTick > _LastTimeTick) + { + _LastTimeTick = currentTimeTick; + _CurrentSeqNumber = MinSeqNumber; + + return CalcId(_LastTimeTick); + } + + if (_CurrentSeqNumber > MaxSeqNumber) + { + BeginOverCostCallBack(currentTimeTick); + + _TermIndex++; + _LastTimeTick++; + _CurrentSeqNumber = MinSeqNumber; + _IsOverCost = true; + _OverCostCountInOneTerm++; + _GenCountInOneTerm = 1; + + return CalcId(_LastTimeTick); + } + + if (currentTimeTick < _LastTimeTick) + { + if (_TurnBackTimeTick < 1) + { + _TurnBackTimeTick = _LastTimeTick - 1; + } + + Thread.Sleep(10); + TurnBackCallBack(_TurnBackTimeTick); + + return CalcTurnBackId(_TurnBackTimeTick); + } + + + return CalcId(_LastTimeTick); + } + + private long CalcId(in long useTimeTick) + { + var result = ((useTimeTick << _TimestampShift) + + ((long)WorkerId << SeqBitLength) + + (uint)_CurrentSeqNumber); + + _CurrentSeqNumber++; + return result; + } + + private long CalcTurnBackId(in long useTimeTick) + { + var result = ((useTimeTick << _TimestampShift) + + ((long)WorkerId << SeqBitLength) + 0); + + _TurnBackTimeTick--; + return result; + } + + protected virtual long GetCurrentTimeTick() + { + return (long)(DateTime.UtcNow - StartTimeUtc).TotalMilliseconds; + } + + protected virtual long GetNextTimeTick() + { + long tempTimeTicker = GetCurrentTimeTick(); + + while (tempTimeTicker <= _LastTimeTick) + { + tempTimeTicker = GetCurrentTimeTick(); + } + + return tempTimeTicker; + } + + + public virtual long NextId() + { + lock (_SyncLock) + { + return _IsOverCost ? NextOverCostId() : NextNormalId(); + } + } + } +} diff --git a/Infrastructure/Snowflake/SnowWorkerM2.cs b/Infrastructure/Snowflake/SnowWorkerM2.cs new file mode 100644 index 00000000..9764a09c --- /dev/null +++ b/Infrastructure/Snowflake/SnowWorkerM2.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Yitter.IdGenerator +{ + /// + /// 常规雪花算法 + /// + internal class SnowWorkerM2 : SnowWorkerM1 + { + public SnowWorkerM2(IdGeneratorOptions options) : base(options) + { + + } + + public override long NextId() + { + lock (_SyncLock) + { + long currentTimeTick = GetCurrentTimeTick(); + + if (_LastTimeTick == currentTimeTick) + { + if (_CurrentSeqNumber++ > MaxSeqNumber) + { + _CurrentSeqNumber = MinSeqNumber; + currentTimeTick = GetNextTimeTick(); + } + } + else + { + _CurrentSeqNumber = MinSeqNumber; + } + + if (currentTimeTick < _LastTimeTick) + { + throw new Exception(string.Format("Time error for {0} milliseconds", _LastTimeTick - currentTimeTick)); + } + + _LastTimeTick = currentTimeTick; + var result = ((currentTimeTick << _TimestampShift) + ((long)WorkerId << SeqBitLength) + (uint)_CurrentSeqNumber); + + return result; + } + } + + } +} diff --git a/Infrastructure/Snowflake/YitIdGenerator.cs b/Infrastructure/Snowflake/YitIdGenerator.cs new file mode 100644 index 00000000..18dc4e8c --- /dev/null +++ b/Infrastructure/Snowflake/YitIdGenerator.cs @@ -0,0 +1,83 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; + +namespace Yitter.IdGenerator +{ + public class YitIdGenerator : IIdGenerator + { + private ISnowWorker _SnowWorker { get; set; } + + public Action GenIdActionAsync + { + get => _SnowWorker.GenAction; + set => _SnowWorker.GenAction = value; + } + + public YitIdGenerator(IdGeneratorOptions options) + { + if (options == null) + { + throw new ApplicationException("options error."); + } + + if (options.StartTime > DateTime.Now) + { + throw new ApplicationException("StartTime error."); + } + + if (options.SeqBitLength + options.WorkerIdBitLength > 22) + { + throw new ApplicationException("error：WorkerIdBitLength + SeqBitLength <= 22"); + } + + var maxWorkerIdNumber = Math.Pow(2, options.WorkerIdBitLength) - 1; + if (options.WorkerId < 1 || options.WorkerId > maxWorkerIdNumber) + { + throw new ApplicationException("WorkerId is error. (range:[1, " + maxWorkerIdNumber + "]"); + } + + if (options.SeqBitLength < 2 || options.SeqBitLength > 21) + { + throw new ApplicationException("SeqBitLength is error. (range:[2, 21])"); + } + + var maxSeqNumber = Math.Pow(2, options.SeqBitLength) - 1; + if (options.MaxSeqNumber < 0 || options.MaxSeqNumber > maxSeqNumber) + { + throw new ApplicationException("MaxSeqNumber is error. (range:[1, " + maxSeqNumber + "]"); + } + + var maxValue = maxSeqNumber - 2; + if (options.MinSeqNumber < 5 || options.MinSeqNumber > maxValue) + { + throw new ApplicationException("MinSeqNumber is error. (range:[5, " + maxValue + "]"); + } + + switch (options.Method) + { + case 1: + _SnowWorker = new SnowWorkerM1(options); + break; + case 2: + _SnowWorker = new SnowWorkerM2(options); + break; + default: + _SnowWorker = new SnowWorkerM1(options); + break; + } + + if (options.Method == 1) + { + Thread.Sleep(500); + } + } + + + public long NewLong() + { + return _SnowWorker.NextId(); + } + } +} diff --git a/Infrastructure/Test/TestSnowflake.cs b/Infrastructure/Test/TestSnowflake.cs new file mode 100644 index 00000000..8783a1f8 --- /dev/null +++ b/Infrastructure/Test/TestSnowflake.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using NUnit.Framework; +using Yitter.IdGenerator; + +namespace Infrastructure.Test +{ + class TestSnowflake + { + [Test] + public void Generate() + { + // 全局初始化设置WorkerId，默认最大2^16-1。（初始化过程全局只需一次，且必须最先设置） + var options = new IdGeneratorOptions(){ WorkerId = 1}; + IIdGenerator IdHelper = new YitIdGenerator(options); + + // 初始化以后，就可以在需要的地方调用方法生成ID。 + long val =IdHelper.NewLong(); + int val2 = (int)val; + + Console.WriteLine($"val:{val}/int:{val2}"); + } + + } + + +} diff --git a/OpenAuth.App/BaseApp.cs b/OpenAuth.App/Base/BaseApp.cs similarity index 96% rename from OpenAuth.App/BaseApp.cs rename to OpenAuth.App/Base/BaseApp.cs index 96238a59..35c32765 100644 --- a/OpenAuth.App/BaseApp.cs +++ b/OpenAuth.App/Base/BaseApp.cs @@ -1,127 +1,127 @@ -using System; -using System.Linq; -using Infrastructure; -using Microsoft.EntityFrameworkCore; -using OpenAuth.App.Interface; -using OpenAuth.Repository.Core; -using OpenAuth.Repository.Domain; -using OpenAuth.Repository.Interface; - -namespace OpenAuth.App -{ - /// - /// 业务层基类，UnitWork用于事务操作，Repository用于普通的数据库操作 - /// 如用户管理：Class UserManagerApp:BaseApp - /// - /// - public class BaseApp where T : Entity where TDbContext: DbContext - { - /// - /// 用于普通的数据库操作 - /// - protected IRepository Repository; - - /// - /// 用于事务操作 - /// 使用详见：http://doc.openauth.me/core/unitwork.html - /// - protected IUnitWork UnitWork; - - protected IAuth _auth; - - public BaseApp(IUnitWork unitWork, IRepository repository, IAuth auth) - { - UnitWork = unitWork; - Repository = repository; - _auth = auth; - } - - /// - /// 获取当前登录用户的数据访问权限 - /// - /// linq表达式参数的名称，如u=>u.name中的"u" - /// - protected IQueryable GetDataPrivilege(string parametername) - { - var loginUser = _auth.GetCurrentUser(); - if (loginUser.User.Account == Define.SYSTEM_USERNAME) return UnitWork.Find(null); //超级管理员特权 - - var moduleName = typeof(T).Name; - var rule = UnitWork.FirstOrDefault(u => u.SourceCode == moduleName); - if (rule == null) return UnitWork.Find(null); //没有设置数据规则，那么视为该资源允许被任何主体查看 - if (rule.PrivilegeRules.Contains(Define.DATAPRIVILEGE_LOGINUSER) || - rule.PrivilegeRules.Contains(Define.DATAPRIVILEGE_LOGINROLE)|| - rule.PrivilegeRules.Contains(Define.DATAPRIVILEGE_LOGINORG)) - { - - //即把{loginUser} =='xxxxxxx'换为 loginUser.User.Id =='xxxxxxx'，从而把当前登录的用户名与当时设计规则时选定的用户id对比 - rule.PrivilegeRules = rule.PrivilegeRules.Replace(Define.DATAPRIVILEGE_LOGINUSER, loginUser.User.Id); - - var roles = loginUser.Roles.Select(u => u.Id).ToList(); - roles.Sort(); //按字母排序,这样可以进行like操作 - rule.PrivilegeRules = rule.PrivilegeRules.Replace(Define.DATAPRIVILEGE_LOGINROLE, - string.Join(',',roles)); - - var orgs = loginUser.Orgs.Select(u => u.Id).ToList(); - orgs.Sort(); - rule.PrivilegeRules = rule.PrivilegeRules.Replace(Define.DATAPRIVILEGE_LOGINORG, - string.Join(',',orgs)); - } - return UnitWork.Find(null).GenerateFilter(parametername, - JsonHelper.Instance.Deserialize(rule.PrivilegeRules)); - } - - /// - /// 按id批量删除 - /// - /// - public virtual void Delete(string[] ids) - { - Repository.Delete(u => ids.Contains(u.Id)); - } - - public T Get(string id) - { - return Repository.FirstOrDefault(u => u.Id == id); - } - - /// - /// 计算实体更新的层级信息 - /// - /// U必须是一个继承TreeEntity的结构 - /// - public void CaculateCascade(U entity) where U : TreeEntity - { - if (entity.ParentId == "") entity.ParentId = null; - string cascadeId; - int currentCascadeId = 1; //当前结点的级联节点最后一位 - var sameLevels = UnitWork.Find(o => o.ParentId == entity.ParentId && o.Id != entity.Id); - foreach (var obj in sameLevels) - { - int objCascadeId = int.Parse(obj.CascadeId.TrimEnd('.').Split('.').Last()); - if (currentCascadeId <= objCascadeId) currentCascadeId = objCascadeId + 1; - } - - if (!string.IsNullOrEmpty(entity.ParentId)) - { - var parentOrg = UnitWork.FirstOrDefault(o => o.Id == entity.ParentId); - if (parentOrg != null) - { - cascadeId = parentOrg.CascadeId + currentCascadeId + "."; - entity.ParentName = parentOrg.Name; - } - else - { - throw new Exception("未能找到该组织的父节点信息"); - } - } - else - { - cascadeId = ".0." + currentCascadeId + "."; - entity.ParentName = "根节点"; - } - - entity.CascadeId = cascadeId; - } - } +using System; +using System.Linq; +using Infrastructure; +using Microsoft.EntityFrameworkCore; +using OpenAuth.App.Interface; +using OpenAuth.Repository.Core; +using OpenAuth.Repository.Domain; +using OpenAuth.Repository.Interface; + +namespace OpenAuth.App +{ + /// + /// 业务层基类，UnitWork用于事务操作，Repository用于普通的数据库操作 + /// 如用户管理：Class UserManagerApp:BaseApp + /// + /// + public class BaseApp where T : StringEntity where TDbContext: DbContext + { + /// + /// 用于普通的数据库操作 + /// + protected IRepository Repository; + + /// + /// 用于事务操作 + /// 使用详见：http://doc.openauth.me/core/unitwork.html + /// + protected IUnitWork UnitWork; + + protected IAuth _auth; + + public BaseApp(IUnitWork unitWork, IRepository repository, IAuth auth) + { + UnitWork = unitWork; + Repository = repository; + _auth = auth; + } + + /// + /// 获取当前登录用户的数据访问权限 + /// + /// linq表达式参数的名称，如u=>u.name中的"u" + /// + protected IQueryable GetDataPrivilege(string parametername) + { + var loginUser = _auth.GetCurrentUser(); + if (loginUser.User.Account == Define.SYSTEM_USERNAME) return UnitWork.Find(null); //超级管理员特权 + + var moduleName = typeof(T).Name; + var rule = UnitWork.FirstOrDefault(u => u.SourceCode == moduleName); + if (rule == null) return UnitWork.Find(null); //没有设置数据规则，那么视为该资源允许被任何主体查看 + if (rule.PrivilegeRules.Contains(Define.DATAPRIVILEGE_LOGINUSER) || + rule.PrivilegeRules.Contains(Define.DATAPRIVILEGE_LOGINROLE)|| + rule.PrivilegeRules.Contains(Define.DATAPRIVILEGE_LOGINORG)) + { + + //即把{loginUser} =='xxxxxxx'换为 loginUser.User.Id =='xxxxxxx'，从而把当前登录的用户名与当时设计规则时选定的用户id对比 + rule.PrivilegeRules = rule.PrivilegeRules.Replace(Define.DATAPRIVILEGE_LOGINUSER, loginUser.User.Id); + + var roles = loginUser.Roles.Select(u => u.Id).ToList(); + roles.Sort(); //按字母排序,这样可以进行like操作 + rule.PrivilegeRules = rule.PrivilegeRules.Replace(Define.DATAPRIVILEGE_LOGINROLE, + string.Join(',',roles)); + + var orgs = loginUser.Orgs.Select(u => u.Id).ToList(); + orgs.Sort(); + rule.PrivilegeRules = rule.PrivilegeRules.Replace(Define.DATAPRIVILEGE_LOGINORG, + string.Join(',',orgs)); + } + return UnitWork.Find(null).GenerateFilter(parametername, + JsonHelper.Instance.Deserialize(rule.PrivilegeRules)); + } + + /// + /// 按id批量删除 + /// + /// + public virtual void Delete(string[] ids) + { + Repository.Delete(u => ids.Contains(u.Id)); + } + + public T Get(string id) + { + return Repository.FirstOrDefault(u => u.Id == id); + } + + /// + /// 计算实体更新的层级信息 + /// + /// U必须是一个继承TreeEntity的结构 + /// + public void CaculateCascade(U entity) where U : TreeEntity + { + if (entity.ParentId == "") entity.ParentId = null; + string cascadeId; + int currentCascadeId = 1; //当前结点的级联节点最后一位 + var sameLevels = UnitWork.Find(o => o.ParentId == entity.ParentId && o.Id != entity.Id); + foreach (var obj in sameLevels) + { + int objCascadeId = int.Parse(obj.CascadeId.TrimEnd('.').Split('.').Last()); + if (currentCascadeId <= objCascadeId) currentCascadeId = objCascadeId + 1; + } + + if (!string.IsNullOrEmpty(entity.ParentId)) + { + var parentOrg = UnitWork.FirstOrDefault(o => o.Id == entity.ParentId); + if (parentOrg != null) + { + cascadeId = parentOrg.CascadeId + currentCascadeId + "."; + entity.ParentName = parentOrg.Name; + } + else + { + throw new Exception("未能找到该组织的父节点信息"); + } + } + else + { + cascadeId = ".0." + currentCascadeId + "."; + entity.ParentName = "根节点"; + } + + entity.CascadeId = cascadeId; + } + } } \ No newline at end of file diff --git a/OpenAuth.App/Base/BaseLongApp.cs b/OpenAuth.App/Base/BaseLongApp.cs new file mode 100644 index 00000000..5ca20d03 --- /dev/null +++ b/OpenAuth.App/Base/BaseLongApp.cs @@ -0,0 +1,128 @@ +using System; +using System.Linq; +using Infrastructure; +using Microsoft.EntityFrameworkCore; +using OpenAuth.App.Interface; +using OpenAuth.Repository.Core; +using OpenAuth.Repository.Domain; +using OpenAuth.Repository.Interface; + +namespace OpenAuth.App +{ + /// + /// ⭐⭐数据库Id为numberic类型的数据表相关业务使用该基类⭐⭐ + /// 业务层基类，UnitWork用于事务操作，Repository用于普通的数据库操作 + /// 如用户管理：Class UserManagerApp:BaseApp + /// + /// + public class BaseLongApp where T : LongEntity where TDbContext: DbContext + { + /// + /// 用于普通的数据库操作 + /// + protected IRepository Repository; + + /// + /// 用于事务操作 + /// 使用详见：http://doc.openauth.me/core/unitwork.html + /// + protected IUnitWork UnitWork; + + protected IAuth _auth; + + public BaseLongApp(IUnitWork unitWork, IRepository repository, IAuth auth) + { + UnitWork = unitWork; + Repository = repository; + _auth = auth; + } + + /// + /// 获取当前登录用户的数据访问权限 + /// + /// linq表达式参数的名称，如u=>u.name中的"u" + /// + protected IQueryable GetDataPrivilege(string parametername) + { + var loginUser = _auth.GetCurrentUser(); + if (loginUser.User.Account == Define.SYSTEM_USERNAME) return UnitWork.Find(null); //超级管理员特权 + + var moduleName = typeof(T).Name; + var rule = UnitWork.FirstOrDefault(u => u.SourceCode == moduleName); + if (rule == null) return UnitWork.Find(null); //没有设置数据规则，那么视为该资源允许被任何主体查看 + if (rule.PrivilegeRules.Contains(Define.DATAPRIVILEGE_LOGINUSER) || + rule.PrivilegeRules.Contains(Define.DATAPRIVILEGE_LOGINROLE)|| + rule.PrivilegeRules.Contains(Define.DATAPRIVILEGE_LOGINORG)) + { + + //即把{loginUser} =='xxxxxxx'换为 loginUser.User.Id =='xxxxxxx'，从而把当前登录的用户名与当时设计规则时选定的用户id对比 + rule.PrivilegeRules = rule.PrivilegeRules.Replace(Define.DATAPRIVILEGE_LOGINUSER, loginUser.User.Id); + + var roles = loginUser.Roles.Select(u => u.Id).ToList(); + roles.Sort(); //按字母排序,这样可以进行like操作 + rule.PrivilegeRules = rule.PrivilegeRules.Replace(Define.DATAPRIVILEGE_LOGINROLE, + string.Join(',',roles)); + + var orgs = loginUser.Orgs.Select(u => u.Id).ToList(); + orgs.Sort(); + rule.PrivilegeRules = rule.PrivilegeRules.Replace(Define.DATAPRIVILEGE_LOGINORG, + string.Join(',',orgs)); + } + return UnitWork.Find(null).GenerateFilter(parametername, + JsonHelper.Instance.Deserialize(rule.PrivilegeRules)); + } + + /// + /// 按id批量删除 + /// + /// + public virtual void Delete(long[] ids) + { + Repository.Delete(u => ids.Contains(u.Id)); + } + + public T Get(long id) + { + return Repository.FirstOrDefault(u => u.Id == id); + } + + /// + /// 计算实体更新的层级信息 + /// + /// U必须是一个继承TreeEntity的结构 + /// + public void CaculateCascade(U entity) where U : TreeEntity + { + if (entity.ParentId == "") entity.ParentId = null; + string cascadeId; + int currentCascadeId = 1; //当前结点的级联节点最后一位 + var sameLevels = UnitWork.Find(o => o.ParentId == entity.ParentId && o.Id != entity.Id); + foreach (var obj in sameLevels) + { + int objCascadeId = int.Parse(obj.CascadeId.TrimEnd('.').Split('.').Last()); + if (currentCascadeId <= objCascadeId) currentCascadeId = objCascadeId + 1; + } + + if (!string.IsNullOrEmpty(entity.ParentId)) + { + var parentOrg = UnitWork.FirstOrDefault(o => o.Id == entity.ParentId); + if (parentOrg != null) + { + cascadeId = parentOrg.CascadeId + currentCascadeId + "."; + entity.ParentName = parentOrg.Name; + } + else + { + throw new Exception("未能找到该组织的父节点信息"); + } + } + else + { + cascadeId = ".0." + currentCascadeId + "."; + entity.ParentName = "根节点"; + } + + entity.CascadeId = cascadeId; + } + } +} \ No newline at end of file diff --git a/OpenAuth.App/BaseTreeApp.cs b/OpenAuth.App/Base/BaseTreeApp.cs similarity index 100% rename from OpenAuth.App/BaseTreeApp.cs rename to OpenAuth.App/Base/BaseTreeApp.cs diff --git a/OpenAuth.App/BuilderTableApp.cs b/OpenAuth.App/BuilderTableApp.cs index 72577765..de1c8b7f 100644 --- a/OpenAuth.App/BuilderTableApp.cs +++ b/OpenAuth.App/BuilderTableApp.cs @@ -487,7 +487,7 @@ namespace OpenAuth.App var types = AssemblyLoadContext.Default .LoadFromAssemblyName(new AssemblyName(compilation.Name)) .GetTypes().Where(x => x.GetTypeInfo().BaseType != null - && x.BaseType == typeof(Entity)); + && x.BaseType == typeof(StringEntity)); foreach (var entity in types) { if (entity.Name == moduleCode ) diff --git a/OpenAuth.Repository/Core/LongEntity.cs b/OpenAuth.Repository/Core/LongEntity.cs new file mode 100644 index 00000000..ade84812 --- /dev/null +++ b/OpenAuth.Repository/Core/LongEntity.cs @@ -0,0 +1,32 @@ +using System.ComponentModel; +using Yitter.IdGenerator; + +namespace OpenAuth.Repository.Core +{ + /// + /// 数据库Id为numberic类型的数据实体使用该基类，用法同Entity + /// 数据库Id字段为numberic(16,0)或以上长度的整型，采用雪花算法生成Id。 + /// + public class LongEntity :BaseEntity + { + [Browsable(false)] + public long Id { get; set; } + public override bool KeyIsNull() + { + return Id == 0; + } + + /// + /// 采用雪花算法计算Id + /// + public override void GenerateDefaultKeyVal() + { + // 全局初始化设置WorkerId，默认最大2^16-1。（初始化过程全局只需一次，且必须最先设置） + var options = new IdGeneratorOptions(){ WorkerId = 1}; + IIdGenerator IdHelper = new YitIdGenerator(options); + + // 初始化以后，就可以在需要的地方调用方法生成ID。 + Id = IdHelper.NewLong(); + } + } +} \ No newline at end of file diff --git a/OpenAuth.Repository/Core/StringEntity.cs b/OpenAuth.Repository/Core/StringEntity.cs new file mode 100644 index 00000000..e2d610fa --- /dev/null +++ b/OpenAuth.Repository/Core/StringEntity.cs @@ -0,0 +1,31 @@ +using System; +using System.ComponentModel; + +namespace OpenAuth.Repository.Core +{ + /// + /// 主键为字符串的实体基类，为系统默认的实体类型 + /// + public class StringEntity : BaseEntity + { + [Browsable(false)] + public string Id { get; set; } + + /// + /// 判断主键是否为空，常用做判定操作是【添加】还是【编辑】 + /// + /// + public override bool KeyIsNull() + { + return string.IsNullOrEmpty(Id); + } + + /// + /// 创建默认的主键值 + /// + public override void GenerateDefaultKeyVal() + { + Id = Guid.NewGuid().ToString(); + } + } +} diff --git a/OpenAuth.Repository/Core/TreeEntity.cs b/OpenAuth.Repository/Core/TreeEntity.cs index d83d3170..d5106c2f 100644 --- a/OpenAuth.Repository/Core/TreeEntity.cs +++ b/OpenAuth.Repository/Core/TreeEntity.cs @@ -5,7 +5,7 @@ namespace OpenAuth.Repository.Core /// /// 树状结构实体 /// - public abstract class TreeEntity: Entity + public abstract class TreeEntity: StringEntity { /// /// 节点语义ID diff --git a/OpenAuth.Repository/Domain/Application.cs b/OpenAuth.Repository/Domain/Application.cs index aeee69e6..8aee9816 100644 --- a/OpenAuth.Repository/Domain/Application.cs +++ b/OpenAuth.Repository/Domain/Application.cs @@ -18,7 +18,7 @@ namespace OpenAuth.Repository.Domain /// 应用 /// [Table("Application")] - public partial class Application : Entity + public partial class Application : StringEntity { public Application() { diff --git a/OpenAuth.Repository/Domain/BuilderTable.cs b/OpenAuth.Repository/Domain/BuilderTable.cs index 7bc32841..25204304 100644 --- a/OpenAuth.Repository/Domain/BuilderTable.cs +++ b/OpenAuth.Repository/Domain/BuilderTable.cs @@ -20,7 +20,7 @@ namespace OpenAuth.Repository.Domain /// 代码生成器的表信息 /// [Table("BuilderTable")] - public partial class BuilderTable : Entity + public partial class BuilderTable : StringEntity { public BuilderTable() { diff --git a/OpenAuth.Repository/Domain/BuilderTableColumn.cs b/OpenAuth.Repository/Domain/BuilderTableColumn.cs index 72f640f7..7d09e7c3 100644 --- a/OpenAuth.Repository/Domain/BuilderTableColumn.cs +++ b/OpenAuth.Repository/Domain/BuilderTableColumn.cs @@ -20,7 +20,7 @@ namespace OpenAuth.Repository.Domain /// 代码生成器的字段信息 /// [Table("BuilderTableColumn")] - public partial class BuilderTableColumn : Entity + public partial class BuilderTableColumn : StringEntity { public BuilderTableColumn() { diff --git a/OpenAuth.Repository/Domain/Category.cs b/OpenAuth.Repository/Domain/Category.cs index 6e07e0d1..4713b2ee 100644 --- a/OpenAuth.Repository/Domain/Category.cs +++ b/OpenAuth.Repository/Domain/Category.cs @@ -18,7 +18,7 @@ namespace OpenAuth.Repository.Domain /// 分类表，也可用作数据字典。表示一个全集，比如：男、女、未知。关联的分类类型表示按什么进行的分类，如：按照性别对人类对象集 /// [Table("Category")] - public partial class Category : Entity + public partial class Category : StringEntity { public Category() { diff --git a/OpenAuth.Repository/Domain/CategoryType.cs b/OpenAuth.Repository/Domain/CategoryType.cs index 90e95a9c..958c8e67 100644 --- a/OpenAuth.Repository/Domain/CategoryType.cs +++ b/OpenAuth.Repository/Domain/CategoryType.cs @@ -18,7 +18,7 @@ namespace OpenAuth.Repository.Domain /// 分类类型 /// [Table("CategoryType")] - public partial class CategoryType : Entity + public partial class CategoryType : StringEntity { public CategoryType() { diff --git a/OpenAuth.Repository/Domain/DataPrivilegeRule.cs b/OpenAuth.Repository/Domain/DataPrivilegeRule.cs index 09107a5d..f6567c72 100644 --- a/OpenAuth.Repository/Domain/DataPrivilegeRule.cs +++ b/OpenAuth.Repository/Domain/DataPrivilegeRule.cs @@ -18,7 +18,7 @@ namespace OpenAuth.Repository.Domain /// 系统授权规制表 /// [Table("DataPrivilegeRule")] - public partial class DataPrivilegeRule : Entity + public partial class DataPrivilegeRule : StringEntity { public DataPrivilegeRule() { diff --git a/OpenAuth.Repository/Domain/FlowInstance.cs b/OpenAuth.Repository/Domain/FlowInstance.cs index f6083ad6..c17281a2 100644 --- a/OpenAuth.Repository/Domain/FlowInstance.cs +++ b/OpenAuth.Repository/Domain/FlowInstance.cs @@ -19,7 +19,7 @@ namespace OpenAuth.Repository.Domain /// 工作流流程实例表 /// [Table("FlowInstance")] - public partial class FlowInstance : Entity + public partial class FlowInstance : StringEntity { public FlowInstance() { diff --git a/OpenAuth.Repository/Domain/FlowInstanceOperationHistory.cs b/OpenAuth.Repository/Domain/FlowInstanceOperationHistory.cs index b57d721c..2170e729 100644 --- a/OpenAuth.Repository/Domain/FlowInstanceOperationHistory.cs +++ b/OpenAuth.Repository/Domain/FlowInstanceOperationHistory.cs @@ -18,7 +18,7 @@ namespace OpenAuth.Repository.Domain /// 工作流实例操作记录 /// [Table("FlowInstanceOperationHistory")] - public partial class FlowInstanceOperationHistory : Entity + public partial class FlowInstanceOperationHistory : StringEntity { public FlowInstanceOperationHistory() { diff --git a/OpenAuth.Repository/Domain/FlowInstanceTransitionHistory.cs b/OpenAuth.Repository/Domain/FlowInstanceTransitionHistory.cs index 1bd509dd..8fc91ac0 100644 --- a/OpenAuth.Repository/Domain/FlowInstanceTransitionHistory.cs +++ b/OpenAuth.Repository/Domain/FlowInstanceTransitionHistory.cs @@ -18,7 +18,7 @@ namespace OpenAuth.Repository.Domain /// 工作流实例流转历史记录 /// [Table("FlowInstanceTransitionHistory")] - public partial class FlowInstanceTransitionHistory : Entity + public partial class FlowInstanceTransitionHistory : StringEntity { public FlowInstanceTransitionHistory() { diff --git a/OpenAuth.Repository/Domain/FlowScheme.cs b/OpenAuth.Repository/Domain/FlowScheme.cs index b11ea9dd..33146ccb 100644 --- a/OpenAuth.Repository/Domain/FlowScheme.cs +++ b/OpenAuth.Repository/Domain/FlowScheme.cs @@ -19,7 +19,7 @@ namespace OpenAuth.Repository.Domain /// 工作流模板信息表 /// [Table("FlowScheme")] - public partial class FlowScheme : Entity + public partial class FlowScheme : StringEntity { public FlowScheme() { diff --git a/OpenAuth.Repository/Domain/Form.cs b/OpenAuth.Repository/Domain/Form.cs index 501a561f..9302da49 100644 --- a/OpenAuth.Repository/Domain/Form.cs +++ b/OpenAuth.Repository/Domain/Form.cs @@ -18,7 +18,7 @@ namespace OpenAuth.Repository.Domain /// 表单模板表 /// [Table("Form")] - public partial class Form : Entity + public partial class Form : StringEntity { public Form() { diff --git a/OpenAuth.Repository/Domain/FrmLeaveReq.cs b/OpenAuth.Repository/Domain/FrmLeaveReq.cs index 41a83e7a..8d5ed8d8 100644 --- a/OpenAuth.Repository/Domain/FrmLeaveReq.cs +++ b/OpenAuth.Repository/Domain/FrmLeaveReq.cs @@ -18,7 +18,7 @@ namespace OpenAuth.Repository.Domain /// 模拟一个自定页面的表单，该数据会关联到流程实例FrmData，可用于复杂页面的设计及后期的数据分析 /// [Table("FrmLeaveReq")] - public partial class FrmLeaveReq : Entity + public partial class FrmLeaveReq : StringEntity { public FrmLeaveReq() { diff --git a/OpenAuth.Repository/Domain/ModuleElement.cs b/OpenAuth.Repository/Domain/ModuleElement.cs index 12a2aa16..910a955c 100644 --- a/OpenAuth.Repository/Domain/ModuleElement.cs +++ b/OpenAuth.Repository/Domain/ModuleElement.cs @@ -18,7 +18,7 @@ namespace OpenAuth.Repository.Domain /// 模块元素表(需要权限控制的按钮) /// [Table("ModuleElement")] - public partial class ModuleElement : Entity + public partial class ModuleElement : StringEntity { public ModuleElement() { diff --git a/OpenAuth.Repository/Domain/OpenJob.cs b/OpenAuth.Repository/Domain/OpenJob.cs index aae21b5a..6843da37 100644 --- a/OpenAuth.Repository/Domain/OpenJob.cs +++ b/OpenAuth.Repository/Domain/OpenJob.cs @@ -20,7 +20,7 @@ namespace OpenAuth.Repository.Domain /// 定时任务 /// [Table("OpenJob")] - public partial class OpenJob : Entity + public partial class OpenJob : StringEntity { public OpenJob() { diff --git a/OpenAuth.Repository/Domain/Relevance.cs b/OpenAuth.Repository/Domain/Relevance.cs index 190bdc70..1d0b6f80 100644 --- a/OpenAuth.Repository/Domain/Relevance.cs +++ b/OpenAuth.Repository/Domain/Relevance.cs @@ -18,7 +18,7 @@ namespace OpenAuth.Repository.Domain /// 多对多关系集中映射 /// [Table("Relevance")] - public partial class Relevance : Entity + public partial class Relevance : StringEntity { public Relevance() { diff --git a/OpenAuth.Repository/Domain/Role.cs b/OpenAuth.Repository/Domain/Role.cs index 6de5e216..6c51ed92 100644 --- a/OpenAuth.Repository/Domain/Role.cs +++ b/OpenAuth.Repository/Domain/Role.cs @@ -18,7 +18,7 @@ namespace OpenAuth.Repository.Domain /// 角色表 /// [Table("Role")] - public partial class Role : Entity + public partial class Role : StringEntity { public Role() { diff --git a/OpenAuth.Repository/Domain/SysLog.cs b/OpenAuth.Repository/Domain/SysLog.cs index 6e2e971b..622a291c 100644 --- a/OpenAuth.Repository/Domain/SysLog.cs +++ b/OpenAuth.Repository/Domain/SysLog.cs @@ -18,7 +18,7 @@ namespace OpenAuth.Repository.Domain /// 系统日志 /// [Table("SysLog")] - public partial class SysLog : Entity + public partial class SysLog : StringEntity { public SysLog() { diff --git a/OpenAuth.Repository/Domain/SysMessage.cs b/OpenAuth.Repository/Domain/SysMessage.cs index 3098fbbe..5fbbbcf7 100644 --- a/OpenAuth.Repository/Domain/SysMessage.cs +++ b/OpenAuth.Repository/Domain/SysMessage.cs @@ -18,7 +18,7 @@ namespace OpenAuth.Repository.Domain /// 系统消息表 /// [Table("SysMessage")] - public partial class SysMessage : Entity + public partial class SysMessage : StringEntity { public SysMessage() { diff --git a/OpenAuth.Repository/Domain/UploadFile.cs b/OpenAuth.Repository/Domain/UploadFile.cs index c9c20216..c298f759 100644 --- a/OpenAuth.Repository/Domain/UploadFile.cs +++ b/OpenAuth.Repository/Domain/UploadFile.cs @@ -15,7 +15,7 @@ namespace OpenAuth.Repository.Domain /// 文件 /// [Table("UploadFile")] - public partial class UploadFile : Entity + public partial class UploadFile : StringEntity { public UploadFile() { diff --git a/OpenAuth.Repository/Domain/User.cs b/OpenAuth.Repository/Domain/User.cs index 35950bb0..5636da2a 100644 --- a/OpenAuth.Repository/Domain/User.cs +++ b/OpenAuth.Repository/Domain/User.cs @@ -18,7 +18,7 @@ namespace OpenAuth.Repository.Domain /// 用户基本信息表 /// [Table("User")] - public partial class User : Entity + public partial class User : StringEntity { public User() { diff --git a/OpenAuth.Repository/Domain/WmsInboundOrderDtbl.cs b/OpenAuth.Repository/Domain/WmsInboundOrderDtbl.cs index a837c218..1d707774 100644 --- a/OpenAuth.Repository/Domain/WmsInboundOrderDtbl.cs +++ b/OpenAuth.Repository/Domain/WmsInboundOrderDtbl.cs @@ -18,7 +18,7 @@ namespace OpenAuth.Repository.Domain /// 入库通知单明细 /// [Table("WmsInboundOrderDtbl")] - public partial class WmsInboundOrderDtbl : Entity + public partial class WmsInboundOrderDtbl : StringEntity { public WmsInboundOrderDtbl() { diff --git a/OpenAuth.Repository/Domain/WmsInboundOrderTbl.cs b/OpenAuth.Repository/Domain/WmsInboundOrderTbl.cs index 991c33d0..d4392bd4 100644 --- a/OpenAuth.Repository/Domain/WmsInboundOrderTbl.cs +++ b/OpenAuth.Repository/Domain/WmsInboundOrderTbl.cs @@ -18,7 +18,7 @@ namespace OpenAuth.Repository.Domain /// 入库通知单（入库订单） /// [Table("WmsInboundOrderTbl")] - public partial class WmsInboundOrderTbl : Entity + public partial class WmsInboundOrderTbl : StringEntity { public WmsInboundOrderTbl() { diff --git a/OpenAuth.Repository/OpenAuthDBContext.cs b/OpenAuth.Repository/OpenAuthDBContext.cs index 547e1fcb..9976fd2a 100644 --- a/OpenAuth.Repository/OpenAuthDBContext.cs +++ b/OpenAuth.Repository/OpenAuthDBContext.cs @@ -113,7 +113,6 @@ namespace OpenAuth.Repository public virtual DbSet OpenJobs { get; set; } public virtual DbSet BuilderTables { get; set; } public virtual DbSet BuilderTableColumns { get; set; } - //非数据库表格 public virtual DbQuery SysTableColumns { get; set; }