Преглед изворни кода

xls:增加更新物理世界时id为空的判断

xulisong пре 6 година
родитељ
комит
d06480d91b

+ 1 - 1
MBI/SAGA.DotNetUtils/Http/HttpUtils.cs

@@ -127,7 +127,7 @@ namespace SAGA.DotNetUtils.Http
                     var description = ServiceManager.MessageMap.Default?.Map(EndPoint);
                     if (!string.IsNullOrWhiteSpace(description))
                     {
-                        list.Add(description);
+                        list.Add(string.Format($"错误位置:【{ description}】"));
                     } 
                     #endregion
                     list.Add(EndPoint);

+ 4 - 3
MBI/SAGA.GplotManage/TopologyApplication/SpaceAirSupply/SpaceAirSupplyDocUtil.cs

@@ -28,7 +28,7 @@ namespace SAGA.GplotManage.TopologyApplication
             var orderResults = results.OrderBy(s => s.Floor?.FloorSequenceID).ThenBy(s => s.AirVent?.Id).ToList();
             IWorkbook book = new XSSFWorkbook();
             ISheet sheet = book.CreateSheet("Sheet1");
-            List<string> headNames = new List<string>() {"楼层id","楼层名称", "供风设备Id", "供风设备revitId", "风口id", "风口revitId", "空间id", "空间revitId" };
+            List<string> headNames = new List<string>() {"楼层id","楼层名称", "供风设备Id", "供风设备revitId","供风设备名称", "风口id", "风口revitId", "空间id", "空间revitId","空间名称" };
             for (int i = 0; i < headNames.Count; i++)
             {
                 sheet.SetCellValue(0,i,headNames[i]);
@@ -46,12 +46,13 @@ namespace SAGA.GplotManage.TopologyApplication
                 sheet.SetCellValue(useIndex, baseColumnIndex + flag++, useResult.Floor?.LocalName);
                 sheet.SetCellValue(useIndex, baseColumnIndex + flag++, useResult.AirSupply?.Id);
                 sheet.SetCellValue(useIndex, baseColumnIndex + flag++, useResult.AirSupply?.RevitId);
+                sheet.SetCellValue(useIndex, baseColumnIndex + flag++, useResult.AirSupply?.GetDisplay());
                 sheet.SetCellValue(useIndex, baseColumnIndex + flag++, useResult.AirVent?.Id);
                 sheet.SetCellValue(useIndex, baseColumnIndex + flag++, useResult.AirVent?.RevitId);
                 sheet.SetCellValue(useIndex, baseColumnIndex + flag++, useResult.Space?.Id);
                 sheet.SetCellValue(useIndex, baseColumnIndex + flag++, useResult.Space?.RevitId);
-               
-              
+                sheet.SetCellValue(useIndex, baseColumnIndex + flag++, useResult.Space?.GetDisplay());
+
             }
             book.Save(path);
         }

+ 11 - 0
MBI/SAGA.GplotManage/TopologyApplicationCommand.cs

@@ -9,10 +9,12 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Autodesk.Revit.Attributes;
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
+using SAGA.DotNetUtils.Others;
 using SAGA.GplotManage.TopologyApplication;
 using SAGA.RevitUtils;
 using SAGA.RevitUtils.Extends;
@@ -32,6 +34,10 @@ namespace SAGA.GplotManage
         }
         public override Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
         {
+            if (!MessageShowBase.Confirm("确定执行所选命令"))
+            {
+                return Result.Succeeded;
+            }
             SearchShaftHandler.ShellExecute();
             MessageShow.Infomation("完成");
             return Result.Succeeded;
@@ -50,6 +56,11 @@ namespace SAGA.GplotManage
         }
         public override Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
         {
+            //MessageShow.Infomation(Thread.CurrentThread.ManagedThreadId.ToString());
+            if (!MessageShowBase.Confirm("确定执行所选命令"))
+            {
+                return Result.Succeeded;
+            }
             SpaceAirSupplyHandler.ShellExecute();
             MessageShow.Infomation("完成");
             return Result.Succeeded;

+ 1 - 1
MBI/SAGA.MBI/Common/MessageManager.cs

@@ -22,7 +22,7 @@ namespace SAGA.MBI.Common
              * 本来想根据地址,映射变量动态生成。现在简化写成固定的
              */
             MessageMap map = new MessageMap();
-            map.Add(new MessageMapItem() {MessageCode = "godhand", MessageDescription = "上帝之后台",MatchType=CodeMatchType.Mistiness});
+            map.Add(new MessageMapItem() {MessageCode = "godhand", MessageDescription = "上帝之后台",MatchType=CodeMatchType.Mistiness});
             map.Add(new MessageMapItem() { MessageCode = "ScanBuilding", MessageDescription = "扫楼后台", MatchType = CodeMatchType.Mistiness });
             map.Add(new MessageMapItem() { MessageCode = "data-platform-3", MessageDescription = "数据平台", MatchType = CodeMatchType.Mistiness });        
             map.Add(new MessageMapItem() { MessageCode = "venders-dp", MessageDescription = "厂商库辅助", MatchType = CodeMatchType.Mistiness });

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

@@ -164,11 +164,11 @@ namespace SAGA.MBI.RequestData
                         }
                         catch (WebException e)
                         {
-                            #region 超时重试
-                            timeoutNum--;
-                            if (0 < timeoutNum && e.Message.Contains("超时"))
+                            #region 超时重试                          
+                            if (0 < timeoutNum-- && e.Message.Contains("超时"))
                             {
                                 stargIndex = fs.Length;
+                                //timeoutNum--;
                                 goto ReDownload;
                             }
                             throw; 

+ 1 - 1
MBI/SAGA.MBI/RevitModelHandle/RevitParameterUpdate.cs

@@ -130,7 +130,7 @@ namespace SAGA.MBI
             JObject jObject = new JObject();
             jObject.Add(MBIBuiltInParameter.RoomLocalName, jArray);
             var cloudElement = DalCommon.GetEquipmentQueryId(element);
-            if (cloudElement == null)
+            if (cloudElement == null || string.IsNullOrWhiteSpace(cloudElement.Id))
                 return;
             CommonConvert.UpdateInfosSigle(cloudElement.Id, jObject);
         }