Browse Source

mxg :删除debug调试代码,!debug为什么不执行??

mengxiangge 5 years ago
parent
commit
9fe7124017

+ 3 - 2
Dispatcher/Client/Start/RevitCmdExecutor.cs

@@ -48,14 +48,13 @@ namespace Client.Start
                 process.WaitForExit();//等待执行完成
                 process.Close();//结束
                 msg = ReadResultString(resultFilePath);
+                
                 Console.WriteLine(DateTime.Now + " 命令执行完成:" + revitCmd);
                 //执行完成后,删除文件
-#if !DEBUG
                 foreach (var f in filePathList)
                 {
                     File.Delete(f);
                 }
-#endif
             }
             catch (Exception e)
             {
@@ -105,6 +104,8 @@ namespace Client.Start
         {
             Console.WriteLine(filePath);
             string str = "";
+
+            
             if (File.Exists(filePath))
             {
                 str = File.ReadAllText(filePath);

+ 4 - 7
Executer/DataExport/RevitToJBim/MBI/MBIDocument.cs

@@ -47,14 +47,11 @@ namespace RevitToJBim.MBI
         {
             MBIDocument dto = new MBIDocument();
             JObject jObject = JObject.Parse(param);
-#if DEBUG
-            dto.MBIName = "Pj1101010015";//待读取
-            dto.ModelId = "6d8642d9d92a11e98e2d2108fa0baa21";
-#else
-             dto.MBIName = jObject.GetValueEx("MBIName");//待读取
-            dto.ModelId = jObject.GetValueEx("ModelId");
-#endif
 
+            dto.MBIName = jObject.GetValueEx("MBIName");//待读取
+            dto.ModelId = jObject.GetValueEx("ModelId");
+            //dto.MBIName = "Pj1101010015";//待读取
+            //dto.ModelId = "6d8642d9d92a11e98e2d2108fa0baa21";
             dto.PlanName = document.GetUseView()?.Name;
             return dto;
         }

+ 9 - 9
Executer/DataExport/RevitToJBim/MbiExport.cs

@@ -22,7 +22,7 @@ namespace RevitToJBim
 {
     public class MbiExport
     {
-        public static string Export(Document document,string param)
+        public static string Export(Document document, string param)
         {
             string result = null;
             //导出类
@@ -43,18 +43,18 @@ namespace RevitToJBim
                  */
                 var json = BimJsonUtil.Serializer(mbiDocument);
                 var resultResponse = UploadService.UploadExportFile(json);
-                result= BimJsonUtil.Serializer((ResultBase)resultResponse);
-                //保存到本地
-                string fileName = DateTime.Now.ToString("yyyyMMddHHmmss");
-                string path = Path.Combine( $"{document.PathName}_{fileName}.json");
-#if DEBUG
-                File.WriteAllText(path, json.ToString());
-#endif
+                result = BimJsonUtil.Serializer((ResultBase)resultResponse);
+
+//保存到本地
+                //string fileName = DateTime.Now.ToString("yyyyMMddHHmmss");
+                //string path = Path.Combine( $"{document.PathName}_{fileName}.json");
+                //File.WriteAllText(path, json.ToString());
+
 
             }
             catch (Exception ex)
             {
-                result = BimJsonUtil.Serializer(ResultBase.Exception(ex.Message+ex.StackTrace));
+                result = BimJsonUtil.Serializer(ResultBase.Exception(ex.Message + ex.StackTrace));
             }
 
             return result;

+ 1 - 1
Executer/MBIRevitBase/Services/UploadService.cs

@@ -45,7 +45,7 @@ namespace MBIRevitBase.Services
             try
             {
 #if DEBUG
-                var waitAndRetryPolicy = Policy.Handle<Exception>().WaitAndRetry(1,
+                var waitAndRetryPolicy = Policy.Handle<Exception>().WaitAndRetry(4,
                     (i, t) => TimeSpan.FromSeconds(5), ReportError);
 #else
                 var waitAndRetryPolicy = Policy.Handle<Exception>().WaitAndRetry(4,

+ 6 - 2
Starter/Starter/Program.cs

@@ -69,9 +69,10 @@ namespace ExportStart
                         result=Export(doc,param);
                         break;
                 }
-#if !DEBUG
+                File.AppendAllText(@"D:\log.txt", "log:"+result);
+
                 SaveResult(param, result);
-#endif
+
                 RevitCoreContext.Instance.Stop();
             }
             Console.WriteLine("ExportStart End");
@@ -91,8 +92,10 @@ namespace ExportStart
                 JObject jObject = JObject.Parse(param);
                 string key = "ResultFileName";
                 string path = jObject[key].ToString();
+                File.AppendAllText(@"D:\log.txt",path);
                 if (path.IsNotNullEmpty())
                 {
+                    File.AppendAllText(@"D:\log.txt", result);
                     Console.WriteLine(path);
                     var  dir = Directory.GetParent(path);
                     if(!dir.Exists)
@@ -102,6 +105,7 @@ namespace ExportStart
             }
             catch (Exception e)
             {
+                File.AppendAllText(@"D:\log.txt", e.StackTrace);
                 Console.WriteLine(e);
             }
         }