浏览代码

mxg:取消读取设备本地编码和设备本地名称;设备族编码检查排序;部件的信息点定义更改

mengxiangge 6 年之前
父节点
当前提交
48b0f36b89

+ 12 - 2
MBI/SAGA.MBI/Common/CommonTool.cs

@@ -100,12 +100,22 @@ namespace SAGA.MBI.Common
                 return "B" + Math.Abs(sequence);
             }
         }
-
+        /// <summary>
+        /// 信息点置为null
+        /// </summary>
+        public readonly  static string NullStr="Nlul";
         public static JArray GetPropertyJArray(string value)
         {
             JArray jArray = new JArray();
             JObject valueJObject = new JObject();
-            valueJObject.Add("value", value);
+            if (value.Equals(NullStr))
+            {
+                valueJObject.Add("value", null);
+            }
+            else
+            {
+                valueJObject.Add("value", value);
+            }
             jArray.Add(valueJObject);
             return jArray;
         }

+ 3 - 2
MBI/SAGA.MBI/Common/MBIConst.cs

@@ -188,9 +188,10 @@ namespace SAGA.MBI.Common
         public static readonly string DevServiceId = "dataPlatform";
         public static readonly string DevServiceSecret = "9e0891a7a8c8e885";
 
-        public static string AccessKeyId = "LTAIHLlfCwmMRbV4";
-        public static string AccessKeySecret = "TixG1tTpeNnM96FPVC33fumK8QAUsv";
+        public static string AccessKeyId = "LTAIQVvCRivyl3Dd";
+        public static string AccessKeySecret = "hkGLC7RgWUntbAS2Zw5rWOVS8Xhj0G";
         public static string Endpoint = "oss-cn-beijing.aliyuncs.com";
+        public static string BucketName = "saga-data";
 
         /// <summary>
         /// 使用ossclient上传的文件地址(测试和线上地址不一样)

+ 2 - 1
MBI/SAGA.MBI/DataArrange/DalEquip.cs

@@ -61,9 +61,10 @@ namespace SAGA.MBI.DataArrange
             mode.PreviewImage = elem.GetFamily().GetPreviewImage(new System.Drawing.Size(200, 200));
             //从模型中读取的信息点
             mode.Location = elem.GetLocationPointMBI();
+            //mode.LocalId = elem.GetParameterString("设备本地编码");
+            //mode.LocalName= elem.GetParameterString("设备本地名称");
             //model.BIMType = familyName + ";" + typeName;
 
-            //model.LocalID = instance.GetParameterString("设备本地编码");
             //Revit族名称
             mode.RevitFamilyName = elem.GetFamily().Name;
 

+ 2 - 0
MBI/SAGA.MBI/DataArrange/DalEquipPart.cs

@@ -60,6 +60,8 @@ namespace SAGA.MBI.DataArrange
             //这里处理从设备中读取到的数据
             //坐标
             mode.Location = elem.GetLocationPointMBI();
+            //mode.LocalId = elem.GetParameterString("设备本地编码");
+            //mode.LocalName = elem.GetParameterString("设备本地名称");
             return mode;
         }
 

+ 3 - 3
MBI/SAGA.MBI/Model/MEquipmentPart.cs

@@ -57,7 +57,7 @@ namespace SAGA.MBI.Model
         #region CloudProperty
 
         private string m_Name;
-        [Description("CompName")]
+        [Description("EquipName")]
         public string Name
         {
             get { return m_Name; }
@@ -68,7 +68,7 @@ namespace SAGA.MBI.Model
             }
         }
         private string m_LocalId;
-        [Description("CompLocalID")]
+        [Description("EquipLocalID")]
         public string LocalId
         {
             get { return m_LocalId; }
@@ -80,7 +80,7 @@ namespace SAGA.MBI.Model
         }
 
         private string m_LocalName;
-        [Description("CompLocalName")]
+        [Description("EquipLocalName")]
         public string LocalName
         {
             get { return m_LocalName; }

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

@@ -113,7 +113,7 @@ namespace SAGA.MBI.RequestData
             OssClient client = new OssClient(MBIConst.Endpoint, MBIConst.AccessKeyId, MBIConst.AccessKeySecret);
             try
             {
-                string bucketName = "prod-data";
+                string bucketName = MBIConst.BucketName;
 
                 var getObjectRequest = new GetObjectRequest(bucketName, key);
                 ShowDownloadWindow(tuple.Item3, fullPath, count, cur);
@@ -362,7 +362,7 @@ namespace SAGA.MBI.RequestData
             {
                 using (var fs = new MemoryStream(FileStreamOperate.ReadFile(filePath)))
                 {
-                    string bucketName = "prod-data";
+                    string bucketName = MBIConst.BucketName;
 
                     var putObjectRequest = new PutObjectRequest(bucketName, key, fs);
 

+ 20 - 2
MBI/SAGA.MBI/SAGA.MBI.csproj

@@ -14,6 +14,7 @@
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -24,10 +25,10 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>1</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -149,6 +150,22 @@
   <PropertyGroup>
     <ApplicationIcon>sagacloud.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>FFB0794B4F6EA88CC9553EEF589DB2B54D262158</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>SAGA.MBI_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetZone>LocalIntranet</TargetZone>
+  </PropertyGroup>
+  <PropertyGroup />
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Aliyun.OSS">
       <HintPath>..\Dlls\Aliyun.OSS.dll</HintPath>
@@ -995,6 +1012,7 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config" />
+    <None Include="SAGA.MBI_TemporaryKey.pfx" />
     <None Include="WinView\Space\README.md" />
   </ItemGroup>
   <ItemGroup>

+ 3 - 0
MBI/SAGA.MBI/SAGA.MBI.csproj.user

@@ -11,4 +11,7 @@
     <FallbackCulture>zh-CN</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
   </PropertyGroup>
+  <PropertyGroup>
+    <EnableSecurityDebugging>false</EnableSecurityDebugging>
+  </PropertyGroup>
 </Project>

+ 30 - 12
MBI/SAGA.MBI/ToolsData/AddEquipLocation.cs

@@ -1,25 +1,20 @@
 /* ==============================================================================
- * 功能描述:添加设备的位置坐标
+ * 功能描述:修正岗位从模型中读取的数据
  * 创 建 者:Garrett
  * 创建日期:2018/7/12 14:25:17
  * ==============================================================================*/
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SAGA.DotNetUtils.Others;
-using SAGA.MBI.Calc;
-using SAGA.MBI.Model;
-using SAGA.MBI.RequestData;
-using SAGA.MBI.WinView.Upload;
 using Autodesk.Revit.DB;
-using Autodesk.Revit.DB.Mechanical;
 using SAGA.DotNetUtils;
 using SAGA.DotNetUtils.Logger;
+using SAGA.DotNetUtils.Others;
+using SAGA.MBI.Calc;
 using SAGA.MBI.DataArrange;
+using SAGA.MBI.Model;
 using SAGA.MBI.Tools;
+using SAGA.MBI.WinView.Upload;
 using SAGA.RevitUtils.Extends;
+using System;
+using SAGA.MBI.Common;
 
 namespace SAGA.MBI.ToolsData
 {
@@ -90,6 +85,18 @@ namespace SAGA.MBI.ToolsData
                 if (elem == null) continue;
                 mode.Operator = DocumentChangedOperator.Modified;
                 mode.Location = elem.GetLocationPointMBI();
+                //mode.LocalId = elem.GetParameterString("设备本地编码");
+                //mode.LocalName = elem.GetParameterString("设备本地名称");
+                ////恢复信息点的值
+                //if (mode.LocalId.IsNotNullEmpty())
+                //{
+                //    mode.LocalId = CommonTool.NullStr;
+                //}
+
+                //if (mode.LocalName.IsNotNullEmpty())
+                //{
+                //    mode.LocalName = CommonTool.NullStr;
+                //}
             }
             //检查部件 
             foreach (var mode in baseContext.MEquipmentParts)
@@ -101,6 +108,17 @@ namespace SAGA.MBI.ToolsData
                 if (elem == null) continue;
                 mode.Operator = DocumentChangedOperator.Modified;
                 mode.Location = elem.GetLocationPointMBI();
+                //mode.LocalId = elem.GetParameterString("设备本地编码");
+                //mode.LocalName = elem.GetParameterString("设备本地名称");
+                //if (mode.LocalId.IsNotNullEmpty())
+                //{
+                //    mode.LocalId = CommonTool.NullStr;
+                //}
+
+                //if (mode.LocalName.IsNotNullEmpty())
+                //{
+                //    mode.LocalName = CommonTool.NullStr;
+                //}
             }
             //信标不用检查
             //检查空间 

+ 1 - 1
MBI/SAGA.MBI/ToolsData/DataCheck/BIMDuplicationCheck.cs

@@ -127,7 +127,7 @@ namespace SAGA.MBI.ToolsData.DataCheck
                 #region 添加数据
                 int index = 3;
                 
-                foreach (MissDutyOrModeCheckResult result in Results)
+                foreach (BIMDuplicationCheckResult result in Results)
                 {
                     //数量过多,只显示有问题的
                     //if (result.IsRight) continue;

+ 5 - 3
MBI/SAGA.MBI/ToolsData/ModeCheck/FamilyNameCheck.cs

@@ -16,6 +16,7 @@ using SAGA.DotNetUtils.Others;
 using SAGA.MBI.Tools;
 using SAGA.MBI.ToolsData.CheckBase;
 using SAGA.RevitUtils.Extends;
+using SAGA.RevitUtils.MEP;
 
 namespace SAGA.MBI.ToolsData.ModeCheck
 {
@@ -99,6 +100,7 @@ namespace SAGA.MBI.ToolsData.ModeCheck
             }
             //按族名称,对楼层进行合并显示
             GroupByFamilyName(list);
+            Results.Sort(new CommonComparer<ModeCheckResultBase>((x, y) => { return x.IsRight.CompareTo(y.IsRight);}));
             return Results.All(t => t.IsRight);
         }
         /// <summary>
@@ -148,9 +150,9 @@ namespace SAGA.MBI.ToolsData.ModeCheck
                 mode.FamilyName = grouping.Key;
                 mode.Type = item.Type;
                 mode.IsRight = item.IsRight;
-                if (!mode.IsRight)
-                    mode.RMessage =
-                        $"使用到该设备族的楼层:{string.Join("、", grouping.Select(t => ((SagaSignCheckResult) t.RBase).RFloorName).ToArray())}";
+                //if (!mode.IsRight)
+                mode.RMessage =
+                    $"使用到该设备族的楼层:{string.Join("、", grouping.Select(t => ((SagaSignCheckResult)t.RBase).RFloorName).ToArray())}";
                 Results.Add(mode);
             }
         }

+ 1 - 1
MBI/SAGA.MBI/Utilities/Oss/OssHelper.cs

@@ -18,7 +18,7 @@ namespace SAGA.MBI.Utilities.Oss
         static OssClient client = new OssClient(MBIConst.Endpoint, MBIConst.AccessKeyId, MBIConst.AccessKeySecret);
 
 
-        const string bucketName = "prod-data";
+        static string bucketName = MBIConst.BucketName;
 
         static string prefixKey = MBIConst.OssGplotFilePrefix;