diff --git a/DataServer/DAL/device_info.cs b/DataServer/DAL/device_info.cs
index 65f800a..00a96af 100644
--- a/DataServer/DAL/device_info.cs
+++ b/DataServer/DAL/device_info.cs
@@ -274,7 +274,7 @@ namespace DataServer.DAL
 			{
 				return 0;
 			}
-			
+			else
 			{
 				return Convert.ToInt32(obj);
 			}
diff --git a/DongYingAPI/Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs b/DongYingAPI/Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs
index 14fd31e..08cf2c3 100644
--- a/DongYingAPI/Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs
+++ b/DongYingAPI/Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs
@@ -31,7 +31,6 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                 res.code = 200;
                 res.msg = "成功";
                 var data=new List<device_operation_response>();
-                
                 var time=DateTime.Now.ToString("yyyyMM");
                 var sdate = DateTime.Now.ToString("yyyy-MM-dd 00:00:00");
                 var edate= DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
@@ -85,9 +84,9 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                     }
                     model.InstrumentType = item.EquipmentClassification;
                     data.Add(model);
-
                 }
-                
+                res.code = 200;
+                res.msg = "成功";
                 res.data = data;
             }
             catch (Exception ex)
diff --git a/DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyBenchmarkingController.cs b/DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyBenchmarkingController.cs
index 69666fa..c5b6000 100644
--- a/DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyBenchmarkingController.cs
+++ b/DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyBenchmarkingController.cs
@@ -48,7 +48,6 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                     YoyEnergyConsumption = Convert.ToDecimal(-0.03),
                     YoyWaterConsumption = Convert.ToDecimal(0.01)
                 };
-
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyFlowController.cs b/DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyFlowController.cs
index 1759591..ab3a9cc 100644
--- a/DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyFlowController.cs
+++ b/DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyFlowController.cs
@@ -106,7 +106,6 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                         }
                     }
                 }
-
                 res.code = 200;
                 res.msg = "成功";
                 res.data = new energy_flow()
diff --git a/DongYingAPI/Controllers/api/EnergyEfficiency/GetItemizeEnergyController.cs b/DongYingAPI/Controllers/api/EnergyEfficiency/GetItemizeEnergyController.cs
index d91274c..7c1234d 100644
--- a/DongYingAPI/Controllers/api/EnergyEfficiency/GetItemizeEnergyController.cs
+++ b/DongYingAPI/Controllers/api/EnergyEfficiency/GetItemizeEnergyController.cs
@@ -76,7 +76,6 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                         }
                     }
                 }
-
                 res.code = 200;
                 res.msg = "成功";
                 res.data = new itemize_energy() { Lift = lift, AirConditioning = air_conditioning, Lighting = lighting, Other = other };
diff --git a/DongYingAPI/Controllers/api/EnergyEfficiency/GetUnitConsumptionController.cs b/DongYingAPI/Controllers/api/EnergyEfficiency/GetUnitConsumptionController.cs
index 4ed2061..b31ebbb 100644
--- a/DongYingAPI/Controllers/api/EnergyEfficiency/GetUnitConsumptionController.cs
+++ b/DongYingAPI/Controllers/api/EnergyEfficiency/GetUnitConsumptionController.cs
@@ -34,7 +34,6 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                 var now = DateTime.Now;
                 var start_time = DateTime.Parse(now.ToString("yyyy-MM-dd") + " 00:00:00");
                 var end_time = DateTime.Parse(now.ToString("yyyy-MM-dd HH") + ":00:00");
-
                 //今日用水量
                 decimal water = 0;
                 //人均用水量
@@ -55,7 +54,6 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                         }
                     }
                 }
-
                 //今日天然气
                 decimal natural_gas = 0;
                 var gas_list = gas_bll.GetModelList(" EntireTime='" + start_time + "' or EntireTime='" + end_time + "' ");
@@ -97,7 +95,6 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                         }
                     }
                 }
-
                 //人均综合能耗
                 decimal avg_energy_consumption = Math.Round((water + natural_gas + electricity) / 3300, 2);
                 //单位建筑面积综合能耗
diff --git a/DongYingAPI/Controllers/api/GetAllStopController.cs b/DongYingAPI/Controllers/api/GetAllStopController.cs
index fcc9a12..566e699 100644
--- a/DongYingAPI/Controllers/api/GetAllStopController.cs
+++ b/DongYingAPI/Controllers/api/GetAllStopController.cs
@@ -91,7 +91,6 @@ namespace DongYingAPI.Controllers.api
                 res.code = 200;
                 res.msg = "成功";
                 res.data = data;
-
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Controllers/api/GetBuildingLightingController.cs b/DongYingAPI/Controllers/api/GetBuildingLightingController.cs
index 72422ad..554be5c 100644
--- a/DongYingAPI/Controllers/api/GetBuildingLightingController.cs
+++ b/DongYingAPI/Controllers/api/GetBuildingLightingController.cs
@@ -116,7 +116,6 @@ namespace DongYingAPI.Controllers.api
                     model3.BuildingValue= 0;
                 }
                 data.Add(model3);
-
                 res.code = 200;
                 res.msg = "成功";
                 res.data = data;
diff --git a/DongYingAPI/Controllers/api/GetCarbonIntensityController.cs b/DongYingAPI/Controllers/api/GetCarbonIntensityController.cs
index 6a4b12b..76b8fd8 100644
--- a/DongYingAPI/Controllers/api/GetCarbonIntensityController.cs
+++ b/DongYingAPI/Controllers/api/GetCarbonIntensityController.cs
@@ -104,7 +104,6 @@ namespace DongYingAPI.Controllers.api
                 res.msg = "成功";
                 var adata=data.OrderBy(x=>x.time).ToList();
                 res.data = adata;
-                
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Controllers/api/GetCarbonMeasureController.cs b/DongYingAPI/Controllers/api/GetCarbonMeasureController.cs
index 740790b..b9a0cc3 100644
--- a/DongYingAPI/Controllers/api/GetCarbonMeasureController.cs
+++ b/DongYingAPI/Controllers/api/GetCarbonMeasureController.cs
@@ -38,7 +38,7 @@ namespace DongYingAPI.Controllers
                 if (!string.IsNullOrEmpty(date))
                 {
                     var data = new List<carbon_measureData>();
-                     if (date == "月")
+                    if (date == "月")
                     {
                         var time_count = Convert.ToInt32(DateTime.Now.Day);
                         for (int i = 0; i < time_count; i++)
diff --git a/DongYingAPI/Controllers/api/GetCarbonOffsetController.cs b/DongYingAPI/Controllers/api/GetCarbonOffsetController.cs
index d5e965c..a1d4929 100644
--- a/DongYingAPI/Controllers/api/GetCarbonOffsetController.cs
+++ b/DongYingAPI/Controllers/api/GetCarbonOffsetController.cs
@@ -44,8 +44,6 @@ namespace DongYingAPI.Controllers.api
                     res.code = 201;
                     res.msg = "参数不能为空";
                 }
-          
-
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Controllers/api/GetCarbonReductionController.cs b/DongYingAPI/Controllers/api/GetCarbonReductionController.cs
index 64f524d..327971d 100644
--- a/DongYingAPI/Controllers/api/GetCarbonReductionController.cs
+++ b/DongYingAPI/Controllers/api/GetCarbonReductionController.cs
@@ -38,7 +38,6 @@ namespace DongYingAPI.Controllers.api
                 res.code = 200;
                 res.msg = "成功";
                 res.data = data;
-
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Controllers/api/GetCellRankingController.cs b/DongYingAPI/Controllers/api/GetCellRankingController.cs
index 252f02a..2bd3753 100644
--- a/DongYingAPI/Controllers/api/GetCellRankingController.cs
+++ b/DongYingAPI/Controllers/api/GetCellRankingController.cs
@@ -79,7 +79,7 @@ namespace DongYingAPI.Controllers.api
                         res.msg = "成功";
                         res.data = elist;
                     }
-                     if (type == "配电室2")
+                    if (type == "配电室2")
                     {
                         //科技馆负一层地源热泵
                         var now = DateTime.Now;
@@ -120,7 +120,7 @@ namespace DongYingAPI.Controllers.api
                         res.msg = "成功";
                         res.data = elist;
                     }
-                     if (type == "配电室3")
+                    if (type == "配电室3")
                     {
                         //图书馆一楼
                         var now = DateTime.Now;
diff --git a/DongYingAPI/Controllers/api/GetChamberLoadController.cs b/DongYingAPI/Controllers/api/GetChamberLoadController.cs
index 86a07aa..bbebc74 100644
--- a/DongYingAPI/Controllers/api/GetChamberLoadController.cs
+++ b/DongYingAPI/Controllers/api/GetChamberLoadController.cs
@@ -125,7 +125,7 @@ namespace DongYingAPI.Controllers.api
                         res.msg = "成功";
                         res.data = adata;
                     }
-                     if (type == "配电室2")
+                    if (type == "配电室2")
                     {
                         var data = new List<power_loadData>();
                         var list = bll_info.GetModelList("").Where(x => x.FloorName == "科技馆负一层地源热泵").ToList();
@@ -224,7 +224,7 @@ namespace DongYingAPI.Controllers.api
                         res.msg = "成功";
                         res.data = adata;
                     }
-                     if (type == "配电室3")
+                    if (type == "配电室3")
                     {
                         var data = new List<power_loadData>();
                         var list = bll_info.GetModelList("").Where(x => x.FloorName == "图书馆一楼").ToList();
diff --git a/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs b/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs
index 3003deb..59ca6cd 100644
--- a/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs
+++ b/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs
@@ -71,7 +71,7 @@ namespace DongYingAPI.Controllers.api
                         res.msg = "成功";
                         res.data = adata;
                     }
-                     if (room.type == "电压")
+                    if (room.type == "电压")
                     {
                         var data = new List<current_voltageData>();
                         var time_count = Convert.ToInt32(DateTime.Now.Hour);
diff --git a/DongYingAPI/Controllers/api/GetDailyElectricityController.cs b/DongYingAPI/Controllers/api/GetDailyElectricityController.cs
index bbc99d6..1255aa9 100644
--- a/DongYingAPI/Controllers/api/GetDailyElectricityController.cs
+++ b/DongYingAPI/Controllers/api/GetDailyElectricityController.cs
@@ -89,7 +89,6 @@ namespace DongYingAPI.Controllers.api
                 res.code = 200;
                 res.msg = "成功";
                 res.data = data;
-
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Controllers/api/GetDeviceDetailsController.cs b/DongYingAPI/Controllers/api/GetDeviceDetailsController.cs
index 8fbb05e..530eff8 100644
--- a/DongYingAPI/Controllers/api/GetDeviceDetailsController.cs
+++ b/DongYingAPI/Controllers/api/GetDeviceDetailsController.cs
@@ -65,9 +65,6 @@ namespace DongYingAPI.Controllers.api
                         data.Add(model);
                     
                 }
-                
-               
-
                 res.code = 200;
                 res.msg = "成功";
                 res.data = data;
diff --git a/DongYingAPI/Controllers/api/GetDeviceParameterController.cs b/DongYingAPI/Controllers/api/GetDeviceParameterController.cs
index 7ef62b5..cacd19d 100644
--- a/DongYingAPI/Controllers/api/GetDeviceParameterController.cs
+++ b/DongYingAPI/Controllers/api/GetDeviceParameterController.cs
@@ -93,8 +93,6 @@ namespace DongYingAPI.Controllers.api
                     #endregion
                     data.Add(model);
                 }
-                
-
                 res.code = 200;
                 res.msg = "成功";
                 res.data = data;
diff --git a/DongYingAPI/Controllers/api/GetElectricEquipmentController.cs b/DongYingAPI/Controllers/api/GetElectricEquipmentController.cs
index cc4b748..6758772 100644
--- a/DongYingAPI/Controllers/api/GetElectricEquipmentController.cs
+++ b/DongYingAPI/Controllers/api/GetElectricEquipmentController.cs
@@ -67,7 +67,6 @@ namespace DongYingAPI.Controllers.api
                 res.code = 200;
                 res.msg = "成功";
                 res.data = elist;
-
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Controllers/api/GetElectricalConditionController.cs b/DongYingAPI/Controllers/api/GetElectricalConditionController.cs
index 914f2d2..2f884b6 100644
--- a/DongYingAPI/Controllers/api/GetElectricalConditionController.cs
+++ b/DongYingAPI/Controllers/api/GetElectricalConditionController.cs
@@ -240,11 +240,9 @@ namespace DongYingAPI.Controllers.api
                     }
                 }
                 data.Add(model);
-
                 res.code = 200;
                 res.msg = "成功";
                 res.data = data;
-
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Controllers/api/GetElectricalRankingController.cs b/DongYingAPI/Controllers/api/GetElectricalRankingController.cs
index b7ffdfa..8da6f67 100644
--- a/DongYingAPI/Controllers/api/GetElectricalRankingController.cs
+++ b/DongYingAPI/Controllers/api/GetElectricalRankingController.cs
@@ -102,7 +102,6 @@ namespace DongYingAPI.Controllers.api
                 res.code = 200;
                 res.msg = "成功";
                 res.data = elist;
-
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs b/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs
index e8d8356..2d8c934 100644
--- a/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs
+++ b/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs
@@ -88,7 +88,7 @@ namespace DongYingAPI.Controllers.api
                         res.msg = "成功";
                         res.data = data;
                     }
-                     if (type == "配电室2")
+                    if (type == "配电室2")
                     {
                         //科技馆负一层地源热泵
                         var now = DateTime.Now;
@@ -141,7 +141,7 @@ namespace DongYingAPI.Controllers.api
                         res.msg = "成功";
                         res.data = data;
                     }
-                     if (type == "配电室3")
+                    if (type == "配电室3")
                     {
                         //图书馆一楼
                         var now = DateTime.Now;
diff --git a/DongYingAPI/Controllers/api/GetEssentialInformationController.cs b/DongYingAPI/Controllers/api/GetEssentialInformationController.cs
index d8d7cb7..e91935f 100644
--- a/DongYingAPI/Controllers/api/GetEssentialInformationController.cs
+++ b/DongYingAPI/Controllers/api/GetEssentialInformationController.cs
@@ -25,7 +25,6 @@ namespace DongYingAPI.Controllers.api
                 if (!string.IsNullOrEmpty(room.name))
                 {
                     var data = new List<essential_informationData>();
-                    
                     var list=bll.GetModelList("").Where(x=>x.Reserve2== room.name).ToList();
                     foreach (var item in list)
                     {
diff --git a/DongYingAPI/Controllers/api/GetFaultConditionController.cs b/DongYingAPI/Controllers/api/GetFaultConditionController.cs
index 0cda4fc..12e0bd9 100644
--- a/DongYingAPI/Controllers/api/GetFaultConditionController.cs
+++ b/DongYingAPI/Controllers/api/GetFaultConditionController.cs
@@ -26,7 +26,6 @@ namespace DongYingAPI.Controllers.api
                 model.NormalNumber = 22;
                 model.AbnormalNumber = 0;
                 data.Add(model);
-
                 res.code = 200;
                 res.msg = "成功";
                 res.data = data;
diff --git a/DongYingAPI/Controllers/api/GetGasConsumptionController.cs b/DongYingAPI/Controllers/api/GetGasConsumptionController.cs
index 5805b8a..e341672 100644
--- a/DongYingAPI/Controllers/api/GetGasConsumptionController.cs
+++ b/DongYingAPI/Controllers/api/GetGasConsumptionController.cs
@@ -91,7 +91,6 @@ namespace DongYingAPI.Controllers.api
                 res.code = 200;
                 res.msg = "成功";
                 res.data = adata;
-
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs b/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs
index d2e2dd0..e5dd792 100644
--- a/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs
+++ b/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs
@@ -73,7 +73,7 @@ namespace DongYingAPI.Controllers.api
                         data.Add(model);
 
                     }
-                     if (date == "月")
+                    if (date == "月")
                     {
                         var now = DateTime.Now;
                         DateTime jdate;
diff --git a/DongYingAPI/Controllers/api/GetIlluminationLoadController.cs b/DongYingAPI/Controllers/api/GetIlluminationLoadController.cs
index fe8318e..2942dd1 100644
--- a/DongYingAPI/Controllers/api/GetIlluminationLoadController.cs
+++ b/DongYingAPI/Controllers/api/GetIlluminationLoadController.cs
@@ -172,7 +172,6 @@ namespace DongYingAPI.Controllers.api
                 res.code = 200;
                 res.msg = "成功";
                 res.data = adata;
-
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Controllers/api/GetLightingMonitoringController.cs b/DongYingAPI/Controllers/api/GetLightingMonitoringController.cs
index 00489de..066c918 100644
--- a/DongYingAPI/Controllers/api/GetLightingMonitoringController.cs
+++ b/DongYingAPI/Controllers/api/GetLightingMonitoringController.cs
@@ -30,7 +30,6 @@ namespace DongYingAPI.Controllers.api
                 res.code = 200;
                 res.msg = "成功";
                 res.data = data;
-
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Controllers/api/GetLightingStrategyController.cs b/DongYingAPI/Controllers/api/GetLightingStrategyController.cs
index 55e08dd..2f843a2 100644
--- a/DongYingAPI/Controllers/api/GetLightingStrategyController.cs
+++ b/DongYingAPI/Controllers/api/GetLightingStrategyController.cs
@@ -289,7 +289,6 @@ namespace DongYingAPI.Controllers.api
                 res.code = 200;
                 res.msg = "成功";
                 res.data = data;
-
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Controllers/api/GetMeteorologicalStationController.cs b/DongYingAPI/Controllers/api/GetMeteorologicalStationController.cs
index cf0f769..ff0e645 100644
--- a/DongYingAPI/Controllers/api/GetMeteorologicalStationController.cs
+++ b/DongYingAPI/Controllers/api/GetMeteorologicalStationController.cs
@@ -101,7 +101,6 @@ namespace DongYingAPI.Controllers.api
                 res.code = 200;
                 res.msg = "成功";
                 res.data = data;
-
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Controllers/api/GetPowerLoadController.cs b/DongYingAPI/Controllers/api/GetPowerLoadController.cs
index af74da5..76c542a 100644
--- a/DongYingAPI/Controllers/api/GetPowerLoadController.cs
+++ b/DongYingAPI/Controllers/api/GetPowerLoadController.cs
@@ -54,7 +54,7 @@ namespace DongYingAPI.Controllers.api
 
                         }
                     }
-                     if (date == "月")
+                    if (date == "月")
                     {
                         var time_count = Convert.ToInt32(DateTime.Now.Day);
                         for (int i = 0; i < time_count; i++)
@@ -79,7 +79,7 @@ namespace DongYingAPI.Controllers.api
                             data.Add(model);
                         }
                     }
-                     if (date == "年")
+                    if (date == "年")
                     {
                         var time_count = Convert.ToInt32(DateTime.Now.Month);
                         for (int i = 0; i < time_count; i++)
@@ -104,7 +104,7 @@ namespace DongYingAPI.Controllers.api
                             data.Add(model);
                         }
                     }
-                     var adata=data.OrderBy(x => x.time).ToList();
+                    var adata=data.OrderBy(x => x.time).ToList();
                     res.code = 200;
                     res.msg = "成功";
                     res.data = adata;
diff --git a/DongYingAPI/Controllers/api/GetRealtimeLoadController.cs b/DongYingAPI/Controllers/api/GetRealtimeLoadController.cs
index bf8d566..1e7b461 100644
--- a/DongYingAPI/Controllers/api/GetRealtimeLoadController.cs
+++ b/DongYingAPI/Controllers/api/GetRealtimeLoadController.cs
@@ -43,7 +43,6 @@ namespace DongYingAPI.Controllers.api
                 res.code = 200;
                 res.msg = "成功";
                 res.data = data;
-
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Controllers/api/GetRoomElectricityController.cs b/DongYingAPI/Controllers/api/GetRoomElectricityController.cs
index ecc727e..4be515e 100644
--- a/DongYingAPI/Controllers/api/GetRoomElectricityController.cs
+++ b/DongYingAPI/Controllers/api/GetRoomElectricityController.cs
@@ -203,7 +203,7 @@ namespace DongYingAPI.Controllers.api
                         res.msg = "成功";
                         res.data = adata;
                     }
-                     if (type == "配电室2")
+                    if (type == "配电室2")
                     {
                         var data = new List<room_electricityData>();
                         var list = bll_info.GetModelList("").Where(x => x.FloorName == "科技馆负一层地源热泵").ToList();
@@ -377,7 +377,7 @@ namespace DongYingAPI.Controllers.api
                         res.msg = "成功";
                         res.data = adata;
                     }
-                     if (type == "配电室3")
+                    if (type == "配电室3")
                     {
                         var data = new List<room_electricityData>();
                         var list = bll_info.GetModelList("").Where(x => x.FloorName == "图书馆一楼").ToList();
diff --git a/DongYingAPI/Controllers/api/GetWaterConsumptionController.cs b/DongYingAPI/Controllers/api/GetWaterConsumptionController.cs
index 7488646..dda66be 100644
--- a/DongYingAPI/Controllers/api/GetWaterConsumptionController.cs
+++ b/DongYingAPI/Controllers/api/GetWaterConsumptionController.cs
@@ -172,7 +172,6 @@ namespace DongYingAPI.Controllers.api
                 res.code = 200;
                 res.msg = "成功";
                 res.data = adata;
-
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Controllers/api/SetDraughtFanController.cs b/DongYingAPI/Controllers/api/SetDraughtFanController.cs
index b530d9c..7faebdb 100644
--- a/DongYingAPI/Controllers/api/SetDraughtFanController.cs
+++ b/DongYingAPI/Controllers/api/SetDraughtFanController.cs
@@ -53,8 +53,8 @@ namespace DongYingAPI.Controllers.api
                     model.ClientId = item.ClientId;
                     bll.Update(model);
                 }
-                    var alist = bll.GetModelList("");
-                    foreach (var aitem in alist)
+                var alist = bll.GetModelList("");
+                foreach (var aitem in alist)
                     {
                         log4net.Config.XmlConfigurator.Configure();
                         log = log4net.LogManager.GetLogger("loginfo");
diff --git a/DongYingAPI/Controllers/api/SetHostControlController.cs b/DongYingAPI/Controllers/api/SetHostControlController.cs
index 63360cf..956ebe1 100644
--- a/DongYingAPI/Controllers/api/SetHostControlController.cs
+++ b/DongYingAPI/Controllers/api/SetHostControlController.cs
@@ -69,10 +69,9 @@ namespace DongYingAPI.Controllers.api
                     mqqt.MqttClientStart();
                     mqqt.Publish("gc/data/ce5a0665-b5eb-4e75-a6a5-799449c3f092", "J" + JsonConvert.SerializeObject(controlData));
                 }
-                    res.code = 200;
-                    res.msg = "成功";
-                    res.data = data;
-
+                res.code = 200;
+                res.msg = "成功";
+                res.data = data;
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Controllers/api/SetLightingController.cs b/DongYingAPI/Controllers/api/SetLightingController.cs
index eb92213..40451ba 100644
--- a/DongYingAPI/Controllers/api/SetLightingController.cs
+++ b/DongYingAPI/Controllers/api/SetLightingController.cs
@@ -208,7 +208,6 @@ namespace DongYingAPI.Controllers.api
                     data controlData = new data();
                     controlData.h = new HeaderData();
                     controlData.h.rt = "";
-
                     // 如果需要同时设置多个数据项，可以使用字典
                     controlData.b = new BodyData();
                     controlData.b.dl = new Dictionary<string, string>();
diff --git a/DongYingAPI/Controllers/api/SetTerrestrialSourceController.cs b/DongYingAPI/Controllers/api/SetTerrestrialSourceController.cs
index aa78489..2533222 100644
--- a/DongYingAPI/Controllers/api/SetTerrestrialSourceController.cs
+++ b/DongYingAPI/Controllers/api/SetTerrestrialSourceController.cs
@@ -51,8 +51,8 @@ namespace DongYingAPI.Controllers
                     }
                     bll.Update(model);
                 }
-                    var alist = bll.GetModelList("");
-                    foreach (var item in alist)
+                var alist = bll.GetModelList("");
+                foreach (var item in alist)
                     {
                         log4net.Config.XmlConfigurator.Configure();
                         log = log4net.LogManager.GetLogger("loginfo");
@@ -70,9 +70,9 @@ namespace DongYingAPI.Controllers
                         mqqt.MqttClientStart();
                         mqqt.Publish("gc/data/5193f258-04f0-4401-bd34-a507713e9e71", "J" + JsonConvert.SerializeObject(controlData));
                     }
-                    res.code = 200;
-                    res.msg = "成功";
-                    res.data = data;
+                res.code = 200;
+                res.msg = "成功";
+                res.data = data;
             }
             catch (Exception ex)
             {
diff --git a/DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 7981e69..f1b0130 100644
--- a/DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>E:\林谷项目\东营两馆一宫\后端框架\DongYing\DongYingAPI\bin\app.publish\</_PublishTargetUrl>
-    <History>True|2024-03-22T06:35:10.7122317Z;True|2024-03-22T14:23:11.4660337+08:00;True|2024-03-22T14:01:56.5337932+08:00;True|2024-03-22T13:44:39.9603628+08:00;True|2024-03-22T09:09:26.8930206+08:00;True|2024-03-21T10:26:38.9258316+08:00;True|2024-03-21T09:56:54.3444569+08:00;True|2024-03-20T13:58:42.4555031+08:00;True|2024-03-19T17:05:11.6998862+08:00;True|2024-03-19T16:15:08.2016341+08:00;True|2024-03-12T13:39:36.5196065+08:00;True|2024-03-08T15:20:13.3402822+08:00;True|2024-03-08T09:32:17.5138435+08:00;True|2024-03-04T10:00:33.0681294+08:00;True|2024-03-01T11:05:46.5158063+08:00;True|2024-03-01T09:20:05.1925139+08:00;True|2024-02-26T14:30:47.0846108+08:00;True|2024-02-26T13:13:41.6324599+08:00;True|2024-02-26T09:47:50.0632719+08:00;True|2024-02-23T16:52:31.5607201+08:00;True|2024-02-21T11:02:12.3544605+08:00;True|2024-02-21T11:02:02.8020234+08:00;True|2024-02-05T17:53:57.0306881+08:00;True|2024-02-05T15:03:29.8538142+08:00;True|2024-02-05T10:05:19.3967649+08:00;True|2024-02-04T14:00:33.8555838+08:00;True|2024-02-02T14:35:29.9414639+08:00;True|2024-02-01T14:38:16.2460751+08:00;True|2024-02-01T13:56:20.6256272+08:00;True|2024-02-01T10:10:55.0739031+08:00;True|2024-02-01T09:46:59.8042783+08:00;True|2024-02-01T09:23:48.9652035+08:00;True|2024-01-31T16:21:08.6583762+08:00;True|2024-01-31T13:41:30.5192673+08:00;True|2024-01-30T15:15:26.7880164+08:00;True|2024-01-30T14:10:09.8489640+08:00;True|2024-01-30T13:16:11.0447202+08:00;True|2024-01-30T09:45:36.4140361+08:00;True|2024-01-29T14:17:38.5560371+08:00;True|2024-01-29T14:16:41.5597407+08:00;True|2024-01-24T17:31:19.5804558+08:00;True|2024-01-20T14:34:47.0539217+08:00;False|2024-01-15T13:49:44.5332318+08:00;True|2024-01-15T11:01:00.7602516+08:00;True|2024-01-15T09:26:27.2161156+08:00;True|2024-01-10T17:34:07.8440850+08:00;False|2024-01-10T17:33:54.1670007+08:00;True|2024-01-10T17:32:39.4867251+08:00;True|2024-01-10T14:45:12.0400450+08:00;</History>
+    <History>True|2024-03-25T06:39:33.8799780Z;True|2024-03-22T14:35:10.7122317+08:00;True|2024-03-22T14:23:11.4660337+08:00;True|2024-03-22T14:01:56.5337932+08:00;True|2024-03-22T13:44:39.9603628+08:00;True|2024-03-22T09:09:26.8930206+08:00;True|2024-03-21T10:26:38.9258316+08:00;True|2024-03-21T09:56:54.3444569+08:00;True|2024-03-20T13:58:42.4555031+08:00;True|2024-03-19T17:05:11.6998862+08:00;True|2024-03-19T16:15:08.2016341+08:00;True|2024-03-12T13:39:36.5196065+08:00;True|2024-03-08T15:20:13.3402822+08:00;True|2024-03-08T09:32:17.5138435+08:00;True|2024-03-04T10:00:33.0681294+08:00;True|2024-03-01T11:05:46.5158063+08:00;True|2024-03-01T09:20:05.1925139+08:00;True|2024-02-26T14:30:47.0846108+08:00;True|2024-02-26T13:13:41.6324599+08:00;True|2024-02-26T09:47:50.0632719+08:00;True|2024-02-23T16:52:31.5607201+08:00;True|2024-02-21T11:02:12.3544605+08:00;True|2024-02-21T11:02:02.8020234+08:00;True|2024-02-05T17:53:57.0306881+08:00;True|2024-02-05T15:03:29.8538142+08:00;True|2024-02-05T10:05:19.3967649+08:00;True|2024-02-04T14:00:33.8555838+08:00;True|2024-02-02T14:35:29.9414639+08:00;True|2024-02-01T14:38:16.2460751+08:00;True|2024-02-01T13:56:20.6256272+08:00;True|2024-02-01T10:10:55.0739031+08:00;True|2024-02-01T09:46:59.8042783+08:00;True|2024-02-01T09:23:48.9652035+08:00;True|2024-01-31T16:21:08.6583762+08:00;True|2024-01-31T13:41:30.5192673+08:00;True|2024-01-30T15:15:26.7880164+08:00;True|2024-01-30T14:10:09.8489640+08:00;True|2024-01-30T13:16:11.0447202+08:00;True|2024-01-30T09:45:36.4140361+08:00;True|2024-01-29T14:17:38.5560371+08:00;True|2024-01-29T14:16:41.5597407+08:00;True|2024-01-24T17:31:19.5804558+08:00;True|2024-01-20T14:34:47.0539217+08:00;False|2024-01-15T13:49:44.5332318+08:00;True|2024-01-15T11:01:00.7602516+08:00;True|2024-01-15T09:26:27.2161156+08:00;True|2024-01-10T17:34:07.8440850+08:00;False|2024-01-10T17:33:54.1670007+08:00;True|2024-01-10T17:32:39.4867251+08:00;True|2024-01-10T14:45:12.0400450+08:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
   <ItemGroup>
@@ -85,10 +85,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>03/21/2024 10:25:22</publishTime>
     </File>
     <File Include="bin/DongYingAPI.dll">
-      <publishTime>03/22/2024 15:00:49</publishTime>
+      <publishTime>03/25/2024 14:39:32</publishTime>
     </File>
     <File Include="bin/DongYingAPI.pdb">
-      <publishTime>03/22/2024 15:00:49</publishTime>
+      <publishTime>03/25/2024 14:39:32</publishTime>
     </File>
     <File Include="bin/HslCommunication.dll">
       <publishTime>08/03/2021 14:52:26</publishTime>
@@ -364,13 +364,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>03/22/2024 14:41:06</publishTime>
     </File>
     <File Include="Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs">
-      <publishTime>02/20/2024 10:58:53</publishTime>
+      <publishTime>03/25/2024 09:57:58</publishTime>
     </File>
     <File Include="Controllers/api/EnergyEfficiency/GetElectricityPriceController.cs">
       <publishTime>01/11/2024 14:58:40</publishTime>
     </File>
     <File Include="Controllers/api/EnergyEfficiency/GetEnergyBenchmarkingController.cs">
-      <publishTime>01/11/2024 14:56:39</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/EnergyEfficiency/GetEnergyCalendarController.cs">
       <publishTime>03/21/2024 14:46:58</publishTime>
@@ -379,28 +379,28 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>03/21/2024 15:02:08</publishTime>
     </File>
     <File Include="Controllers/api/EnergyEfficiency/GetEnergyFlowController.cs">
-      <publishTime>02/26/2024 14:25:08</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/EnergyEfficiency/GetEnergyTrendController.cs">
       <publishTime>03/22/2024 15:00:18</publishTime>
     </File>
     <File Include="Controllers/api/EnergyEfficiency/GetItemizeEnergyController.cs">
-      <publishTime>03/22/2024 09:03:47</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/EnergyEfficiency/GetMultiRateController.cs">
       <publishTime>01/11/2024 15:58:43</publishTime>
     </File>
     <File Include="Controllers/api/EnergyEfficiency/GetUnitConsumptionController.cs">
-      <publishTime>03/22/2024 09:12:06</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/GetAirConditionerController.cs">
       <publishTime>03/21/2024 09:33:32</publishTime>
     </File>
     <File Include="Controllers/api/GetAllStopController.cs">
-      <publishTime>03/04/2024 09:51:33</publishTime>
+      <publishTime>03/25/2024 09:48:28</publishTime>
     </File>
     <File Include="Controllers/api/GetBuildingLightingController.cs">
-      <publishTime>03/20/2024 11:15:49</publishTime>
+      <publishTime>03/25/2024 09:48:28</publishTime>
     </File>
     <File Include="Controllers/api/GetCarbonEmissionController.cs">
       <publishTime>03/19/2024 16:06:25</publishTime>
@@ -409,34 +409,34 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>03/22/2024 13:57:47</publishTime>
     </File>
     <File Include="Controllers/api/GetCarbonIntensityController.cs">
-      <publishTime>03/22/2024 14:01:18</publishTime>
+      <publishTime>03/25/2024 09:48:28</publishTime>
     </File>
     <File Include="Controllers/api/GetCarbonMeasureController.cs">
-      <publishTime>03/20/2024 10:52:07</publishTime>
+      <publishTime>03/25/2024 09:48:28</publishTime>
     </File>
     <File Include="Controllers/api/GetCarbonOffsetController.cs">
-      <publishTime>01/10/2024 13:25:43</publishTime>
+      <publishTime>03/25/2024 09:48:28</publishTime>
     </File>
     <File Include="Controllers/api/GetCarbonReductionController.cs">
-      <publishTime>03/20/2024 10:55:36</publishTime>
+      <publishTime>03/25/2024 09:43:32</publishTime>
     </File>
     <File Include="Controllers/api/GetCellRankingController.cs">
-      <publishTime>03/20/2024 11:23:49</publishTime>
+      <publishTime>03/25/2024 09:48:28</publishTime>
     </File>
     <File Include="Controllers/api/GetChamberLoadController.cs">
-      <publishTime>03/12/2024 15:12:49</publishTime>
+      <publishTime>03/25/2024 09:48:28</publishTime>
     </File>
     <File Include="Controllers/api/GetCurrentVoltageController.cs">
-      <publishTime>03/20/2024 13:44:45</publishTime>
+      <publishTime>03/25/2024 09:48:28</publishTime>
     </File>
     <File Include="Controllers/api/GetDailyElectricityController.cs">
-      <publishTime>03/21/2024 10:15:28</publishTime>
+      <publishTime>03/25/2024 09:48:28</publishTime>
     </File>
     <File Include="Controllers/api/GetDeviceDetailsController.cs">
-      <publishTime>02/04/2024 13:59:28</publishTime>
+      <publishTime>03/25/2024 09:48:28</publishTime>
     </File>
     <File Include="Controllers/api/GetDeviceParameterController.cs">
-      <publishTime>03/04/2024 17:18:25</publishTime>
+      <publishTime>03/25/2024 09:48:28</publishTime>
     </File>
     <File Include="Controllers/api/GetDistributionPowerController.cs">
       <publishTime>02/21/2024 10:31:36</publishTime>
@@ -445,13 +445,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>03/01/2024 17:28:21</publishTime>
     </File>
     <File Include="Controllers/api/GetElectricalConditionController.cs">
-      <publishTime>03/21/2024 10:54:32</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/GetElectricalRankingController.cs">
-      <publishTime>03/22/2024 13:41:01</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/GetElectricEquipmentController.cs">
-      <publishTime>02/20/2024 15:04:19</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/GetElectricityConsumptionController.cs">
       <publishTime>03/19/2024 16:43:57</publishTime>
@@ -463,43 +463,43 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>03/22/2024 14:53:19</publishTime>
     </File>
     <File Include="Controllers/api/GetEquipmentMonitoringController.cs">
-      <publishTime>02/20/2024 15:11:54</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/GetEssentialInformationController.cs">
-      <publishTime>02/21/2024 10:37:02</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/GetFaultConditionController.cs">
-      <publishTime>01/11/2024 13:37:00</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/GetFrequencyConversionController.cs">
       <publishTime>03/01/2024 10:42:25</publishTime>
     </File>
     <File Include="Controllers/api/GetGasConsumptionController.cs">
-      <publishTime>02/01/2024 15:10:41</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/GetGeneralCatalogueController.cs">
-      <publishTime>03/21/2024 13:21:36</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/GetHostControlController.cs">
       <publishTime>03/01/2024 17:07:01</publishTime>
     </File>
     <File Include="Controllers/api/GetIlluminationLoadController.cs">
-      <publishTime>03/21/2024 13:06:09</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/GetLightingLoadController.cs">
       <publishTime>03/21/2024 09:44:31</publishTime>
     </File>
     <File Include="Controllers/api/GetLightingMonitoringController.cs">
-      <publishTime>01/10/2024 16:58:07</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/GetLightingStrategyController.cs">
-      <publishTime>02/04/2024 14:42:28</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/GetMeteorologicalStationController.cs">
-      <publishTime>03/12/2024 13:38:12</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/GetPowerLoadController.cs">
-      <publishTime>03/21/2024 09:49:05</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/GetPrimaryPumpController.cs">
       <publishTime>03/01/2024 17:25:32</publishTime>
@@ -508,10 +508,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>03/20/2024 13:58:08</publishTime>
     </File>
     <File Include="Controllers/api/GetRealtimeLoadController.cs">
-      <publishTime>03/19/2024 16:50:46</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/GetRoomElectricityController.cs">
-      <publishTime>03/12/2024 15:18:20</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/GetRunningStatusController.cs">
       <publishTime>02/20/2024 15:28:29</publishTime>
@@ -526,13 +526,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>03/01/2024 17:12:36</publishTime>
     </File>
     <File Include="Controllers/api/GetWaterConsumptionController.cs">
-      <publishTime>03/19/2024 16:08:04</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/loginController.cs">
       <publishTime>01/09/2024 10:54:33</publishTime>
     </File>
     <File Include="Controllers/api/SetDraughtFanController.cs">
-      <publishTime>03/01/2024 15:39:26</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/SetExitTemperatureController.cs">
       <publishTime>02/29/2024 15:17:13</publishTime>
@@ -541,10 +541,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>03/01/2024 10:52:17</publishTime>
     </File>
     <File Include="Controllers/api/SetHostControlController.cs">
-      <publishTime>02/29/2024 15:05:09</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/SetLightingController.cs">
-      <publishTime>02/29/2024 15:04:50</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/api/SetPrimaryPumpController.cs">
       <publishTime>02/29/2024 17:51:26</publishTime>
@@ -553,7 +553,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>03/01/2024 10:27:29</publishTime>
     </File>
     <File Include="Controllers/api/SetTerrestrialSourceController.cs">
-      <publishTime>03/01/2024 11:26:29</publishTime>
+      <publishTime>03/25/2024 10:00:10</publishTime>
     </File>
     <File Include="Controllers/GetSingleControlController.cs">
       <publishTime>02/04/2024 15:01:51</publishTime>
diff --git a/DongYingAPI/bin/DongYingAPI.dll b/DongYingAPI/bin/DongYingAPI.dll
index b671073..7155dec 100644
Binary files a/DongYingAPI/bin/DongYingAPI.dll and b/DongYingAPI/bin/DongYingAPI.dll differ
diff --git a/DongYingAPI/bin/DongYingAPI.pdb b/DongYingAPI/bin/DongYingAPI.pdb
index 81e0881..963381b 100644
Binary files a/DongYingAPI/bin/DongYingAPI.pdb and b/DongYingAPI/bin/DongYingAPI.pdb differ
diff --git a/DongYingAPI/obj/Debug/DongYingAPI.dll b/DongYingAPI/obj/Debug/DongYingAPI.dll
index b671073..a8ed5fe 100644
Binary files a/DongYingAPI/obj/Debug/DongYingAPI.dll and b/DongYingAPI/obj/Debug/DongYingAPI.dll differ
diff --git a/DongYingAPI/obj/Debug/DongYingAPI.pdb b/DongYingAPI/obj/Debug/DongYingAPI.pdb
index 81e0881..3ea27aa 100644
Binary files a/DongYingAPI/obj/Debug/DongYingAPI.pdb and b/DongYingAPI/obj/Debug/DongYingAPI.pdb differ