mongoDB帮助类完善

MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/PschedDto.cs

@@ -12,9 +12,9 @@ namespace Business.ResourceExamineManagement.Dto
         /// <summary>
         /// 建议交期
         /// </summary>
-        public DateTime suggestdate;
-
+        public DateTime suggestdate { get; set; }
 
+        public int count { get; set; }
 
     }
 }

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -72,12 +72,12 @@ namespace Business.ResourceExamineManagement
         /// 物料BOM
         /// </summary>
         private readonly IMongoDB<ic_bom> _ic_bom;
-        private IRepository<ic_bom, long> _mysql_ic_bom;
+        //private IRepository<ic_bom, long> _mysql_ic_bom;
         /// <summary>
         /// 物料BOM明细
         /// </summary>
         private readonly IMongoDB<ic_bom_child> _ic_bom_child;
-        private IRepository<ic_bom_child, long> _mysql_ic_bom_child;
+        //private IRepository<ic_bom_child, long> _mysql_ic_bom_child;
         /// <summary>
         /// 生产工单主表
         /// </summary>
@@ -93,22 +93,23 @@ namespace Business.ResourceExamineManagement
         public ResourceExamineAppService(
             IMongoDB<mes_technique> mes_technique,
             IMongoDB<ic_item> ic_item,
-            IRepository<ic_item, long> mysql_ic_item,
-            IRepository<ic_bom, long> mysql_ic_bom,
-            IRepository<ic_bom_child, long> mysql_ic_bom_child,
             IMongoDB<ic_bom> ic_bom,
             IMongoDB<ic_bom_child> ic_bom_child,
             IMongoDB<mes_morder> mes_morder
+            //IRepository<ic_item, long> mysql_ic_item,
+            //IRepository<ic_bom, long> mysql_ic_bom,
+            //IRepository<ic_bom_child, long> mysql_ic_bom_child,
+
             )
         {
             _mes_technique = mes_technique;
             _ic_item = ic_item;
-            _mysql_ic_item = mysql_ic_item;
             _ic_bom = ic_bom;
-            _mysql_ic_bom = mysql_ic_bom;
             _ic_bom_child = ic_bom_child;
-            _mysql_ic_bom_child = mysql_ic_bom_child;
             _mes_morder = mes_morder;
+            //_mysql_ic_item = mysql_ic_item;
+            //_mysql_ic_bom = mysql_ic_bom;
+            //_mysql_ic_bom_child = mysql_ic_bom_child;
         }
 
         /// <summary>
@@ -126,19 +127,24 @@ namespace Business.ResourceExamineManagement
             //{
             //    info = new mes_technique();
             //    info.GenerateNewId();
-            //    info.tech_name = "多条"+i;
+            //    info.tech_name = "多条" + i;
             //    info.level = i;
             //    infos.Add(info);
             //}
             //await _mes_technique.InsertMany(infos);
 
+            //var info2 =  _mes_technique.GetAll().Result;
+            //var a = new PschedDto();
+            //a.count = info2.Count;
+            //return a;
+
             ////获取数据
             //var info1 = await _mes_technique.GetOneByID((long)1732029975067480064);
 
             ////更新数据
-            //info1.tech_name = "更新777";
-            //await _mes_technique.UpdateOne(info1, info1.Id);
-
+            //info1.tech_name = "更新***";
+            //var rlt =await _mes_technique.UpdateOne(info1, info1.Id);
+            return null;
             throw new NotImplementedException();
 
         }
@@ -167,7 +173,7 @@ namespace Business.ResourceExamineManagement
                 //TODO：入参异常；
                 //throw new NotImplementedException();
             }
-            var morderList = _mes_morder.GetAll();
+            var morderList = _mes_morder.GetAll().Result;
             var morderTypeList = morderList.Where(x => x.work_order_type == "备库工单" && x.morder_type == "计划工单" && x.bom_number == bomNumber && (x.morder_state == "初始" || x.morder_state == "下达")).ToList();
 
             //查询生产工单类型为计划工单并且工单类型为备库工单 并且BOM编码一致数据
@@ -198,9 +204,9 @@ namespace Business.ResourceExamineManagement
 
             //var query = (await _ic_bom.GetQueryableAsync()).WhereIf(true, a => a.bom_id == BomId).ToList();
             var help = new SnowFlake();
-            var bomlist = _ic_bom.GetAll();
-            var bomchildlist = _ic_bom_child.GetAll();
-            var icitemlist = _ic_item.GetAll();
+            var bomlist = _ic_bom.GetAll().Result;
+            var bomchildlist = _ic_bom_child.GetAll().Result;
+            var icitemlist = _ic_item.GetAll().Result;
             List<BomChildExamineDto> returnlist = new List<BomChildExamineDto>();
             var dto = new BomChildExamineDto();
             dto.bom_id = BomId.Value;

MicroServices/Business/Business.Core/MongoDBHelper/IMongoDB.cs

@@ -20,14 +20,14 @@ namespace Business.Core.MongoDBHelper
         /// </summary>
         /// <param name="document"></param>
         /// <returns></returns>
-        void InsertOne(T document);
+        Task InsertOne(T document);
 
         /// <summary>
         /// 插入多条数据
         /// </summary>
         /// <param name="documents"></param>
         /// <returns></returns>
-        void InsertMany(List<T> documents);
+        Task InsertMany(List<T> documents);
 
         /// <summary>
         /// 更新一条数据
@@ -35,19 +35,19 @@ namespace Business.Core.MongoDBHelper
         /// <param name="documents"></param>
         /// <param name="id"></param>
         /// <returns></returns>
-        ReplaceOneResult UpdateOne(T documents,long id);
+        Task<ReplaceOneResult> UpdateOne(T documents,long id);
 
         /// <summary>
         /// 获取所有数据
         /// </summary>
         /// <returns></returns>
-        List<T> GetAll();
+        Task<List<T>> GetAll();
 
         /// <summary>
         /// 根据ID获取数据
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        T GetOneByID(long id);
+        Task<T> GetOneByID(long id);
     }
 }

MicroServices/Business/Business.Core/MongoDBHelper/MongoDBTools.cs

@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Options;
 using MongoDB.Bson;
 using MongoDB.Driver;
+using MongoDB.Driver.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -46,9 +47,9 @@ namespace Business.Core.MongoDBHelper
         /// </summary>
         /// <param name="document"></param>
         /// <returns></returns>
-        public void InsertOne(T document)
+        public Task InsertOne(T document)
         {
-             mongoCollection.InsertOne(document);
+            return mongoCollection.InsertOneAsync(document);
         }
 
         /// <summary>
@@ -57,9 +58,9 @@ namespace Business.Core.MongoDBHelper
         /// <param name="documents"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public void InsertMany(List<T> documents)
+        public Task InsertMany(List<T> documents)
         {
-            mongoCollection.InsertMany(documents,new InsertManyOptions() { IsOrdered = false});
+           return mongoCollection.InsertManyAsync(documents,new InsertManyOptions() { IsOrdered = false});
         }
 
         /// <summary>
@@ -68,9 +69,9 @@ namespace Business.Core.MongoDBHelper
         /// <param name="documents"></param>
         /// <param name="id"></param>
         /// <returns></returns>
-        public ReplaceOneResult UpdateOne(T documents,long id)
+        public Task<ReplaceOneResult> UpdateOne(T documents,long id)
         {
-            return mongoCollection.ReplaceOne(Builders<T>.Filter.Eq(p=>p.Id, id), documents);
+            return mongoCollection.ReplaceOneAsync(Builders<T>.Filter.Eq(p=>p.Id, id), documents);
         }
 
         /// <summary>
@@ -78,9 +79,9 @@ namespace Business.Core.MongoDBHelper
         /// </summary>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public List<T> GetAll()
+        public Task<List<T>> GetAll()
         {
-            return mongoCollection.AsQueryable().ToList();
+            return mongoCollection.AsQueryable<T>().ToListAsync();
         }
 
         /// <summary>
@@ -89,9 +90,9 @@ namespace Business.Core.MongoDBHelper
         /// <param name="id"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public T GetOneByID(long id)
+        public Task<T> GetOneByID(long id)
         {
-            return mongoCollection.Find(p => p.Id == id).FirstOrDefault();
+            return mongoCollection.Find(p => p.Id == id).FirstOrDefaultAsync();
         }
 
     }