Browse Source

xls:配置api信息 1.0 代码写死

xulisong 5 years ago
parent
commit
a16349d277

+ 2 - 13
Executer/DataExport/RevitToJBim/MbiExport.cs

@@ -8,22 +8,13 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Autodesk.Revit.Attributes;
 using Autodesk.Revit.DB;
-using Autodesk.Revit.DB.Mechanical;
-using Autodesk.Revit.DB.Plumbing;
-using Autodesk.Revit.UI;
+using MBIRevitBase.Services;
 using MBIRevitBase.Tools;
-using RevitExport;
 using RevitExport.Export;
 using RevitToJBim.ComponentParse;
 using RevitToJBim.JsonConverter;
 using RevitToJBim.MBI;
-using SAGA.RevitUtils;
-using SAGA.RevitUtils.Extends;
 
 namespace RevitToJBim
 {
@@ -48,9 +39,7 @@ namespace RevitToJBim
                  * 增加一些和JBIM无关,又和当前业务逻辑相关的属性
                  */
                 var result = BimJsonUtil.Serializer(mbiDocument);
-                var stream = ZipUtils.ZipString(result, "export.json");
-
-                var resultResponse = HttpUtils.PostFormDataFile("http://192.168.20.225:8080/revit-algorithm/upload-json-zip/upload", stream);
+                var resultResponse = UploadService.UploadExportFile(result);
                 string fileName = DateTime.Now.ToString("yyyyMMddHHmmss");
                 string path = Path.Combine(@"D:\", $"{fileName}.json");
                 File.WriteAllText(path, resultResponse.ToString());

+ 30 - 0
Executer/MBIRevitBase/Config/ApiConfig.cs

@@ -0,0 +1,30 @@
+/*-------------------------------------------------------------------------
+ * 功能描述:ApiConfig
+ * 作者:xulisong
+ * 创建时间: 2019/7/30 10:14:55
+ * 版本号:v1.0
+ *  -------------------------------------------------------------------------*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MBIRevitBase.Config
+{
+    public class ApiConfig
+    {
+        public static string m_AlgorithmUrl;
+
+        public static string AlgorithmUrl()
+        {
+            if (string.IsNullOrWhiteSpace(m_AlgorithmUrl))
+            {
+                m_AlgorithmUrl = "http://192.168.20.225:8080/revit-algorithm";
+            }
+
+            return m_AlgorithmUrl;
+        }
+    }
+}

+ 2 - 0
Executer/MBIRevitBase/MBIRevitBase.csproj

@@ -44,7 +44,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BResult.cs" />
+    <Compile Include="Config\ApiConfig.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Services\UploadService.cs" />
     <Compile Include="Tools\HttpUtils.cs" />
     <Compile Include="Tools\ZipUtils.cs" />
   </ItemGroup>

+ 35 - 0
Executer/MBIRevitBase/Services/UploadService.cs

@@ -0,0 +1,35 @@
+/*-------------------------------------------------------------------------
+ * 功能描述:UploadService
+ * 作者:xulisong
+ * 创建时间: 2019/7/30 10:44:23
+ * 版本号:v1.0
+ *  -------------------------------------------------------------------------*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MBIRevitBase.Config;
+using MBIRevitBase.Tools;
+
+namespace MBIRevitBase.Services
+{
+    /// <summary>
+    /// 上传服务类
+    /// </summary>
+    public class UploadService
+    {
+        /// <summary>
+        /// 上传导出文件
+        /// </summary>
+        /// <param name="result"></param>
+        /// <returns></returns>
+        public static BResult UploadExportFile(string result)
+        {
+            var stream = ZipUtils.ZipString(result, "export.json");
+            var url = ApiConfig.AlgorithmUrl() + @"/upload-json-zip/upload";
+            return HttpUtils.PostFormDataFile(url, stream);
+        }
+    }
+}

+ 4 - 0
Executer/MBIRevitBase/Tools/HttpUtils.cs

@@ -49,6 +49,10 @@ namespace MBIRevitBase.Tools
                         string rslt = result.Content.ReadAsStringAsync().Result;
                         return new BResult(true,rslt);
                     }
+                    else
+                    {
+                        return result.ToString();
+                    }
                 }
                 finally
                 {