Преглед на файлове

mxg:MSpace改名为MISpace

mengxiangge преди 6 години
родител
ревизия
059b7c409f
променени са 26 файла, в които са добавени 330 реда и са изтрити 42 реда
  1. 2 2
      MBI/SAGA.MBI/Calc/CalcContext.cs
  2. 4 4
      MBI/SAGA.MBI/Calc/ObjectCalc.cs
  3. 3 3
      MBI/SAGA.MBI/DataArrange/DalModeFileManange.cs
  4. 25 0
      MBI/SAGA.MBI/DataArrange/DalSpace.cs
  5. 1 1
      MBI/SAGA.MBI/JsonConvert/CommonConvert.cs
  6. 2 2
      MBI/SAGA.MBI/JsonConvert/SpaceConvert.cs
  7. 25 0
      MBI/SAGA.MBI/Model/GraphRelationType.cs
  8. 0 0
      MBI/SAGA.MBI/Model/MISpace.cs
  9. 1 1
      MBI/SAGA.MBI/Model/MRevitEquipBase.cs
  10. 2 2
      MBI/SAGA.MBI/Model/RltBeaconinElementSp.cs
  11. 2 2
      MBI/SAGA.MBI/Model/RltEquipInSpace.cs
  12. 14 0
      MBI/SAGA.MBI/RequestData/SpaceRequest.cs
  13. 4 1
      MBI/SAGA.MBI/SAGA.MBI.csproj
  14. 2 2
      MBI/SAGA.MBI/ToolsData/CheckEquipCategory.cs
  15. 189 0
      MBI/SAGA.MBI/ToolsData/DataCheck/SpaceEquipFloorCheck.cs
  16. 31 0
      MBI/SAGA.MBI/ToolsData/DataCheck/SpaceEquipFloorCheckResult.cs
  17. 1 1
      MBI/SAGA.MBI/ToolsData/UpdateRelationEquipinSpace.cs
  18. 4 3
      MBI/SAGA.MBI/WinView/Login/UcMFMFloorUp.xaml
  19. 1 1
      MBI/SAGA.MBI/WinView/ModeInfoMaintenance/PWGInstace.cs
  20. 1 1
      MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinModeInfoMaintenance.xaml.cs
  21. 1 1
      MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinModeInfoMaintenanceForSpace.xaml.cs
  22. 3 3
      MBI/SAGA.MBI/WinView/Space/FloorSpaceContext.cs
  23. 1 1
      MBI/SAGA.MBI/WinView/Space/ServerSpace.cs
  24. 2 2
      MBI/SAGA.MBI/WinView/Space/SpaceManager.cs
  25. 5 5
      MBI/SAGA.MBI/WinView/Space/WinCreateSpace.xaml.cs
  26. 4 4
      MBI/SAGA.MBI/WinView/Space/WinCreateSpaceWeb.xaml.cs

+ 2 - 2
MBI/SAGA.MBI/Calc/CalcContext.cs

@@ -44,7 +44,7 @@ namespace SAGA.MBI.Calc
         public string FloorId { get { return MFloor.Id; } }
         public Document RevitDoc { get; set; }
         [InitAttribute]
-        public ObservableCollection<MSpace> MSpaces { get; set; }
+        public ObservableCollection<MISpace> MSpaces { get; set; }
         [InitAttribute]
         public ObservableCollection<MEquipment> MEquipments { get; set; }
         [InitAttribute]
@@ -155,7 +155,7 @@ namespace SAGA.MBI.Calc
             {
                 this.MEquipmentParts.Add(part);
             }
-            else if (mode is MSpace space)
+            else if (mode is MISpace space)
             {
                 this.MSpaces.Add(space);
             }

+ 4 - 4
MBI/SAGA.MBI/Calc/ObjectCalc.cs

@@ -60,7 +60,7 @@ namespace SAGA.MBI.Calc
             foreach (Space space in spaces)
             {
                 if(!space.IsSpace())continue;
-                MSpace mspace = DalSpace.GetSpace(space);
+                MISpace mspace = DalSpace.GetSpace(space);
                 if(mspace==null)continue;
                 mspace.Operator = DocumentChangedOperator.Add;
                 context.MSpaces.Add(mspace);
@@ -87,7 +87,7 @@ namespace SAGA.MBI.Calc
                     var space = fi.GetReferenceSpace();
                     if (space == null) continue;
                     string spaceId = space.GetCloudBIMId();
-                    MSpace mSpace = context.MSpaces.FirstOrDefault(t => t.BimID == spaceId);
+                    MISpace mSpace = context.MSpaces.FirstOrDefault(t => t.BimID == spaceId);
                     if (mSpace != null)
                     {
                         //设备所在空间添加添加一组关系
@@ -107,7 +107,7 @@ namespace SAGA.MBI.Calc
                     var space = fi.GetReferenceSpace();
                     if (space == null) continue;
                     string spaceId = space.GetCloudBIMId();
-                    MSpace mSpace = context.MSpaces.FirstOrDefault(t => t.BimID == spaceId);
+                    MISpace mSpace = context.MSpaces.FirstOrDefault(t => t.BimID == spaceId);
                     if (mSpace != null)
                     {
                         context.RltBeaconinElementSps.Add(new RltBeaconinElementSp(mSpace, mode) { Operator = DocumentChangedOperator.Add });
@@ -130,7 +130,7 @@ namespace SAGA.MBI.Calc
                     var space = fi.GetReferenceSpace();
                     if (space == null) continue;
                     string spaceId = space.GetCloudBIMId();
-                    MSpace mSpace = context.MSpaces.FirstOrDefault(t => t.BimID == spaceId);
+                    MISpace mSpace = context.MSpaces.FirstOrDefault(t => t.BimID == spaceId);
                     if (mSpace != null)
                     {
                         //设备所在空间添加添加一组关系

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

@@ -257,7 +257,7 @@ namespace SAGA.MBI.DataArrange
             if (isExceptSpace)
             {
                 var spaces = oldContext.MSpaces.Except(newContext.MSpaces,
-                    new CommonEqualComparer<MSpace>((a, b) => { return a.BimID == b.BimID; }));
+                    new CommonEqualComparer<MISpace>((a, b) => { return a.BimID == b.BimID; }));
                 context.MSpaces.AddRange(spaces);
             }
             else
@@ -290,7 +290,7 @@ namespace SAGA.MBI.DataArrange
             if (isExceptSpace)
             {
                 var spaces = oldContext.MSpaces.Intersect(newContext.MSpaces,
-                    new CommonEqualComparer<MSpace>((a, b) => { return a.BimID == b.BimID; }));
+                    new CommonEqualComparer<MISpace>((a, b) => { return a.BimID == b.BimID; }));
                 context.MSpaces.AddRange(spaces);
             }
             else
@@ -322,7 +322,7 @@ namespace SAGA.MBI.DataArrange
             if (isExceptSpace)
             {
                 var spaces = newContext.MSpaces.Except(oldContext.MSpaces,
-                    new CommonEqualComparer<MSpace>((a, b) => { return a.BimID == b.BimID; }));
+                    new CommonEqualComparer<MISpace>((a, b) => { return a.BimID == b.BimID; }));
                 context.MSpaces.AddRange(spaces);
                 //处理设备所在空间
                 context.RltEquipInSpaces.AddRange(newContext.RltEquipInSpaces.Where(t => context.MEquipments.Select(tt => tt.BimID).Contains((t)?.MEquipment.BimID)));

+ 25 - 0
MBI/SAGA.MBI/DataArrange/DalSpace.cs

@@ -14,9 +14,11 @@ using SAGA.MBI.JsonConvert;
 using SAGA.MBI.Model;
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Mechanical;
+using Newtonsoft.Json.Linq;
 using SAGA.DotNetUtils.Extend;
 using SAGA.DotNetUtils.Logger;
 using SAGA.MBI.Common;
+using SAGA.MBI.RequestData;
 using SAGA.MBI.Tools;
 using SAGA.RevitUtils.Extends;
 
@@ -91,5 +93,28 @@ namespace SAGA.MBI.DataArrange
             mSpace = DalCommon.QueryObjectById(spaceId) as MSpace;
             return mSpace;
         }
+
+        /// <summary>
+        /// 获取业务空间的类型
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public static List<GraphRelationType> GetBusinessSpaceTypes()
+        {
+            List<GraphRelationType> list = new List<GraphRelationType>();
+            var json = SpaceRequest.GetBusinessSpaceTypes();
+            if (!json.IsRequestHasItem()) return list;
+            JObject jObject = JObject.Parse(json);
+            foreach (JObject jobjItem in jObject["Content"])
+            {
+                GraphRelationType item=new GraphRelationType();
+                item.Name = jobjItem.GetValueEx("name");
+                item.Code = jobjItem.GetValueEx("code");
+                item.Rel_Type = jobjItem.GetValueEx("rel_type");
+                list.Add(item);
+            }
+            return list;
+        }
     }
 }
+

+ 1 - 1
MBI/SAGA.MBI/JsonConvert/CommonConvert.cs

@@ -125,7 +125,7 @@ namespace SAGA.MBI.RequestData
                 }
                 else if (id.StartsWith("Si"))
                 {
-                    mode = new MSpace(floorId, bimId);
+                    mode = new MISpace(floorId, bimId);
                 }
                 else if (id.StartsWith("VOBc"))
                 {

+ 2 - 2
MBI/SAGA.MBI/JsonConvert/SpaceConvert.cs

@@ -29,7 +29,7 @@ namespace SAGA.MBI.JsonConvert
         /// <param name="buildingId"></param>
         /// <param name="infos"></param>
         /// <returns></returns>
-        public static bool AddSpace(MSpace mode)
+        public static bool AddSpace(MISpace mode)
         {
             string floorId = mode.FloorId;
             JObject infos = mode.GetInfosJObject();
@@ -61,7 +61,7 @@ namespace SAGA.MBI.JsonConvert
         /// </summary>
         /// <param name="beacon"></param>
         /// <returns></returns>
-        public static bool QuerySpaceInfo(MSpace mode)
+        public static bool QuerySpaceInfo(MISpace mode)
         {
             string floorId = mode.FloorId;
             string bimId = mode.BimID;

+ 25 - 0
MBI/SAGA.MBI/Model/GraphRelationType.cs

@@ -0,0 +1,25 @@
+/* ==============================================================================
+ * 功能描述:图关系类型
+ * 创 建 者:Garrett
+ * 创建日期:2019/1/15 17:19:04
+ * ==============================================================================*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SAGA.MBI.Model
+{
+    /// <summary>
+    /// BusinessSpaceType
+    /// </summary>
+    public class GraphRelationType
+    {
+        public string Name { get; set; }
+
+        public string Code { get; set; }
+
+        public string Rel_Type { get; set; }
+    }
+}

MBI/SAGA.MBI/Model/MSpace.cs → MBI/SAGA.MBI/Model/MISpace.cs


+ 1 - 1
MBI/SAGA.MBI/Model/MRevitEquipBase.cs

@@ -69,7 +69,7 @@ namespace SAGA.MBI.Model
         /// <summary>
         /// 设备所在元空间
         /// </summary>
-        public MSpace MSpace { get; set; }
+        public MISpace MSpace { get; set; }
         //是否上传
         public bool HasUpload { get; set; }
         //设备族名称

+ 2 - 2
MBI/SAGA.MBI/Model/RltBeaconinElementSp.cs

@@ -25,7 +25,7 @@ namespace SAGA.MBI.Model
     /// </summary>
     public class RltBeaconinElementSp : MGraphRelationBase
     {
-        public RltBeaconinElementSp(MSpace mSpace, MRevitEquipBase beacon) : this(beacon?.Id, mSpace?.Id)
+        public RltBeaconinElementSp(MISpace mSpace, MRevitEquipBase beacon) : this(beacon?.Id, mSpace?.Id)
         {
             MSpace = mSpace;
             MBeacon = beacon;
@@ -50,7 +50,7 @@ namespace SAGA.MBI.Model
         /// <summary>
         /// 空间
         /// </summary>
-        public MSpace MSpace { get; set; }
+        public MISpace MSpace { get; set; }
         /// <summary>
         /// 信标
         /// </summary>

+ 2 - 2
MBI/SAGA.MBI/Model/RltEquipInSpace.cs

@@ -22,7 +22,7 @@ namespace SAGA.MBI.Model
     /// </summary>
     public class RltEquipInSpace : MGraphRelationBase
     {
-        public RltEquipInSpace(MSpace mSpace, MRevitEquipBase mEquipment) : this(mEquipment?.Id, mSpace?.Id)
+        public RltEquipInSpace(MISpace mSpace, MRevitEquipBase mEquipment) : this(mEquipment?.Id, mSpace?.Id)
         {
             MSpace = mSpace;
             MEquipment = mEquipment;
@@ -37,7 +37,7 @@ namespace SAGA.MBI.Model
         /// <summary>
         /// 空间Id
         /// </summary>
-        public MSpace MSpace { get; set; }
+        public MISpace MSpace { get; set; }
         /// <summary>
         /// 设备Id
         /// </summary>

+ 14 - 0
MBI/SAGA.MBI/RequestData/SpaceRequest.cs

@@ -70,5 +70,19 @@ namespace SAGA.MBI.RequestData
             string request = CommonRequest.SubsetQuery(floorId,new JArray("Si"));
             return request;
         }
+
+        /// <summary>
+        /// 获取业务空间的类型
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public static string GetBusinessSpaceTypes()
+        {
+            string url = MBIConst.DataPlatformLocalHost + $"data-platform-3/infocode/business_space_type/query";
+            
+            RestClient client = new RestClient(url, HttpVerb.GET);
+            string request = client.PostRequest();
+            return request;
+        }
     }
 }

+ 4 - 1
MBI/SAGA.MBI/SAGA.MBI.csproj

@@ -273,10 +273,13 @@
     <Compile Include="ModeInfoEdit\WinPointInfoMerge.xaml.cs">
       <DependentUpon>WinPointInfoMerge.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Model\GraphRelationType.cs" />
     <Compile Include="Model\MQRCode.cs" />
     <Compile Include="RequestData\QRCodeRequest.cs" />
     <Compile Include="RevitModelHandle\RevitParameterUpdate.cs" />
     <Compile Include="RevitReference\RVTNoModeDutyOperate.cs" />
+    <Compile Include="ToolsData\DataCheck\SpaceEquipFloorCheck.cs" />
+    <Compile Include="ToolsData\DataCheck\SpaceEquipFloorCheckResult.cs" />
     <Compile Include="ToolsData\DelZeroSpace.cs" />
     <Compile Include="ToolsData\CheckBase\CheckOperation.cs" />
     <Compile Include="ToolsData\CheckBase\CheckType.cs" />
@@ -499,7 +502,7 @@
     <Compile Include="Model\MEquipmentFamily.cs" />
     <Compile Include="JsonConvert\EquipmentConvert.cs" />
     <Compile Include="Model\MServiceAttachment.cs" />
-    <Compile Include="Model\MSpace.cs" />
+    <Compile Include="Model\MISpace.cs" />
     <Compile Include="Model\PropertyDefineTb.cs" />
     <Compile Include="Model\RltEquipInSpace.cs" />
     <Compile Include="RequestData\CloudImageRequest.cs" />

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

@@ -124,7 +124,7 @@ namespace SAGA.MBI.ToolsData
                     var space = fi.GetReferenceSpace();
                     if (space == null) continue;
                     string spaceId = space.GetCloudBIMId();
-                    MSpace mSpace = addContext.MSpaces.FirstOrDefault(t => t.BimID == spaceId);
+                    MISpace mSpace = addContext.MSpaces.FirstOrDefault(t => t.BimID == spaceId);
                     if (mSpace == null)
                     {
                         mSpace = DalSpace.GetSpace(space);
@@ -157,7 +157,7 @@ namespace SAGA.MBI.ToolsData
                     var space = fi.GetReferenceSpace();
                     if (space == null) continue;
                     string spaceId = space.GetCloudBIMId();
-                    MSpace mSpace = addContext.MSpaces.FirstOrDefault(t => t.BimID == spaceId);
+                    MISpace mSpace = addContext.MSpaces.FirstOrDefault(t => t.BimID == spaceId);
                     if (mSpace == null)
                     {
                         mSpace = DalSpace.GetSpace(space);

+ 189 - 0
MBI/SAGA.MBI/ToolsData/DataCheck/SpaceEquipFloorCheck.cs

@@ -0,0 +1,189 @@
+/* ==============================================================================
+ * 功能描述:业务空间所在楼层与设备所在楼层一致性检查
+ * 创 建 者:Garrett
+ * 创建日期:2018/10/23 15:08:55
+ * ==============================================================================*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using Autodesk.Revit.DB;
+using Autodesk.Revit.DB.Mechanical;
+using Newtonsoft.Json.Linq;
+using NPOI.SS.UserModel;
+using SAGA.DotNetUtils.Extend;
+using SAGA.DotNetUtils.Others;
+using SAGA.MBI.DataArrange;
+using SAGA.MBI.JsonConvert;
+using SAGA.MBI.Model;
+using SAGA.MBI.RequestData;
+using SAGA.MBI.Tools;
+using SAGA.MBI.ToolsData.CheckBase;
+using SAGA.MBI.ToolsData.ModeCheck;
+using SAGA.RevitUtils.Extends;
+
+namespace SAGA.MBI.ToolsData.DataCheck
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    class SpaceEquipFloorCheck : DataCheckBase
+    {
+        public SpaceEquipFloorCheck()
+        {
+            Name = "业务空间所在楼层与设备所在楼层一致性检查";
+        }
+        [DataCheckProcessAspect]
+        public override bool Check()
+        {
+            IsRight = GetCheckResult();
+            return IsRight;
+        }
+
+        public override void Correct()
+        {
+            throw new NotImplementedException();
+        }
+
+        #region CheckMethod
+
+        private List<GraphRelationType> m_BusinessSpaceTypes;
+        /// <summary>
+        /// 对比信息点是否一致
+        /// </summary>
+        /// <returns></returns>
+        private bool GetCheckResult()
+        {
+            bool result = true;
+            m_BusinessSpaceTypes = DalSpace.GetBusinessSpaceTypes();
+            var floors = DalProjectTree.GetSelectedFloors(true);
+            foreach (var mfloor in floors)
+            {
+                Results.AddRange(GetCheckResult(mfloor));
+            }
+            return Results.All(t => t.IsRight);
+        }
+        private List<MissDutyOrModeCheckResult> GetCheckResult(MFloor mFloor)
+        {
+            List<MissDutyOrModeCheckResult> list = new List<MissDutyOrModeCheckResult>();
+
+            try
+            {
+                //本层下的设备和部件 
+                var equips = DalCommon.DownLoadCouldData(mFloor.Id, new[] {"Eq", "Ec"});
+                //本层下的业务空间
+                foreach (GraphRelationType businessSpaceType in m_BusinessSpaceTypes)
+                {
+                    
+                }
+            }
+            catch (Exception e)
+            {
+            }
+            return list;
+        }
+
+
+        //忽略的信息点
+        private List<string> m_IgnoreList=new List<string>(){ "EquipID" ,"EquipName"};
+        private DutyFMInfoCheckResult GetCheckResult(MRevitEquipBase duty, MEquipFM fm)
+        {
+            DutyFMInfoCheckResult result = null;
+            try
+            {
+                var dutyJObject = duty.CloundJObject;
+                var fmJson = fm.FMJson;
+                var fmJObject = JObject.Parse(fmJson);
+
+                PropertyDefineTb pdtb = PEPCodeConvert.GetPropertyDefineTb(duty.EquipClassCode);
+                StringBuilder sb = new StringBuilder();
+                foreach (KeyValuePair<string, JToken> pair in dutyJObject)
+                {
+                    string key = pair.Key;
+                    //不检查的信息点
+                    if(m_IgnoreList.Contains(key))continue;
+                    string dutyValue = pair.Value.ToString();
+                    string fmValue = fmJObject.GetValueEx(key);
+                    if (dutyValue.IsNotNullEmptyExt() && fmValue.IsNotNullEmptyExt() && !dutyValue.Equals(fmValue))
+                    {
+                        var define = pdtb.PropertyDefineItems.FirstOrDefault(t => t.CodeName == key);
+                        sb.Append($"{define?.Name??key}、");
+                    }
+                }
+                result = new DutyFMInfoCheckResult();
+                result.FloorName = DalProjectTree.GetFloorNameByFloorId(duty.FloorId);
+                result.DutyId = duty.Id;
+                result.DutyName = duty.ToString();
+                result.BIMID = duty.BimID.GetBIMID().ToString();
+                result.FMId = fm.Id;
+                result.FMName = fm.ToString();
+                result.IsRight = sb.Length == 0;
+                result.RMessage = result.IsRight ? "" : $"值不一致的信息点有:{sb}";
+            }
+            catch (Exception e)
+            {
+                return result;
+            }
+            return result;
+        }
+        
+
+
+        #endregion
+
+        //[DataCheckProcessAspect]
+        public override void Export()
+        {
+            //   Check();
+            try
+            {
+                IWorkbook book = DCRExport.GetWorkbook();
+                //ISheet sheet = book.CreateSheet(Name);
+                ISheet sheet = book.GetSheet(Name);
+
+                #region 添加数据
+                int index = 3;
+                //添加 共检查XXX条数据,未通过检查的如下 提示
+                IRow rowTip = sheet.CreateRow(index - 1);
+                rowTip.AddCell(0, $"总检查{Results.Count}条数据,未通过检查的如下", DataCheckNPOIStyle.Title);
+                //IRow row4 = sheet.CreateRow(index);
+                //row4.HeightInPoints = 15;
+
+                //row4.AddCell(0, "楼层本地名称", DataCheckNPOIStyle.Title);
+                //row4.AddCell(1, "文件名", DataCheckNPOIStyle.Title);
+                //row4.AddCell(2, "文件地址", DataCheckNPOIStyle.Title);
+                //row4.AddCell(3, "族名称", DataCheckNPOIStyle.Title);
+                //row4.AddCell(4, "类型", DataCheckNPOIStyle.Title);
+                //row4.AddCell(5, "ID", DataCheckNPOIStyle.Title);
+                //row4.AddCell(6, "通过", DataCheckNPOIStyle.Title);
+                //row4.AddCell(7, "备注(失败原因)", DataCheckNPOIStyle.Title);
+                foreach (DutyFMInfoCheckResult result in Results)
+                {
+                    //数量过多,只显示有问题的
+                    if (result.IsRight) continue;
+                    index++;
+                    IRow rowN = sheet.CreateRow(index);
+                    DataCheckNPOIStyle style = result.IsRight ? DataCheckNPOIStyle.Content : DataCheckNPOIStyle.Error;
+                    int i = 0;
+                    rowN.AddCell(i++, result.FloorName, style);
+                    rowN.AddCell(i++, result.FMId, style);
+                    rowN.AddCell(i++, result.FMName, style);
+                    rowN.AddCell(i++, result.DutyId, style);
+                    rowN.AddCell(i++, result.DutyName, style);
+                    rowN.AddCell(i++, result.BIMID, style);
+                    string rowN4 = result.IsRight ? "通过" : "不通过";
+                    rowN.AddCell(i++, rowN4, style);
+                    rowN.AddCell(i++, result.RMessage, style);
+                }
+                #endregion
+
+            }
+            catch (Exception e)
+            {
+                MessageShowBase.Show(e);
+            }
+        }
+    }
+}

+ 31 - 0
MBI/SAGA.MBI/ToolsData/DataCheck/SpaceEquipFloorCheckResult.cs

@@ -0,0 +1,31 @@
+/* ==============================================================================
+ * 功能描述:业务空间所在楼层与设备所在楼层一致性检查结果
+ * 创 建 者:Garrett
+ * 创建日期:2018/10/23 15:13:17
+ * ==============================================================================*/
+
+using SAGA.MBI.ToolsData.ModeCheck;
+
+namespace SAGA.MBI.ToolsData.DataCheck
+{
+    /// <summary>
+    /// UnitCheckResult
+    /// </summary>
+    class SpaceEquipFloorCheckResult : DataCheckResultBase
+    {
+        //业务空间类型
+        public string SpaceType { get; set; }
+        //业务空间本地名称
+        public string SpaceName { get; set; }
+        //业务空间Id
+        public string SpaceId { get; set; }
+        //业务空间所在楼层名称
+        public string SpaceFloorName { get; set; }
+        //业务空间中的设备Id
+        public string EquipId { get; set; }
+        //业务空间中的设备名称
+        public string EquipName { get; set; }
+        //设备所在楼层名称
+        public string EquipFloorName { get; set; }
+    }
+}

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

@@ -131,7 +131,7 @@ namespace SAGA.MBI.ToolsData
            
         }
 
-        private static string GetMSpace(Document doc,string bimid,List<MSpace> spaces)
+        private static string GetMSpace(Document doc,string bimid,List<MISpace> spaces)
         {
             FamilyInstance fi = doc.GetElement(bimid.GetBIMID()) as FamilyInstance;
             if (fi == null) return null;

+ 4 - 3
MBI/SAGA.MBI/WinView/Login/UcMFMFloorUp.xaml

@@ -27,9 +27,10 @@
             <Grid.RowDefinitions>
                 <RowDefinition Height="*"/>
                 <RowDefinition Height="50"/>
-            </Grid.RowDefinitions> <Label FontSize="25" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                <TextBlock Text="{Binding Path=PathDisplay,UpdateSourceTrigger=PropertyChanged}" TextWrapping="WrapWithOverflow"></TextBlock>
-            </Label>
+            </Grid.RowDefinitions>
+            <TextBlock FontSize="25" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center" 
+                       Text="{Binding Path=PathDisplay,UpdateSourceTrigger=PropertyChanged}" TextWrapping="WrapWithOverflow">
+            </TextBlock>
             <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Row="1" Height="30" Margin="0,0,30,0"
                        Visibility="{Binding Path=FloorLock.LockState,Converter={StaticResource LockStateToVisibleConverter},ConverterParameter={x:Static model:MFloorLockState.LockBySelf} }">
                 <Button Click="ButtonBase_OnClick">

+ 1 - 1
MBI/SAGA.MBI/WinView/ModeInfoMaintenance/PWGInstace.cs

@@ -48,7 +48,7 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
             foreach (var pdItem in pdtb.PropertyDefineItems)
             {
                 if (!pdItem.IsShow) continue;
-                if (equipment is MSpace)
+                if (equipment is MISpace)
                 {
                     //空间
                     var list = new List<string>() { "RoomID", "RoomName", "RoomLocalID", "RoomLocalName", "BIMID" };

+ 1 - 1
MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinModeInfoMaintenance.xaml.cs

@@ -93,7 +93,7 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
                 CompositeItem item = NullPWGInstace.GetUnknownBeaconItems(EquipmentInfo);
                 myWPG.Instance = item;
             }
-            else if (EquipmentInfo is MSpace space)
+            else if (EquipmentInfo is MISpace space)
             {
                 space.Name = "元空间";
                 GridNone.Visibility = Visibility.Visible;

+ 1 - 1
MBI/SAGA.MBI/WinView/ModeInfoMaintenance/WinModeInfoMaintenanceForSpace.xaml.cs

@@ -100,7 +100,7 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
                 CompositeItem item = NullPWGInstace.GetUnknownBeaconItems(EquipmentInfo);
                 myWPG.Instance = item;
             }
-            else if (EquipmentInfo is MSpace space) {
+            else if (EquipmentInfo is MISpace space) {
                 space.Name = "元空间";
                 GridNone.Visibility = Visibility.Visible;
                 CompositeItem item = NullPWGInstace.GetUnknownSpaceItems(EquipmentInfo?.BimID);

+ 3 - 3
MBI/SAGA.MBI/WinView/Space/FloorSpaceContext.cs

@@ -60,12 +60,12 @@ namespace SAGA.MBI.WinView
         /// <summary>
         /// 物理世界存在元空间
         /// </summary>
-        public List<MSpace> ServerSpaces { get;private set; }
-        public  List<MSpace> GetPhysicalSpaces(List<string> elementIds)
+        public List<MISpace> ServerSpaces { get;private set; }
+        public  List<MISpace> GetPhysicalSpaces(List<string> elementIds)
         {
             if (ServerSpaces == null)
             {
-                    ServerSpaces = SpaceConvert.GetFloorSpaceInfos(this.Floor?.Id).OfType<MSpace>().ToList();
+                    ServerSpaces = SpaceConvert.GetFloorSpaceInfos(this.Floor?.Id).OfType<MISpace>().ToList();
             }
             var   spaces= ServerSpaces.Where(s => elementIds.Exists(id => id.ToString() == s.BimID.Split(':')[1])).ToList();      
             return spaces;

+ 1 - 1
MBI/SAGA.MBI/WinView/Space/ServerSpace.cs

@@ -21,7 +21,7 @@ namespace SAGA.MBI.WinView.Space {
             set => SetProperty(ref this.m_Name, value);
         }
 
-        public MSpace Space { get; set ; }
+        public MISpace Space { get; set ; }
         //是否选中
 
         private bool m_ischecked;

+ 2 - 2
MBI/SAGA.MBI/WinView/Space/SpaceManager.cs

@@ -40,7 +40,7 @@ namespace SAGA.MBI.WinView
         /// </summary>
         /// <param name="space"></param>
         /// <returns></returns>
-        public static string GetElementId(MSpace space)
+        public static string GetElementId(MISpace space)
         {
             return space.BimID.Split(':')[1];
         }
@@ -214,7 +214,7 @@ namespace SAGA.MBI.WinView
                     var groupName = $"待合并元空间组{index}";
                     foreach (var mRevitEquipBase in spacesServerInfo)
                     {
-                        if (mRevitEquipBase is MSpace space)
+                        if (mRevitEquipBase is MISpace space)
                         {
                             serverSpaces.Add(new ServerSpace()
                             {

+ 5 - 5
MBI/SAGA.MBI/WinView/Space/WinCreateSpace.xaml.cs

@@ -876,7 +876,7 @@ namespace SAGA.MBI.WinView.Space
                         this.canvas.Children.Clear();
                         //添加默认提示
                         CanvasDefaultTips();
-                        lbSpaces.ItemsSource = new ObservableCollection<MSpace>();
+                        lbSpaces.ItemsSource = new ObservableCollection<MISpace>();
                         WinModeInfoMaintenance.GetWindow().Hide();
                     }
                     else
@@ -942,11 +942,11 @@ namespace SAGA.MBI.WinView.Space
             var datas = CurrentContext.GetPhysicalSpaces(spaces.Select(t => t.Id.IntegerValue.ToString()).ToList());
 
             var localSpace = spaces.Where(t => !datas.Any(s => s.BimID.Split(':')[1] == t.Id.ToString()))
-                .Select(t => new MSpace("", $"{Guid.NewGuid()}:{t.Id.ToString()}") { Name = t.Name });
+                .Select(t => new MISpace("", $"{Guid.NewGuid()}:{t.Id.ToString()}") { Name = t.Name });
             datas.AddRange(localSpace);
             //List<string> dd;
             //dd.AddRange();
-            lbSpaces.ItemsSource = new ObservableCollection<MSpace>(datas);
+            lbSpaces.ItemsSource = new ObservableCollection<MISpace>(datas);
         }
 
         
@@ -1009,7 +1009,7 @@ namespace SAGA.MBI.WinView.Space
             {
                 #region 核心代码
                 if (lbSpaces.SelectedItems.Count == 0) return;
-                var space = lbSpaces.SelectedItems[0] as MSpace;
+                var space = lbSpaces.SelectedItems[0] as MISpace;
                 var bimId = space.BimID.Split(':')[1];
                 foreach (var polyline in this.canvas.Children.OfType<WPolyline>())
                 {
@@ -1120,7 +1120,7 @@ namespace SAGA.MBI.WinView.Space
                     //反选右侧树
                     for (int i = 0; i < lbSpaces.Items.Count; i++)
                     {
-                        var showSpace = lbSpaces.Items[i] as MSpace;
+                        var showSpace = lbSpaces.Items[i] as MISpace;
                         var spaceId = showSpace.BimID.Split(':')[1];
                         if (spaceId == space.Id.ToString())
                         {

+ 4 - 4
MBI/SAGA.MBI/WinView/Space/WinCreateSpaceWeb.xaml.cs

@@ -97,7 +97,7 @@ namespace SAGA.MBI.WinView.Space
             try
             {
                 if (lbSpaces.SelectedItems.Count == 0) return;
-                var space = lbSpaces.SelectedItems[0] as MSpace;
+                var space = lbSpaces.SelectedItems[0] as MISpace;
                 var bimId = space.BimID.Split(':')[1];
                 //发送js填充命令
                 var strJs = $"getData('{bimId.ToString()}')";
@@ -170,7 +170,7 @@ namespace SAGA.MBI.WinView.Space
         private void ClearFloorData()
         {
             WinModeInfoMaintenance.GetWindow().Hide();
-            this.lbSpaces.ItemsSource = new ObservableCollection<MSpace>(); ;
+            this.lbSpaces.ItemsSource = new ObservableCollection<MISpace>(); ;
         }
         /// <summary>
         /// 设置窗口楼层相关数据
@@ -180,9 +180,9 @@ namespace SAGA.MBI.WinView.Space
             var spaces = CurrentContext.Document.GetElements<SpatialElement>().Where(s => s is Autodesk.Revit.DB.Mechanical.Space && s.Area > 0).ToList();
             var datas = CurrentContext.GetPhysicalSpaces(spaces.Select(t => t.Id.IntegerValue.ToString()).ToList());
             var localSpace = spaces.Where(t => !datas.Any(s => s.BimID.Split(':')[1] == t.Id.ToString()))
-                .Select(t => new MSpace("", $"{Guid.NewGuid()}:{t.Id.ToString()}") { Name = t.Name});
+                .Select(t => new MISpace("", $"{Guid.NewGuid()}:{t.Id.ToString()}") { Name = t.Name});
             datas.AddRange(localSpace);
-            lbSpaces.ItemsSource = new ObservableCollection<MSpace>(datas);
+            lbSpaces.ItemsSource = new ObservableCollection<MISpace>(datas);
         }
 
         #endregion