浏览代码

mxg:管段检查,如果连接的是软管,忽略系统相等判断

mengxiangge 4 年之前
父节点
当前提交
893eb3b992

+ 2 - 2
Dispatcher/Client/app.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <appSettings>
-    <add key="IP" value="192.168.0.3" />
-    <!--<add key="IP" value="47.94.89.44" />-->
+    <!--<add key="IP" value="172.16.42.210" />-->
+    <add key="IP" value="47.94.89.44" />
     <add key="Port" value="6666" />
     <add key="DownloadFileDir" value="E:\\" />
     <add key="MaxTaskCount" value="3" />

+ 3 - 1
Executer/DataCheck/DataCheck.Mode/PipeCheck.cs

@@ -98,7 +98,9 @@ namespace ServiceRevitLib.DataCheck.Mode
                 List<MEPCurve> curves = endElements.OfType<MEPCurve>().ToList();
                 foreach (var mepCurve in curves)
                 {
-                    if (systemName != mepCurve.GetSystemTypeName())
+                    var tempSystem = mepCurve.GetSystemTypeName();
+                    if (tempSystem.IsNullOrEmpty()) continue;
+                    if (systemName != tempSystem)
                     {
                         errorCode = PipeCheckErrorCode.Code_002;
                         break;

+ 3 - 2
Executer/DataCheck/TestCommand.cs

@@ -29,10 +29,11 @@ namespace ServiceRevitLib
                 factory.SetCheckItems("SagaCheck,UnitCheck,FamilyNameCheck,EquipPartLocationCheck,ColumnCheck,ElementRangeCheck,ConnectorCheck,SystemNameCheck,EquipInSpaceCheck,SystemReferEquipCheck,ParameterIntegrityCheck,PipeCheck,XYZOverlapCheck");
                 factory.Check(doc);
                 result = Serialze(factory);
+#if DEBUG
                 string fileName = DateTime.Now.ToString("yyyyMMddHHmmss");
                 string path = Path.Combine(@"D:\", $"DataCheck{fileName}.json");
-                //File.WriteAllText(path, result);
-
+                File.WriteAllText(path, result);
+#endif
             }
             catch (Exception e)
             {

+ 2 - 2
Starter/Starter/Program.cs

@@ -38,14 +38,14 @@ namespace ExportStart
             if (string.IsNullOrWhiteSpace(command))
             {
                 command = "DataExport";
-                //command = "DataCheck";
+                command = "DataCheck";
                 path = @"E:\导出测试\testSpace.rvt";
                 path = @"E:\导出测试\系统图修改编码版\消防系统图模型第一版V1219.rvt";
                 path = @"E:\导出测试\无锡系统图1225\热源系统图模型第一版V1225.rvt";
                 path = @"D:\给排水系统图模型第一版V1225.rvt";
                 path = @"E:\1245.rvt";
 
-                path = @"C:\Users\SAGACLOUD\Desktop\北京亚洲金融大厦F9模型文件v3(1).rvt";
+                path = @"C:\Users\SAGACLOUD\Desktop\海天中心项目_AM_T1_25F.rvt";
                 //path = @"D:\安装包\CAD\测试模型\F4测试.rvt";
                 JObject jObject = new JObject();
                 jObject.Add("ResultFileName", @"C:\Users\SAGACLOUD\AppData\Local\RevitService\Result_e26be2fd-2097-462b-bdd0-a2a86b616928.txt");