From 536bc8fecd45139bba59d1bafcbe7d4f4e1f4d34 Mon Sep 17 00:00:00 2001 From: tzy <hxb@hdlchina.com.cn> Date: 星期四, 01 七月 2021 11:06:44 +0800 Subject: [PATCH] 完成管理员权限迁移的功能 --- HDL_ON/DAL/Server/HttpServerRequest.cs | 63 +++++++++++++++++++++++++++++-- 1 files changed, 59 insertions(+), 4 deletions(-) diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs index 214c33d..4ad531b 100644 --- a/HDL_ON/DAL/Server/HttpServerRequest.cs +++ b/HDL_ON/DAL/Server/HttpServerRequest.cs @@ -51,7 +51,7 @@ d.Add("type", qType); d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); d.Add("deviceId", deviceId ); - d.Add("key", "value" ); + d.Add("key", deviceKey ); var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EnvironmentalSensorHistoricalData, requestJson); @@ -74,8 +74,20 @@ var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_ArmSensorHistoricalData, requestJson); } + /// <summary> + /// 璇诲彇鏈�杩戜竴涓湀鐨勬暟鎹� + /// </summary> + /// <returns></returns> + public ResponsePackNew GetLastMonthHistory(string deviceId,string key) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + d.Add("deviceId", deviceId); + d.Add("key", key); - + var requestJson = HttpUtil.GetSignRequestJson(d); + return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_SensorLastMonthHistoricalData, requestJson); + } #endregion @@ -726,6 +738,24 @@ return result != null && result.Code == StateCode.SUCCESS; } + /// <summary> + /// 绠$悊鍛樻潈闄愯縼绉� + /// </summary> + /// <param name="i_childAccountId">鎴愬憳璐﹀彿id</param> + /// <returns></returns> + public bool AdminAuthorityMigration(string i_childAccountId) + { + var pra2 = new + { + homeId = DB_ResidenceData.Instance.CurrentRegion.id, + childAccountId = i_childAccountId + }; + var requestJson = HttpUtil.GetSignRequestJson(pra2); + var result = HttpUtil.RequestHttpsPost(NewAPI.API_Post_AdminAuthorityMigration, requestJson); + + return result != null && result.Code == StateCode.SUCCESS; + } + #region 鏂版暟鎹垎浜� /// <summary> /// 娣诲姞鍒嗕韩 @@ -1308,6 +1338,9 @@ MainPage.cityInfo.pm25 = jt.GetValue("Air_Quality").ToString(); MainPage.cityInfo.windLevel = jt.GetValue("WindLevel").ToString(); MainPage.cityInfo.weather = jt.GetValue("Weather").ToString(); + MainPage.cityInfo.lowestTemperature = jt.GetValue("lowestTemperature").ToString(); + MainPage.cityInfo.highestTemperature = jt.GetValue("highestTemperature").ToString(); + break; } catch (Exception ex) @@ -1835,7 +1868,10 @@ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); d.Add("productPlatform", productPlatform); d.Add("productBrand", productBrand); - d.Add("networkConfig", true); + if (productBrand != "MegaHealth") + { + d.Add("networkConfig", true); + } var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieList, requestJson); @@ -1854,10 +1890,29 @@ d.Add("productBrand", productBrand); d.Add("networkConfig", true); - var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Get3tyBrandDevcieList, requestJson); } + /// <summary> + /// 娉ㄥ唽绗笁鏂硅澶� + /// </summary> + /// <param name="productPlatform"></param> + /// <param name="productBrand"></param> + /// <returns></returns> + public ResponsePackNew IndependentRegister3TyDevcie(string spk,string extDevId,string deviceName) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); + d.Add("spk", spk); + d.Add("extDevId", extDevId); + d.Add("name", deviceName); + + var requestJson = HttpUtil.GetSignRequestJson(d); + return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_IndependentRegister3TyDevcie, requestJson); + } + + + /// <summary> /// 鑾峰彇璁惧璇︽儏 -- Gitblit v1.8.0