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