浏览代码

mxg:修正模型文件下载,文件下载不成功,却提示文件下载成功。

mengxiangge 6 年之前
父节点
当前提交
1d35a2955f

+ 2 - 1
MBI/SAGA.DotNetUtils/FileOperate/FileStreamOperate.cs

@@ -87,8 +87,9 @@ namespace SAGA.DotNetUtils.FileOperate
                 pFileStream.Write(pReadByte, 0, pReadByte.Length);
             }
 
-            catch
+            catch(Exception ex)
             {
+                throw ex;
                 return false;
 
             }

+ 2 - 2
MBI/SAGA.MBI/DataArrange/DalCommon.cs

@@ -200,11 +200,11 @@ namespace SAGA.MBI.DataArrange
         /// <summary>
         /// 下载云平台的数据
         /// </summary>
-        public static CalcContext DownLoadCouldData(MFloor floor)
+        public static CalcContext DownLoadCouldData(MFloor floor, string[] type = null)
         {
             var floorId = floor.Id;
             CalcContext context = new CalcContext(floor);
-            var list = DownLoadCouldData(floorId);
+            var list = DownLoadCouldData(floorId, type);
             list.ForEach(context.Add);
             return context;
         }

+ 1 - 0
MBI/SAGA.MBI/RequestData/UpLoadFileRequest.cs

@@ -152,6 +152,7 @@ namespace SAGA.MBI.RequestData
                            string errorMessage=($"楼层 {floorName} MD5校验失败,本地与服务器不一致!");
                             MailLog.Log("下载MD5异常", errorMessage);
                             MessageShowBase.Infomation(errorMessage);
+                            result = false;
                             //f1层一致提示失败
                             //throw new Exception(errorMessage);
                         }

+ 5 - 11
MBI/SAGA.MBI/ToolsData/DataCheck/DutyModeCodeDiffCheck.cs

@@ -69,18 +69,12 @@ namespace SAGA.MBI.ToolsData.DataCheck
         private List<DutyModeCodeDiffCheckResult> GetCheckResult(MFloor floor)
         {
             List<DutyModeCodeDiffCheckResult> list = new List<DutyModeCodeDiffCheckResult>();
-
-            var context = DalCommon.DownLoadCouldData(floor);
+            //检查设备,部件 ,信标
+            var modes = DalCommon.DownLoadCouldData(floor.Id,new []{"Eq","Ec"});
+            var doc = ExternalDataWrapper.Current.UiApp.Application.OpenDocumentFile(floor.FullPath);
             try
             {
-                var doc=context.OpenDocument();
-                string floorName = context.MFloor.ToString();
-                //检查空间,逻辑不通,暂时注释掉
-                List<MRevitEquipBase> modes = new List<MRevitEquipBase>();
-                //检查设备
-                modes.AddRange(context.MEquipments);
-                //检查部件 
-                modes.AddRange(context.MEquipmentParts);
+                string floorName = floor.ToString();
                 //信标不用检查
                 foreach (var mode in modes)
                 {
@@ -112,7 +106,7 @@ namespace SAGA.MBI.ToolsData.DataCheck
             }
             finally
             {
-                context.RevitDoc.CloseDoc();
+                doc.CloseDoc();
             }
             return list;
         }