Browse Source

mxg:修改缓存本层下所有岗位的接口

mengxiangge 5 years ago
parent
commit
ff9d5e6df5

+ 2 - 1
MBI/SAGA.MBI/DataArrange/DalCommon.cs

@@ -157,7 +157,8 @@ namespace SAGA.MBI.DataArrange
             if (type == null)
                 type = new[] { "Eq", "Ec", "VOBc", "Si" };
             var goodhandTypes = new[] { "Eq", "Ec", "VOBc" };
-
+            list.AddRange(DownLoadFloorDataByBIMFloorInfo(floorId, type));
+            return list;
             var bygoodhandQuerys = type.Where(t => goodhandTypes.Contains(t)).ToArray();
             if (bygoodhandQuerys.Any())
             {

+ 1 - 1
MBI/SAGA.MBI/DataArrange/DalModeFileManange.cs

@@ -378,7 +378,7 @@ namespace SAGA.MBI.DataArrange
             {
                 //Traceloger.Show();
                 Traceloger.Log("从物理世界下载旧数据");
-                var oldContext = DalCommon.DownLoadCouldData(floor);
+                var oldContext = DalCommon.DownLoadFloorDataByBIMFloorInfo(floor);
                 Traceloger.Log("从新模型计算新数据");
                 var newContext = ObjectCalc.Calc(floor);
                 //分组

+ 22 - 0
MBI/SAGA.MBI/Model/MEquipment.cs

@@ -100,6 +100,26 @@ namespace SAGA.MBI.Model
                 return MBIElementUtils.GetCADID(LocalId, LocalName);
             }
         }
+        private string m_BIMFamilyName;
+        [Description("BIMFamilyName")]
+        public string BIMFamilyName
+        {
+            set { m_BIMFamilyName = value; }
+            get
+            {
+                return m_BIMFamilyName;
+            }
+        }
+        private string m_BIMFamilySymbol;
+        [Description("BIMFamilySymbol")]
+        public string BIMFamilySymbol
+        {
+            set { m_BIMFamilySymbol = value; }
+            get
+            {
+                return m_BIMFamilySymbol;
+            }
+        }
 
         #endregion CloudProperty
 
@@ -149,6 +169,8 @@ namespace SAGA.MBI.Model
             base.ReadRevitParamter(elem);
             this.LocalId = elem.GetParameterString(RevitBuiltInParameter.EquipLocalID);
             this.LocalName = elem.GetParameterString(RevitBuiltInParameter.EquipLocalName);
+            this.BIMFamilyName = elem.GetFamilyName();
+            this.BIMFamilySymbol = elem.GetFamilySymbol()?.Name;
         }
         #endregion
 

+ 22 - 0
MBI/SAGA.MBI/Model/MEquipmentPart.cs

@@ -108,6 +108,26 @@ namespace SAGA.MBI.Model
                 return MBIElementUtils.GetCADID(LocalId, LocalName);
             }
         }
+        private string m_BIMFamilyName;
+        [Description("BIMFamilyName")]
+        public string BIMFamilyName
+        {
+            set { m_BIMFamilyName = value; }
+            get
+            {
+                return m_BIMFamilyName;
+            }
+        }
+        private string m_BIMFamilySymbol;
+        [Description("BIMFamilySymbol")]
+        public string BIMFamilySymbol
+        {
+            set { m_BIMFamilySymbol = value; }
+            get
+            {
+                return m_BIMFamilySymbol;
+            }
+        }
         #endregion Model
 
 
@@ -163,6 +183,8 @@ namespace SAGA.MBI.Model
             base.ReadRevitParamter(elem);
             this.LocalId =  elem.GetParameterString(RevitBuiltInParameter.EquipLocalID);
             this.LocalName = elem.GetParameterString(RevitBuiltInParameter.EquipLocalName);
+            this.BIMFamilyName = elem.GetFamilyName();
+            this.BIMFamilySymbol = elem.GetFamilySymbol()?.Name;
         }
         #endregion
 

+ 1 - 1
MBI/SAGA.MBI/ToolsData/CheckEquipCategory.cs

@@ -56,7 +56,7 @@ namespace SAGA.MBI.ToolsData
         /// <returns></returns>
         private static void Operate(MFloor floor)
         {
-            var context = DalCommon.DownLoadCouldData(floor);
+            var context = DalCommon.DownLoadFloorDataByBIMFloorInfo(floor);
             context.OpenDocument();
             try
             {

+ 1 - 1
MBI/SAGA.MBI/ToolsData/CheckEquipInSpace.cs

@@ -54,7 +54,7 @@ namespace SAGA.MBI.ToolsData
             var doc = ExternalDataWrapper.Current.Doc;
             var floorid=doc.PathName.GetFileName();
             MFloor floor = DalProjectTree.GetFloorByFloorId(floorid);
-            CalcContext context = DalCommon.DownLoadCouldData(floor);
+            CalcContext context = DalCommon.DownLoadFloorDataByBIMFloorInfo(floor);
             context.OpenDocument();
             var document = context.RevitDoc;
             var spaces = context.MSpaces;

+ 1 - 1
MBI/SAGA.MBI/ToolsData/CorrectLossDuty.cs

@@ -90,7 +90,7 @@ namespace SAGA.MBI.ToolsData
             GetCheckResult(MFloor floor)
         {
             Log4Net.Debug("start");
-            var oldContext = DalCommon.DownLoadCouldData(floor);
+            var oldContext = DalCommon.DownLoadFloorDataByBIMFloorInfo(floor);
             Log4Net.Debug("download");
             var newContext = ObjectCalc.Calc_Simple(floor);
             Log4Net.Debug("calc");

+ 1 - 1
MBI/SAGA.MBI/ToolsData/DelZeroSpace.cs

@@ -60,7 +60,7 @@ namespace SAGA.MBI.ToolsData
         private static int Operate(MFloor floor)
         {
             int count = 0;
-            var context = DalCommon.DownLoadCouldData(floor);
+            var context = DalCommon.DownLoadFloorDataByBIMFloorInfo(floor);
             context.OpenDocument();
             try
             {