瀏覽代碼

Merge branch 'master' of https://git.dev.tencent.com/xuhuo1234/saga

xulisong 6 年之前
父節點
當前提交
4ea729ba18

+ 1 - 0
MBI/MBIResource/Config/HttpSetting.ini

@@ -5,3 +5,4 @@ ScanBuildingLocalHost = http://mbi.sagacloud.cn:8080/ScanBuilding/
 OssClientFileKey = files/revit/
 GplotViewHost = http://mbi.sagacloud.cn:8888/#/
 ImageServiceLocalHost = http://service.sagacloud.cn:28888/
+Html5ScanLocalHost = http://mbi.sagacloud.cn:8888/#/

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


+ 16 - 7
MBI/SAGA.MBI/Extend/StringExtend.cs

@@ -31,13 +31,22 @@ namespace SAGA.MBI.Tools
         /// <returns></returns>
         public static int GetBIMID(this string cbimId)
         {
-            string bimId = cbimId;
-            var strs = cbimId.Split(':');
-            if (strs.Length > 1)
-                bimId = strs[1];
-            return bimId.ToInt();
+            try
+            {
+                string bimId = cbimId;
+                var strs = cbimId.Split(':');
+                if (strs.Length > 1)
+                    bimId = strs[1];
+                return bimId.ToInt();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+                return 0;
+            }
+
         }
-    
+
         /// <summary>
         /// 仅保留岗位,没有对应模型的bimid
         /// 格式为:
@@ -142,7 +151,7 @@ namespace SAGA.MBI.Tools
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public static bool IsSuccessRequest2(this string request,ref string msg)
+        public static bool IsSuccessRequest2(this string request, ref string msg)
         {
             bool result = false;
             if (request.IsNullOrEmpty()) return result;

+ 1 - 0
MBI/SAGA.MBI/ToolsData/CheckBase/CheckOperation.cs

@@ -63,6 +63,7 @@ namespace SAGA.MBI.ToolsData.CheckBase
             list.Add(new SystemCheck());
             list.Add(new EquipmentInSpaceCheck());
             list.Add(new EquipReferSystemCheck());
+            list.Add(new ParameterIntegrityCheck());
             list.ForEach(t =>
             {
                 t.SetBaseCheck(checkBase);

+ 1 - 2
MBI/SAGA.MBI/ToolsData/ModeCheck/ParameterIntegrityCheck.cs

@@ -54,7 +54,6 @@ namespace SAGA.MBI.ToolsData.ModeCheck
         private bool FamilyNameCodeCheck()
         {
             bool unitResult = true;
-            var list = new List<ParameterIntegrityCheckResult>();
             foreach (SagaSignCheckResult signResult in RBase.Results)
             {
                 var doc = signResult.RDocument;
@@ -69,7 +68,7 @@ namespace SAGA.MBI.ToolsData.ModeCheck
                     if (result == null) continue;
                     result.FamilyName = familyName;
                     result.RBase = signResult;
-                    list.Add(result);
+                    Results.Add(result);
                 }
             }
             return Results.All(t => t.IsRight);