Parcourir la source

1.修复dbsavetask还是entity的bug
2.增加awake方法警告,没有对应的awake方法将抛异常

tanghai il y a 8 ans
Parent
commit
98a7e04783

+ 6 - 6
Server/Model/Base/Object/ObjectEvents.cs

@@ -138,12 +138,12 @@ namespace Model
 		{
 			if (!this.disposerEvents.TryGetValue(disposer.GetType(), out IObjectEvent objectEvent))
 			{
-				return;
+				throw new Exception($"{disposer.GetType().Name} not found awake1");
 			}
 			IAwake<P1> iAwake = objectEvent as IAwake<P1>;
 			if (iAwake == null)
 			{
-				return;
+				throw new Exception($"{disposer.GetType().Name} not found awake1");
 			}
 			objectEvent.Set(disposer);
 			iAwake.Awake(p1);
@@ -153,12 +153,12 @@ namespace Model
 		{
 			if (!this.disposerEvents.TryGetValue(disposer.GetType(), out IObjectEvent objectEvent))
 			{
-				return;
+				throw new Exception($"{disposer.GetType().Name} not found awake2");
 			}
 			IAwake<P1, P2> iAwake = objectEvent as IAwake<P1, P2>;
 			if (iAwake == null)
 			{
-				return;
+				throw new Exception($"{disposer.GetType().Name} not found awake2");
 			}
 			objectEvent.Set(disposer);
 			iAwake.Awake(p1, p2);
@@ -168,12 +168,12 @@ namespace Model
 		{
 			if (!this.disposerEvents.TryGetValue(disposer.GetType(), out IObjectEvent objectEvent))
 			{
-				return;
+				throw new Exception($"{disposer.GetType().Name} not found awake3");
 			}
 			IAwake<P1, P2, P3> iAwake = objectEvent as IAwake<P1, P2, P3>;
 			if (iAwake == null)
 			{
-				return;
+				throw new Exception($"{disposer.GetType().Name} not found awake3");
 			}
 			objectEvent.Set(disposer);
 			iAwake.Awake(p1, p2, p3);

+ 2 - 2
Server/Model/Component/DBComponent.cs

@@ -27,9 +27,9 @@ namespace Model
 			//this.database = this.mongoClient.GetDatabase(config.DBName);
 		}
 
-		public IMongoCollection<Entity> GetCollection(string name)
+		public IMongoCollection<Disposer> GetCollection(string name)
 		{
-			return this.database.GetCollection<Entity>(name);
+			return this.database.GetCollection<Disposer>(name);
 		}
 	}
 }

+ 6 - 6
Server/Model/Entity/DBQueryJsonTask.cs

@@ -6,9 +6,9 @@ using MongoDB.Driver;
 namespace Model
 {
 	[ObjectEvent]
-	public class DBQueryJsonTaskEvent : ObjectEvent<DBQueryJsonTask>, IAwake<string, string, TaskCompletionSource<List<Entity>>>
+	public class DBQueryJsonTaskEvent : ObjectEvent<DBQueryJsonTask>, IAwake<string, string, TaskCompletionSource<List<Disposer>>>
 	{
-		public void Awake(string collectionName, string json, TaskCompletionSource<List<Entity>> tcs)
+		public void Awake(string collectionName, string json, TaskCompletionSource<List<Disposer>> tcs)
 		{
 			DBQueryJsonTask self = this.Get();
 			
@@ -24,7 +24,7 @@ namespace Model
 
 		public string Json { get; set; }
 
-		public TaskCompletionSource<List<Entity>> Tcs { get; set; }
+		public TaskCompletionSource<List<Disposer>> Tcs { get; set; }
 		
 		public override async Task Run()
 		{
@@ -32,9 +32,9 @@ namespace Model
 			try
 			{
 				// 执行查询数据库任务
-				FilterDefinition<Entity> filterDefinition = new JsonFilterDefinition<Entity>(this.Json);
-				List<Entity> entitys = await dbComponent.GetCollection(this.CollectionName).FindAsync(filterDefinition).Result.ToListAsync();
-				this.Tcs.SetResult(entitys);
+				FilterDefinition<Disposer> filterDefinition = new JsonFilterDefinition<Disposer>(this.Json);
+				List<Disposer> disposers = await dbComponent.GetCollection(this.CollectionName).FindAsync(filterDefinition).Result.ToListAsync();
+				this.Tcs.SetResult(disposers);
 			}
 			catch (Exception e)
 			{

+ 5 - 5
Server/Model/Entity/DBSaveTask.cs

@@ -6,13 +6,13 @@ namespace Model
 {
 
 	[ObjectEvent]
-	public class DBSaveTaskEvent : ObjectEvent<DBSaveTask>, IAwake<Entity, string, TaskCompletionSource<bool>>
+	public class DBSaveTaskEvent : ObjectEvent<DBSaveTask>, IAwake<Disposer, string, TaskCompletionSource<bool>>
 	{
-		public void Awake(Entity entity, string collectionName, TaskCompletionSource<bool> tcs)
+		public void Awake(Disposer entity, string collectionName, TaskCompletionSource<bool> tcs)
 		{
 			DBSaveTask self = this.Get();
 
-			self.Entity = entity;
+			self.Disposer = entity;
 			self.CollectionName = collectionName;
 			self.Tcs = tcs;
 		}
@@ -20,7 +20,7 @@ namespace Model
 
 	public sealed class DBSaveTask : DBTask
 	{
-		public Entity Entity;
+		public Disposer Disposer;
 
 		public string CollectionName { get; set; }
 
@@ -41,7 +41,7 @@ namespace Model
 			try
 			{
 				// 执行保存数据库任务
-				await dbComponent.GetCollection(this.CollectionName).ReplaceOneAsync(s => s.Id == this.Entity.Id, this.Entity, new UpdateOptions {IsUpsert = true});
+				await dbComponent.GetCollection(this.CollectionName).ReplaceOneAsync(s => s.Id == this.Disposer.Id, this.Disposer, new UpdateOptions {IsUpsert = true});
 				this.Tcs.SetResult(true);
 			}
 			catch (Exception e)