优化接口

LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs

@@ -48,7 +48,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     var model = new daily_electricityData
                     {
                         time = DateTime.Now.AddHours(-i).ToString("HH:00"),
-                        EH = num1 - num2
+                        EH =Convert.ToDecimal(Math.Round(Convert.ToDouble(num1 - num2),3))
                     };
                     if (model.EH < 0)
                     {

LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs

@@ -64,7 +64,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             var model = new electricity_consumptionData()
                             {
                                 time = DateTime.Now.AddMonths(-i).ToString("MM月"),
-                                EH = num1 - num2
+                                EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num1 - num2), 3))
                             };
                             if (model.EH < 0)
                             {
@@ -107,7 +107,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             var model = new electricity_consumptionData()
                             {
                                 time = DateTime.Now.AddYears(-i).ToString("yyyy年"),
-                                EH = num1 - num2
+                                EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num1 - num2),3))
                             };
                             if (model.EH < 0)
                             {

LonglslandExhibitionCenter/Controllers/api/GetElectricalConditionController.cs

@@ -43,7 +43,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 var amodel = new electrical_conditionData()
                 {
                     EH = jlist1.Sum(x => x.EH) - slist1.Sum(x => x.EH),
-                    Electricity =Convert.ToDecimal(Convert.ToDouble(jlist1.Sum(x => x.EH) - slist1.Sum(x => x.EH))*1.80)
+                    Electricity =Convert.ToDecimal(Math.Round( Convert.ToDouble(jlist1.Sum(x => x.EH) - slist1.Sum(x => x.EH))*1.80,3))
                 };
                 data.Add(amodel);
                 #endregion
@@ -55,7 +55,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 var bmodel = new electrical_conditionData()
                 {
                     EH = jlist2.Sum(x => x.EH) - slist2.Sum(x => x.EH),
-                    Electricity = Convert.ToDecimal(Convert.ToDouble(jlist2.Sum(x => x.EH) - slist2.Sum(x => x.EH)) * 1.80)
+                    Electricity = Convert.ToDecimal(Math.Round(Convert.ToDouble(jlist2.Sum(x => x.EH) - slist2.Sum(x => x.EH)) * 1.80,3))
                 };
                 data.Add(bmodel);
                 #endregion
@@ -73,7 +73,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 var cmodel = new electrical_conditionData()
                 {
                     EH = jlist3.Sum(x => x.EH) - slist3.Sum(x => x.EH),
-                    Electricity = Convert.ToDecimal(Convert.ToDouble(jlist3.Sum(x => x.EH) - slist3.Sum(x => x.EH)) * 1.80)
+                    Electricity = Convert.ToDecimal(Math.Round(Convert.ToDouble(jlist3.Sum(x => x.EH) - slist3.Sum(x => x.EH)) * 1.80,3))
                 };
                 data.Add(cmodel);
                 #endregion

LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs

@@ -70,7 +70,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                         var model = new electricity_consumptionData()
                         {
                             time = stime.AddDays(-i).ToString("dd"),
-                            EH = anum - bnum
+                            EH =Convert.ToDecimal(Math.Round(Convert.ToDouble(anum - bnum),3))
                         };
                         data.Add(model);
                     }

LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs

@@ -83,7 +83,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     }
                     var model = new energy_flowData()
                     {
-                        Amont = anum + bnum
+                        Amont = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum + bnum),3))
                     };
                     #endregion
                     var adata = new List<energy_flow>();
@@ -114,7 +114,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                         var blist = bll.GetModelListDate(" EntireTime='" + eedate1 + "' && Reserve2 like '%空调%'", etime);
                         bnum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
                     }
-                    amodel.AirConditioner = anum + bnum;
+                    amodel.AirConditioner =Convert.ToDecimal(Math.Round(Convert.ToDouble(anum + bnum),3));
                     #endregion
                     #region 照明
                     anum = 0;
@@ -142,7 +142,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                         var blist = bll.GetModelListDate(" EntireTime='" + eedate1 + "' && Reserve2 like '%照明%'", etime);
                         bnum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
                     }
-                    amodel.Illumination = anum + bnum;
+                    amodel.Illumination =Convert.ToDecimal(Math.Round(Convert.ToDouble(anum + bnum),3));
                     #endregion
                     #region 电梯
                     anum = 0;
@@ -170,7 +170,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                         var blist = bll.GetModelListDate(" EntireTime='" + eedate1 + "' && Reserve2 like '%电梯%'", etime);
                         bnum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
                     }
-                    amodel.Elevator = anum + bnum;
+                    amodel.Elevator =Convert.ToDecimal(Math.Round(Convert.ToDouble(anum + bnum),3));
                     #endregion
                     adata.Add(amodel);
                     model.data = adata;

LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs

@@ -71,7 +71,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             var model = new energy_indexingData()
                             {
                                 time = now.AddMonths(-i).ToString("MM月"),
-                                EnergyIndexing=num
+                                EnergyIndexing =Convert.ToDecimal(Math.Round(Convert.ToDouble( num / 26010),3))
                             };
                             data.Add(model);
                         }
@@ -109,7 +109,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             var model = new energy_indexingData()
                             {
                                 time = now.AddYears(-i).ToString("yyyy"),
-                                EnergyIndexing = num
+                                EnergyIndexing = Convert.ToDecimal(Math.Round(Convert.ToDouble(num/26010),3))
                             };
                             data.Add(model);
 

LonglslandExhibitionCenter/Controllers/api/GetGeneralSituationController.cs

@@ -27,7 +27,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     {
                         Operation = 83,
                         Stop = 0,
-                        Area = 830000,
+                        Area = Convert.ToDecimal(2.601),
                         Amount = 83
                     };
                     data.Add(model);                

LonglslandExhibitionCenter/Controllers/api/GetLoopRankingController.cs

@@ -67,7 +67,6 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     }
                    
                 }
-
                 res.code = 200;
                 res.msg = "成功";
                 res.data = bdata;

LonglslandExhibitionCenter/Controllers/api/GetSystemRankingController.cs

@@ -49,7 +49,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 var eflist = list.Where(x => x.Reserve2.Contains("展陈") && x.EntireTime == edate).ToList();
                 var model1=new system_rankingData();
                 model1.name = "空调系统";
-                model1.EH = salist.Sum(x => x.EH)-ealist.Sum(x=>x.EH);
+                model1.EH =Convert.ToDecimal(Math.Round(Convert.ToDouble(salist.Sum(x => x.EH)-ealist.Sum(x=>x.EH)),3));
                 if (model1.EH < 0)
                 {
                     model1.EH = 0;  
@@ -57,7 +57,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 data.Add(model1);
                 var model2=new system_rankingData();
                 model2.name = "照明系统";
-                model2.EH=sblist.Sum(x=>x.EH)-eblist.Sum(x=>x.EH);
+                model2.EH=Convert.ToDecimal(Math.Round(Convert.ToDouble(sblist.Sum(x=>x.EH)-eblist.Sum(x=>x.EH)),3));
                 if(model2.EH < 0)
                 {
                     model2.EH = 0;
@@ -65,14 +65,14 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 data.Add(model2);
                 var model3=new system_rankingData();
                 model3.name = "消防系统";
-                model3.EH=sclist.Sum(x=>x.EH)-eclist.Sum(x=>x.EH);
+                model3.EH=Convert.ToDecimal(Math.Round(Convert.ToDouble(sclist.Sum(x=>x.EH)-eclist.Sum(x=>x.EH)),3));
                 if (model3.EH < 0)
                 {
                     model3.EH = 0;
                 }
                 var model4=new system_rankingData();
                 model4.name = "电梯系统";
-                model4.EH=selist.Sum(x=>x.EH)-eelist.Sum(x=>x.EH);
+                model4.EH=Convert.ToDecimal(Math.Round(Convert.ToDouble(selist.Sum(x=>x.EH)-eelist.Sum(x=>x.EH)),3));
                 if (model4.EH < 0)
                 {
                     model4.EH = 0;
@@ -80,7 +80,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 data.Add(model4);
                 var model5=new system_rankingData();
                 model5.name = "展陈系统";
-                model5.EH=sflist.Sum(x=>x.EH)-eflist.Sum(x=>x.EH);
+                model5.EH=Convert.ToDecimal(Math.Round(Convert.ToDouble(sflist.Sum(x=>x.EH)-eflist.Sum(x=>x.EH)),3));
                 if (model5.EH < 0)
                 {
                     model5.EH = 0;

LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs

@@ -56,11 +56,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             var edate = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00");
                             var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate)).ToList();
                             var blist=list.Where(x=>x.EntireTime==Convert.ToDateTime(edate)).ToList();
-                            var num=alist.Sum(x=>x.EH)-blist.Sum(x=>x.EH);
+                            var num= alist.Sum(x=>x.EH)-blist.Sum(x=>x.EH);
                             var model = new total_energyData()
                             {
                                 time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
-                                EH = num
+                                EH = num* Convert.ToDecimal(1.229)
                             };
                             data.Add(model);
                         }
@@ -98,7 +98,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             var model = new total_energyData()
                             {
                                 time = Convert.ToDateTime(now).AddMonths(-i).ToString("MM月"),
-                                EH = num
+                                EH = num*Convert.ToDecimal(1.229)
                             };
                             data.Add(model);
                         }