20201202

wei

2020-12-02 30b5770f56f99c1f92e933ad31cf7d2af58b033c

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -1807,13 +1807,14 @@
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            d.Add("gatewayId", DB_ResidenceData.residenceData.HomeGateway.id);
            //d.Add("roomId", DB_ResidenceData.residenceData.residecenInfo.RegionID);//可控参数，当需要分页获取，怎么知道分页总数
            //d.Add("searchType", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            //d.Add("pageSize", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            //d.Add("pageNo", DB_ResidenceData.residenceData.residecenInfo.RegionID);

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetDevcieList, requestJson);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieList, requestJson);
        }
        /// <summary>
        /// 获取设备详情列表
@@ -1826,7 +1827,7 @@
            d.Add("deviceIds", functionIds);

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetDevcieInfoList, requestJson);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieInfoList, requestJson);
        }
        /// <summary>
        /// 控制设备
@@ -1840,7 +1841,7 @@
            d.Add("actions", actionObjs);

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_ControlDevice, requestJson);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_ControlDevice, requestJson);
        }
        /// <summary>
        /// 设备绑定房间
@@ -1853,7 +1854,7 @@
            d.Add("roomIds", new List<string>() { roomId});

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_BindDeviceToRoom, requestJson).Code;
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_BindDeviceToRoom, requestJson).Code;
        }
        /// <summary>
        /// 设备解绑房间
@@ -1866,7 +1867,7 @@
            d.Add("roomIds", new List<string>() { roomId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_UnbindDeviceToRoom, requestJson).Code;
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_UnbindDeviceToRoom, requestJson).Code;
        }
        /// <summary>
        /// 设备名称修改
@@ -1879,7 +1880,7 @@
            d.Add("name", deviceName);

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EditDeviceName, requestJson).Code;
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditDeviceName, requestJson).Code;
        }
        /// <summary>
        /// 收藏设备
@@ -1891,7 +1892,7 @@
            d.Add("deviceId",new List<string>() { deviceId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_CollectDevice, requestJson).Code;
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CollectDevice, requestJson).Code;
        }
        /// <summary>
        /// 取消收藏设备
@@ -1903,7 +1904,7 @@
            d.Add("deviceId", new List<string>() { deviceId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_CancelCollectDevice, requestJson).Code;
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectDevice, requestJson).Code;
        }

        #endregion
@@ -1925,7 +1926,7 @@
            }

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetSecneList, requestJson);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneList, requestJson);
        }
        /// <summary>
        /// 获取场景详情
@@ -1938,7 +1939,7 @@
            d.Add("userSceneIds",new List<string>() { seceneId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetSecneList, requestJson);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneList, requestJson);
        }
        /// <summary>
        /// 添加场景
@@ -1950,7 +1951,7 @@
            d.Add("scenes", new List<Scene>() { scene });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EditSecne, requestJson);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditSecne, requestJson);
        }
        /// <summary>
        /// 编辑场景
@@ -1964,7 +1965,7 @@
            d.Add("scenes", new List<Scene>() { scene });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EditSecne, requestJson);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditSecne, requestJson);
        }
        /// <summary>
        /// 删除场景
@@ -1977,7 +1978,7 @@
            d.Add("userSceneIds", new List<string>() { userSceneId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_DeleteSecne, requestJson).Code;
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_DeleteSecne, requestJson).Code;
        }
        /// <summary>
        /// 执行场景
@@ -1990,7 +1991,7 @@
            d.Add("userSceneIds", new List<string>() { userSceneId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_ExecuteSecne, requestJson).Code;
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_ExecuteSecne, requestJson).Code;
        }
        /// <summary>
        /// 收藏场景
@@ -2004,7 +2005,7 @@
            d.Add("userSceneIds", new List<string>() { userSceneId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_CollectScene, requestJson).Code;
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CollectScene, requestJson).Code;
        }
        /// <summary>
        /// 取消收藏场景
@@ -2018,7 +2019,7 @@
            d.Add("userSceneIds", new List<string>() { userSceneId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_CancelCollectScene, requestJson).Code;
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectScene, requestJson).Code;
        }
        #endregion

@@ -2026,42 +2027,87 @@
        /// <summary>
        /// 获取房间列表
        /// </summary>
        /// <param name="GetType">获取类型：ROOM\FLOOR;不输入返回全部</param>
        /// <returns></returns>
        public ResponsePackNew GetRoomList()
        public ResponsePackNew GetRoomList(string GetType = "All")
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);

            if (GetType != "All")
            {
                d.Add("roomType", GetType);
            }
            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetRoomList, requestJson);
            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetRoomList, requestJson);
            var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(pack.Data.ToString());
            if (revData != null)
            {
                foreach (var spatial in revData)
                {
                    spatial.UpdateSpatialInfoData();
                }
            }
            return pack;
        }
        /// <summary>
        /// 添加房间
        /// 添加房间\楼层
        /// 楼层也属于房间
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew AddRoom(List<Room> rooms)
        public ResponsePackNew AddRoom(List<SpatialInfo> rooms)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            foreach(var room in  rooms)
            {
                Dictionary<string, string> d1 = new Dictionary<string, string>();
                d1.Add("roomName", room.name);
                d1.Add("roomType", "ROOM");
                //d1.
            }
            d.Add("rooms", rooms);

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_AddRoom, requestJson);
            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddRoom, requestJson);
            var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(pack.Data.ToString());
            if (revData != null)
            {
                foreach (var spatial in revData)
                {
                    spatial.UpdateSpatialInfoData();
                }
            }
            return pack;
        }
        /// <summary>
        /// 添加楼层
        /// 修改房间信息
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew AddFloor()
        public ResponsePackNew UpdateRoom(List<SpatialInfo> rooms)
        {
            return null;
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            d.Add("rooms", rooms);

            var requestJson = HttpUtil.GetSignRequestJson(d);
            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_UpdateRoom, requestJson);
            var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(pack.Data.ToString());
            if (revData != null)
            {
                foreach (var spatial in revData)
                {
                    spatial.UpdateSpatialInfoData();
                }
            }
            return pack;
        }
        /// <summary>
        /// 删除房间
        /// </summary>
        /// <param name="roomIds"></param>
        /// <returns></returns>
        public ResponsePackNew DeleteRoom(List<string> roomIds)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            d.Add("ids", roomIds);

            var requestJson = HttpUtil.GetSignRequestJson(d);
            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_DelRoom, requestJson);
            return pack;
        }

        #endregion