فهرست منبع

mxg:创建岗位和删除岗位,创建空间,接口更换为批量操作

mengxiangge 6 سال پیش
والد
کامیت
04b453c857

+ 2 - 2
MBI/SAGA.MBI/Calc/CalcContext.cs

@@ -91,9 +91,9 @@ namespace SAGA.MBI.Calc
             try
             {
                 //修改空间
-                DalCommon.BatchUpdate(MSpaces);
+                DalSpace.BatchUpdate(MSpaces);
                 //修改设备
-                DalCommon.BatchUpdate(MEquipments);
+                DalEquip.BatchUpdate(MEquipments);
                 //修改部件
                 DalCommon.BatchUpdate(MEquipmentParts);
                 //修改设备所在空间关系

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

@@ -9,11 +9,15 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Autodesk.Revit.DB;
+using DevExpress.Xpf.Bars;
+using Newtonsoft.Json.Linq;
+using SAGA.DotNetUtils;
 using SAGA.DotNetUtils.Extend;
 using SAGA.DotNetUtils.Logger;
 using SAGA.MBI.Common;
 using SAGA.MBI.JsonConvert;
 using SAGA.MBI.Model;
+using SAGA.MBI.RequestData;
 using SAGA.MBI.Tools;
 using SAGA.RevitUtils.Extends;
 
@@ -69,6 +73,49 @@ namespace SAGA.MBI.DataArrange
             return mode;
         }
 
-       
+        /// <summary>
+        /// 批量更新Infos
+        /// </summary>
+        /// <param name="datas"></param>
+        public static void BatchUpdate(IEnumerable<MRevitEquipBase> datas)
+        {
+            var addJArray = new JArray();
+            var delJArray = new JArray();
+            var updateJArray = new JArray();
+            foreach (MRevitEquipBase mode in datas)
+            {
+                switch (mode.Operator)
+                {
+                    case DocumentChangedOperator.Add:
+                        JObject addJObject = new JObject();
+                        addJObject.Add("floor_id", mode.FloorId);
+                        addJObject.Add("building_id", DalProjectTree.GetBuildingIdByFloor(mode.FloorId));
+                        addJObject.Add("equipment_category", mode.EquipClassCode);
+                        addJObject.Add("infos", mode.GetInfosJObject());
+                        addJArray.Add(addJObject);
+                        break;
+                    case DocumentChangedOperator.Delete:
+                        JObject delJObject=new JObject();
+                        delJObject.Add("id",mode.Id);
+                        delJArray.Add(delJObject);
+                        break;
+                    case DocumentChangedOperator.Modified:
+                        JObject criteria = CommonConvert.GetUpdateInfosJObject(mode.Id, mode.GetInfosJObject());
+                        updateJArray.Add(criteria);
+                        break;
+                    case DocumentChangedOperator.None:
+                        break;
+                    default:
+                        mode.AddorUpdateObject();
+                        break;
+                }
+            }
+            if (addJArray.Count > 0)
+                EquipmentRequest.BatchAdd(addJArray);
+            if (delJArray.Count > 0)
+                EquipmentRequest.BatchDel(delJArray);
+            if (updateJArray.Count > 0)
+                CommonRequest.BatchUpdate(updateJArray);
+        }
     }
 }

+ 44 - 0
MBI/SAGA.MBI/DataArrange/DalSpace.cs

@@ -115,6 +115,50 @@ namespace SAGA.MBI.DataArrange
             }
             return list;
         }
+
+        /// <summary>
+        /// 批量更新Infos
+        /// </summary>
+        /// <param name="datas"></param>
+        public static void BatchUpdate(IEnumerable<MRevitEquipBase> datas)
+        {
+            var addJArray = new JArray();
+            var delJArray = new JArray();
+            var updateJArray = new JArray();
+            foreach (MRevitEquipBase mode in datas)
+            {
+                switch (mode.Operator)
+                {
+                    case DocumentChangedOperator.Add:
+                        JObject addJObject = new JObject();
+                        addJObject.Add("floor_id", mode.FloorId);
+                        addJObject.Add("building_id", DalProjectTree.GetBuildingIdByFloor(mode.FloorId));
+                        addJObject.Add("infos", mode.GetInfosJObject());
+                        addJArray.Add(addJObject);
+                        break;
+                    //case DocumentChangedOperator.Delete:
+                    //    JObject delJObject = new JObject();
+                    //    delJObject.Add("id", mode.Id);
+                    //    delJArray.Add(delJObject);
+                    //    break;
+                    case DocumentChangedOperator.Modified:
+                        JObject criteria = CommonConvert.GetUpdateInfosJObject(mode.Id, mode.GetInfosJObject());
+                        updateJArray.Add(criteria);
+                        break;
+                    case DocumentChangedOperator.None:
+                        break;
+                    default:
+                        mode.AddorUpdateObject();
+                        break;
+                }
+            }
+            if (addJArray.Count > 0)
+                SpaceRequest.BatchAdd(addJArray);
+            if (delJArray.Count > 0)
+                SpaceRequest.BatchDel(delJArray);
+            if (updateJArray.Count > 0)
+                CommonRequest.BatchUpdate(updateJArray);
+        }
     }
 }
 

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

@@ -336,6 +336,7 @@ namespace SAGA.MBI.RequestData
             return request;
         }
 
+       
 
     }
 }

+ 36 - 0
MBI/SAGA.MBI/RequestData/EquipmentRequest.cs

@@ -64,5 +64,41 @@ namespace SAGA.MBI.RequestData
             string request = client.PostRequest();
             return request;
         }
+
+        /// <summary>
+        /// 批量增加设备
+        /// </summary>
+        /// <param name="criterias"></param>
+        /// <returns></returns>
+        public static string BatchAdd(JArray criterias)
+        {
+            string url = MBIConst.DataPlatformLocalHost + $"data-platform-3/equipment/batch/create?secret={MBIControl.ProjectCur.Password}&projectId={MBIControl.ProjectCur.Id}";
+
+            JObject updateJObject = new JObject();
+            updateJObject.Add("criterias", criterias);
+
+            string postData = updateJObject.ToString();
+            RestClient client = new RestClient(url, HttpVerb.POST, postData);
+            string request = client.PostRequest();
+            return request;
+        }
+
+        /// <summary>
+        /// 批量删除
+        /// </summary>
+        /// <param name="criterias"></param>
+        /// <returns></returns>
+        public static string BatchDel(JArray criterias)
+        {
+            string url = MBIConst.DataPlatformLocalHost + $"data-platform-3/equipment/batch/delete?secret={MBIControl.ProjectCur.Password}&projectId={MBIControl.ProjectCur.Id}";
+
+            JObject updateJObject = new JObject();
+            updateJObject.Add("criterias", criterias);
+
+            string postData = updateJObject.ToString();
+            RestClient client = new RestClient(url, HttpVerb.POST, postData);
+            string request = client.PostRequest();
+            return request;
+        }
     }
 }

+ 36 - 0
MBI/SAGA.MBI/RequestData/SpaceRequest.cs

@@ -84,5 +84,41 @@ namespace SAGA.MBI.RequestData
             string request = client.PostRequest();
             return request;
         }
+
+        /// <summary>
+        /// 批量增加
+        /// </summary>
+        /// <param name="criterias"></param>
+        /// <returns></returns>
+        public static string BatchAdd(JArray criterias)
+        {
+            string url = MBIConst.DataPlatformLocalHost + $"data-platform-3/ispace/batch/create?secret={MBIControl.ProjectCur.Password}&projectId={MBIControl.ProjectCur.Id}";
+
+            JObject updateJObject = new JObject();
+            updateJObject.Add("criterias", criterias);
+
+            string postData = updateJObject.ToString();
+            RestClient client = new RestClient(url, HttpVerb.POST, postData);
+            string request = client.PostRequest();
+            return request;
+        }
+
+        /// <summary>
+        /// 批量删除
+        /// </summary>
+        /// <param name="criterias"></param>
+        /// <returns></returns>
+        public static string BatchDel(JArray criterias)
+        {
+            string url = MBIConst.DataPlatformLocalHost + $"data-platform-3/ispace/batch/delete?secret={MBIControl.ProjectCur.Password}&projectId={MBIControl.ProjectCur.Id}";
+
+            JObject updateJObject = new JObject();
+            updateJObject.Add("criterias", criterias);
+
+            string postData = updateJObject.ToString();
+            RestClient client = new RestClient(url, HttpVerb.POST, postData);
+            string request = client.PostRequest();
+            return request;
+        }
     }
 }

+ 1 - 1
MBI/SAGA.MBI/ToolsData/CorrectLossDuty.cs

@@ -103,7 +103,7 @@ namespace SAGA.MBI.ToolsData
             try
             {
                 //修改设备
-                DalCommon.BatchUpdate(context.MEquipments);
+                DalEquip.BatchUpdate(context.MEquipments);
                 //修改部件
                 DalCommon.BatchUpdate(context.MEquipmentParts);
             }