Browse Source

mxg:更改文件服务器地址

mengxiangge 6 years ago
parent
commit
ad7073ae37

+ 19 - 0
MBI/SAGA.MBI/Common/MBIConst.cs

@@ -65,6 +65,25 @@ namespace SAGA.MBI.Common
                 return url;
             }
         }
+        /// <summary>
+        /// 图片服务器,线上地址更新,
+        /// 之前与DataPlatflorm一致 190123
+        /// </summary>
+        public static string ImageServiceLocalHost
+        {
+            get
+            {
+                string key = nameof(ImageServiceLocalHost);
+                string url = ProjectDirOperate.GetConfigureInfo(key);
+                if (url.IsNullOrEmpty())
+                {
+                    //url = "http://192.168.20.225:8080/";
+                    url = "http://47.93.33.207:8889/";
+                    ProjectDirOperate.SaveConfigureInfo(key, url);
+                }
+                return url;
+            }
+        }
         public static string GoodHandLocalHost
         {
             get

+ 11 - 11
MBI/SAGA.MBI/JsonConvert/PEPCodeConvert.cs

@@ -59,17 +59,17 @@ namespace SAGA.MBI.JsonConvert
                     foreach (JObject subj in jObject["Content"])
                     {
                         PropertyDefineItem item = new PropertyDefineItem();
-                        item.Category = (string)subj["firstTag"];
-                        item.SubCategory = (string)subj["secondTag"];
-                        item.Name = (string)subj["infoPointName"];
-                        item.CodeName = (string)subj["infoPointCode"];
-                        item.Unit = (string)subj["unit"];
-                        item.Type = (string)subj["dataType"];
-                        item.InputType = (string)subj["inputMode"]; 
-                        item.EnumSource = subj.GetValueEx("dataSource");
-                        item.Remark = (string)subj["note"];
-                        item.Classification = (string)subj["classification"];
-                        item.IsShow = (bool)subj["visible"];
+                        item.Category = (string)subj["FirstTag"];
+                        item.SubCategory = (string)subj["SecondTag"];
+                        item.Name = (string)subj["InfoPointName"];
+                        item.CodeName = (string)subj["InfoPointCode"];
+                        item.Unit = (string)subj["Unit"];
+                        item.Type = (string)subj["DataType"];
+                        item.InputType = (string)subj["InputMode"]; 
+                        item.EnumSource = subj.GetValueEx("DataSource");
+                        item.Remark = (string)subj["Note"];
+                        item.Classification = (string)subj["Classification"];
+                        item.IsShow = (bool)subj["Visible"];
                         item.CollectionCmptCode = DalInfoCode.GetInputType(item.InputType);
                         tb.PropertyDefineItems.Add(item);
                     }

+ 2 - 2
MBI/SAGA.MBI/RequestData/CloudImageRequest.cs

@@ -34,7 +34,7 @@ namespace SAGA.MBI.RequestData
             {
                 //文件下载
                 var url =
-                    $"{MBIConst.DataPlatformLocalHost}image-service/common/image_get?systemId={MBIConst.DevServiceId}&key={key}";
+                    $"{MBIConst.ImageServiceLocalHost}image-service/common/image_get?systemId={MBIConst.DevServiceId}&key={key}";
 
                 //RestClient client = new RestClient(url, HttpVerb.GET);
                 //request = client.PostRequest();
@@ -58,7 +58,7 @@ namespace SAGA.MBI.RequestData
             var filePath = Path.Combine(downPath, fileName);
             //文件下载
             var url =
-                $"{MBIConst.DataPlatformLocalHost}image-service/common/file_upload?systemId={MBIConst.RevitServiceId}&secret={MBIConst.RevitServiceSecret}&key={fileName}&overwrite=true";
+                $"{MBIConst.ImageServiceLocalHost}image-service/common/file_upload?systemId={MBIConst.RevitServiceId}&secret={MBIConst.RevitServiceSecret}&key={fileName}&overwrite=true";
             try
             {
                 var request = (HttpWebRequest)WebRequest.Create(url);

+ 11 - 11
MBI/SAGA.MBI/RequestData/UpLoadFileRequest.cs

@@ -53,7 +53,7 @@ namespace SAGA.MBI.RequestData
                 File.Delete(filePath);
                 //文件下载
                 var url =
-                    $"{MBIConst.DataPlatformLocalHost}image-service/common/file_get/{fileName}?systemId={MBIConst.RevitServiceId}";
+                    $"{MBIConst.ImageServiceLocalHost}image-service/common/file_get/{fileName}?systemId={MBIConst.RevitServiceId}";
                 WebClient wc = new WebClient();
 
                 wc.Headers.Add("postman-token", "8efb60cb-a34c-592e-6e61-5412b1dfc1bb");
@@ -278,7 +278,7 @@ namespace SAGA.MBI.RequestData
             string secret = MBIConst.RevitServiceSecret;
             //文件下载
             string url =
-                    $"{MBIConst.DataPlatformLocalHost}image-service/common/file_upload?systemId={systemId}&secret={secret}&key={fileName}&overwrite=true";
+                    $"{MBIConst.ImageServiceLocalHost}image-service/common/file_upload?systemId={systemId}&secret={secret}&key={fileName}&overwrite=true";
             return UpLoadFile(downPath, fileName, url);
         }
         /// <summary> 
@@ -291,7 +291,7 @@ namespace SAGA.MBI.RequestData
             string secret = MBIConst.DevServiceSecret;
             //文件下载
             string url =
-                $"{MBIConst.DataPlatformLocalHost}image-service/common/file_upload?systemId={systemId}&secret={secret}&key={fileName}&overwrite=true";
+                $"{MBIConst.ImageServiceLocalHost}image-service/common/file_upload?systemId={systemId}&secret={secret}&key={fileName}&overwrite=true";
             return UpLoadFile(downPath, fileName, url);
         }
         /// <summary> 
@@ -304,7 +304,7 @@ namespace SAGA.MBI.RequestData
             string secret = MBIConst.DevServiceSecret;
             //文件下载
             string url =
-                $"{MBIConst.DataPlatformLocalHost}image-service/common/image_upload?systemId={systemId}&secret={secret}&key={fileName}&overwrite=true";
+                $"{MBIConst.ImageServiceLocalHost}image-service/common/image_upload?systemId={systemId}&secret={secret}&key={fileName}&overwrite=true";
             return UpLoadFile(downPath, fileName, url);
         }
 
@@ -447,7 +447,7 @@ namespace SAGA.MBI.RequestData
             string systemId = MBIConst.RevitServiceId;
             string secret = MBIConst.RevitServiceSecret;
             string url =
-                $"{MBIConst.DataPlatformLocalHost}image-service/common/files_delete?systemId={systemId}&secret={secret}";
+                $"{MBIConst.ImageServiceLocalHost}image-service/common/files_delete?systemId={systemId}&secret={secret}";
             return DeleteFile(url, key);
         }
         /// <summary>
@@ -460,7 +460,7 @@ namespace SAGA.MBI.RequestData
             string systemId = MBIConst.DevServiceId;
             string secret = MBIConst.DevServiceSecret;
             string url =
-                $"{MBIConst.DataPlatformLocalHost}image-service/common/files_delete?systemId={systemId}&secret={secret}";
+                $"{MBIConst.ImageServiceLocalHost}image-service/common/files_delete?systemId={systemId}&secret={secret}";
             return DeleteFile(url, key);
         }
 
@@ -474,7 +474,7 @@ namespace SAGA.MBI.RequestData
             string systemId = MBIConst.DevServiceId;
             string secret = MBIConst.DevServiceSecret;
             string url =
-                $"{MBIConst.DataPlatformLocalHost}image-service/common/images_delete?systemId={systemId}&secret={secret}";
+                $"{MBIConst.ImageServiceLocalHost}image-service/common/images_delete?systemId={systemId}&secret={secret}";
             return DeleteFile(url, key);
         }
         #endregion
@@ -491,7 +491,7 @@ namespace SAGA.MBI.RequestData
             try
             {
                 string url =
-                   $"{MBIConst.DataPlatformLocalHost}image-service/common/file_upload?systemId={setting.SystemId}&secret={setting.Secret}&key={key}&overwrite=true";
+                   $"{MBIConst.ImageServiceLocalHost}image-service/common/file_upload?systemId={setting.SystemId}&secret={setting.Secret}&key={key}&overwrite=true";
                 MemoryStream stream = new MemoryStream(bytes);
                 var result = RequestClient.UploadFile(url, stream);
                 JObject rj = JObject.Parse(result);
@@ -527,7 +527,7 @@ namespace SAGA.MBI.RequestData
         public static byte[] DownloadFile(FileServiceSetting setting, string key)
         {
             var url =
-                 $"{MBIConst.DataPlatformLocalHost}image-service/common/file_get/{key}?systemId={setting.SystemId}";
+                 $"{MBIConst.ImageServiceLocalHost}image-service/common/file_get/{key}?systemId={setting.SystemId}";
             try
             {
                 return RequestClient.DownloadFile(url);
@@ -567,7 +567,7 @@ namespace SAGA.MBI.RequestData
         public static List<string> GetFiles(FileServiceSetting setting, string prefix)
         {
             List<string> files = new List<string>();
-            string url = $"{MBIConst.DataPlatformLocalHost}image-service/common/files_list?systemId={setting.SystemId}&secret={setting.Secret}";
+            string url = $"{MBIConst.ImageServiceLocalHost}image-service/common/files_list?systemId={setting.SystemId}&secret={setting.Secret}";
             JObject jObject = new JObject();
             jObject.Add("prefix", prefix);
             var result = RequestClient.Post(url, jObject);
@@ -586,7 +586,7 @@ namespace SAGA.MBI.RequestData
             List<string> delFiles = new List<string>();
             if (inputFiles.IsNullOrEmptyExt())
                 return delFiles;
-            string url = $"{MBIConst.DataPlatformLocalHost}image-service/common/files_delete?systemId={setting.SystemId}&secret={setting.Secret}";
+            string url = $"{MBIConst.ImageServiceLocalHost}image-service/common/files_delete?systemId={setting.SystemId}&secret={setting.Secret}";
             JObject jObject = new JObject();
             JArray array = new JArray();
             inputFiles.ForEach(s => array.Add(s));

+ 44 - 0
MBI/SAGA.MBI/ToolCommand.cs

@@ -12,6 +12,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using Autodesk.Revit.Attributes;
 using Autodesk.Revit.DB;
+using Autodesk.Revit.DB.Plumbing;
 using Autodesk.Revit.UI;
 using DevExpress.Xpf.Core;
 using FWindSoft.DataFramework;
@@ -27,6 +28,8 @@ using SAGA.MBI.ToolsData.ModeCheck;
 using SAGA.MBI.WinView.Login;
 using SAGA.RevitUtils;
 using SAGA.RevitUtils.Extends;
+using SAGA.RevitUtils.MEP;
+using Line = Autodesk.Revit.DB.Line;
 using WinModeCheckSetting = SAGA.MBI.ToolsData.ModeCheck.WinModeCheckSetting;
 
 namespace SAGA.MBI
@@ -34,6 +37,47 @@ namespace SAGA.MBI
 
     #region 工具
     /// <summary>
+    /// 隔离立管
+    /// </summary>
+    [Transaction(TransactionMode.Manual)]
+    [Regeneration(RegenerationOption.Manual)]
+    public class VerticalPipeIsolationCommand : ExternalCommand
+    {
+        public override Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
+        {
+            try
+            {
+                var elems = ExternalDataWrapper.Current.UiApp.WindowSelectElement("请框选...",new CommonFilter(t =>
+                {
+                    if (t is Pipe pipe)
+                    {
+                        var line = pipe.GetCurve() as Line;
+                        if (line != null)
+                        {
+                            var connectors = pipe.GetConnectors();
+                            
+                            return connectors.Any(tt=>!tt.IsConnected)&&line.Direction.IsParallel(XYZ.BasisZ);
+                        }
+                    }
+
+                    return false;
+                }));
+                ExternalDataWrapper.Current.UiApp.SetShowElements(elems,true);
+            }
+            catch (Exception e)
+            {
+                MessageShow.Show(e);
+                return Result.Cancelled;
+            }
+            return Result.Succeeded;
+        }
+
+        public override bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories)
+        {
+            return true;
+        }
+    }
+    /// <summary>
     /// 立管对齐
     /// </summary>
     [Transaction(TransactionMode.Manual)]

+ 0 - 1
MBI/SAGA.RevitUtils/Extends/UIApplicationExtend.cs

@@ -47,7 +47,6 @@ namespace SAGA.RevitUtils.Extends
             }
             return selected;
         }
-
         /// <summary>
         /// È¡µã
         /// </summary>