Selaa lähdekoodia

孟向歌:完善垃圾数据检查《与业务空间有所在关系的设备的实际位置和业务空间位置不一致检查》的检查结果

mengxiangge 6 vuotta sitten
vanhempi
commit
681a8380c9

BIN
MBI/MBIResource/DataCheck/模型检查结果输出格式-模版.xlsx


+ 2 - 2
MBI/SAGA.MBI/RequestData/CommonRequest.cs

@@ -66,11 +66,11 @@ namespace SAGA.MBI.RequestData
                 type = new string[] { "Eq", "Ec", "Si", "VOBc" };
             }
             infoJObject.Add("type", new JArray(type));
-            if (type.FirstOrDefault(t => Regex.IsMatch(t, "VO.*")) == null)
+            if (type.FirstOrDefault(t => Regex.IsMatch(t, "VO.*")) != null)
             {
                 //信标加BuildingId查不出来
             }
-            else if (type.FirstOrDefault(t => new[] { "Eq", "Ec" }.Contains(t)) == null)
+            else if (type.FirstOrDefault(t => new[] { "Eq", "Ec" }.Contains(t)) != null)
             {
                 //设备需要加buildingId
                 string buildingId = DalProjectTree.GetBuildingIdByFloor(floorId);

+ 3 - 2
MBI/SAGA.MBI/ToolsData/CheckBase/DCNPOIExtend.cs

@@ -25,8 +25,9 @@ namespace SAGA.MBI.ToolsData.CheckBase
         /// <param name="style"></param>
         public static void AddCell(this IRow row, int column, string str, DataCheckNPOIStyle style = DataCheckNPOIStyle.Content, bool hasStyle = false)
         {
-
-            ICell cell00 = row.CreateCell(column);
+            ICell cell00 = row.GetCell(column);
+            if (cell00 == null)
+                cell00 = row.CreateCell(column);
             if (hasStyle)
                 cell00.CellStyle = DCNPOIExtend.GetCellStyle(row.Sheet.Workbook, style);
             cell00.SetCellType(NPOI.SS.UserModel.CellType.String);

+ 1 - 1
MBI/SAGA.MBI/ToolsData/DataCheck/QRCodeContextCheck.cs

@@ -33,7 +33,7 @@ namespace SAGA.MBI.ToolsData.DataCheck
     {
         public QRCodeContextCheck()
         {
-            Name = "二维码内容错误";
+            Name = "物理世界中资产岗位关系与二维码中存的关系一致性检查";
         }
         [DataCheckProcessAspect]
         public override bool Check()

+ 13 - 5
MBI/SAGA.MBI/ToolsData/DataCheck/SpaceEquipFloorCheck.cs

@@ -15,6 +15,7 @@ using SAGA.MBI.ToolsData.ModeCheck;
 using SAGA.RevitUtils.MEP;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 
 namespace SAGA.MBI.ToolsData.DataCheck
@@ -82,20 +83,27 @@ namespace SAGA.MBI.ToolsData.DataCheck
             List<SpaceEquipFloorCheckResult> list = new List<SpaceEquipFloorCheckResult>();
             try
             {
+                //楼层下的业务空间
                 var spacesB = DalCommon.DownLoadCouldData(mFloor.Id, new[] { businessSpaceType.Code });
+                if (!spacesB.Any()) return list;
+                #region 业务空间下的设备
+
                 JObject jObject = new JObject();
-                JArray jArray=new JArray();
+                JArray jArray = new JArray();
                 foreach (MRevitEquipBase space in spacesB)
                 {
                     JObject graphJObject = new JObject();
-                    graphJObject.Add("graphType", businessSpaceType.Code);
-                    graphJObject.Add("relType", businessSpaceType.Rel_Type);
+                    graphJObject.Add("graphType", "EquipinSpace");
+                    graphJObject.Add("relType", "1");
                     graphJObject.Add("side", "fromId");
                     graphJObject.Add("toId", space.Id);
                     jArray.Add(graphJObject);
                 }
-                jObject.Add("include",jArray);
-                var equipsC = CommonConvert.FloorQuery_SubSet(mFloor.Id, jObject, new[] { businessSpaceType.Code });
+                jObject.Add("include", jArray);
+                var equipsC = CommonConvert.FloorQuery_SubSet(mFloor.Id, jObject, new[] { "Eq" });
+
+                #endregion
+                //不在业务空间中的设备
                 var equipsD = equipsC.Except(equipsA, new CommonEqualComparer<MRevitEquipBase>((a, b) => a.Id == b.Id));
                 foreach (MRevitEquipBase equipBase in equipsD)
                 {

+ 1 - 1
MBI/SAGA.MBI/ToolsData/ModeCheck/EquipReferSystemCheck.cs

@@ -24,7 +24,7 @@ namespace SAGA.MBI.ToolsData.ModeCheck
     {
         public EquipReferSystemCheck()
         {
-            Name = "管网及相关设备检查 ";
+            Name = "管网及相关设备检查";
             RSPecificationSheet.Add("参考-管网及相关设备");
         }
         [DataCheckProcessAspect]