完成修改

DataServer/api/get_carbon_measure.cs

@@ -22,7 +22,7 @@ namespace DataServer.Model
         /// <summary>
         /// 数据
         /// </summary>
-        public List<carbon_emissionData> data { get; set; }
+        public List<carbon_measureData> data { get; set; }
     }
     public class carbon_measureData
     {

DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-752a6e1b70ab5d71df5d0cbf0bbd0a7b1da79829
+7fcd104ed931a93f81505ce377f5e1bfe52798a6

DongYingAPI/Controllers/api/GetCarbonMeasureController.cs

@@ -20,13 +20,13 @@ namespace DongYingAPI.Controllers
         DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info();
         public HttpResponseMessage Get(string date = "")
         {
-            var res = new get_air_conditioner();
+            var res = new get_carbon_measure();
             try
             {
                 if (!string.IsNullOrEmpty(date))
                 {
-                    var data = new List<air_conditionerData>();
+                    var data = new List<carbon_measureData>();
-                    var list = bll_info.GetModelList("").Where(x => x.DeviceName.Contains("空调")).ToList();
+                    var list = bll_info.GetModelList("");
                     var time = DateTime.Now.ToString("yyyyMM");
                     if (date == "日")
                     {
@@ -35,27 +35,25 @@ namespace DongYingAPI.Controllers
                         var b = 0;
                         for (int i = 0; i < 6; i++)
                         {
-                            var model = new air_conditionerData();
+                            var model = new carbon_measureData();
 
                             var j = i * 60;
                             b = Convert.ToInt32(a);
                             string now = "";
                             model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00");
                             now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
-                            a = "31";
                             var datetime = Convert.ToDateTime(now);
                             var sdate = datetime.AddHours(-i);
                             var edate = datetime.AddHours(-i + 1);
-                            //var list1 = bll_info.GetModelList("").Where(x =>x.DeviceName.Contains("空调")&& x.EntireTime >= sdate && x.EntireTime < edate).ToList();
                             decimal? num1 = 0;
                             foreach (var item in list)
                             {
                                 var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId && x.EntireTime >= sdate && x.EntireTime < edate).ToList();
                                 foreach (var aitem in list1)
                                 {
-                                    num1 += aitem.P;
+                                    num1 += aitem.EH;
                                 }
-                                model.P = num1;
+                                model.CarbonValue = num1 / 1000 * Convert.ToDecimal(0.5703);
                             }
                             data.Add(model);
 
@@ -65,7 +63,7 @@ namespace DongYingAPI.Controllers
                     {
                         for (int i = 0; i < 6; i++)
                         {
-                            var model = new air_conditionerData();
+                            var model = new carbon_measureData();
                             var atime = DateTime.Now.AddDays(-i).ToString("dd号");
                             model.time = atime;
                             var now = DateTime.Now.AddDays(-i);
@@ -79,9 +77,9 @@ namespace DongYingAPI.Controllers
 
                                 foreach (var aitem in alist)
                                 {
-                                    num += aitem.P;
+                                    num += aitem.EH;
                                 }
-                                model.P = num;
+                                model.CarbonValue = num / 1000 * Convert.ToDecimal(0.5703);
 
                             }
                             data.Add(model);
@@ -91,7 +89,7 @@ namespace DongYingAPI.Controllers
                     {
                         for (int i = 0; i < 6; i++)
                         {
-                            var model = new air_conditionerData();
+                            var model = new carbon_measureData();
                             var atime = DateTime.Now.AddMonths(-i).ToString("MM月");
                             model.time = atime;
                             var now = DateTime.Now.AddMonths(-i);
@@ -104,9 +102,9 @@ namespace DongYingAPI.Controllers
                                 var alist = list1.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList();
                                 foreach (var aitem in alist)
                                 {
-                                    num += aitem.P;
+                                    num += aitem.EH;
                                 }
-                                model.P = num;
+                                model.CarbonValue = num / 1000 * Convert.ToDecimal(0.5703);
 
                             }
                             data.Add(model);

DongYingAPI/Web.config

@@ -5,7 +5,7 @@
   -->
 <configuration>
 	<appSettings>
-		<add key="ConnectionString" value="Data Source=127.0.0.1;Database=dongying;User ID=root;Password=Unity3du#d112233;Charset=gbk;convert zero datetime=True"/>
+		<add key="ConnectionString" value="Data Source=127.0.0.1;Database=dongying;User ID=root;Password=0822;Charset=gbk;convert zero datetime=True"/>
 		<add key="MySQLDataBase" value="dongying"/>
 		<add key="webpages:Version" value="3.0.0.0" />
 		<add key="webpages:Enabled" value="false" />

DongYingAPI/obj/Debug/DongYingAPI.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-2daf8a227faca6c6caeee6c2b7aed66fd89baba1
+abb0e93bff5eee475ebe2f4c7d86f766480d3a15

Security/bin/Debug/ServiceSecurity.application

@@ -7,14 +7,14 @@
     <framework targetVersion="4.7.2" profile="Full" supportedRuntime="4.0.30319" />
   </compatibleFrameworks>
   <dependency>
-    <dependentAssembly dependencyType="install" codebase="ServiceSecurity.exe.manifest" size="8754">
+    <dependentAssembly dependencyType="install" codebase="ServiceSecurity.exe.manifest" size="8755">
       <assemblyIdentity name="ServiceSecurity.exe" version="1.0.0.2" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>MaSB9zKFQS+iDnEjY5O32c/t1YAFFfG/1BnLDJ8aat8=</dsig:DigestValue>
+        <dsig:DigestValue>XCGE4OqWR85JxWdl4SmtwTIMQ5nBl8ZkF7zpfQJxrjE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

Security/bin/Debug/ServiceSecurity.exe.manifest

@@ -42,14 +42,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="88576">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="101888">
       <assemblyIdentity name="DataServer" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>8aAyf2+5JgbZz56G6PmGmTJqLWjHrxqhVhKhq6BJugE=</dsig:DigestValue>
+        <dsig:DigestValue>mMU5DkMd36SSoV9C4OC7va8L9Q4t1oI5f8IWnzSUES0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

Security/obj/Debug/ServiceSecurity.application

@@ -7,14 +7,14 @@
     <framework targetVersion="4.7.2" profile="Full" supportedRuntime="4.0.30319" />
   </compatibleFrameworks>
   <dependency>
-    <dependentAssembly dependencyType="install" codebase="ServiceSecurity.exe.manifest" size="8754">
+    <dependentAssembly dependencyType="install" codebase="ServiceSecurity.exe.manifest" size="8755">
       <assemblyIdentity name="ServiceSecurity.exe" version="1.0.0.2" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>MaSB9zKFQS+iDnEjY5O32c/t1YAFFfG/1BnLDJ8aat8=</dsig:DigestValue>
+        <dsig:DigestValue>XCGE4OqWR85JxWdl4SmtwTIMQ5nBl8ZkF7zpfQJxrjE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

Security/obj/Debug/ServiceSecurity.exe.manifest

@@ -42,14 +42,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="88576">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="101888">
       <assemblyIdentity name="DataServer" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>8aAyf2+5JgbZz56G6PmGmTJqLWjHrxqhVhKhq6BJugE=</dsig:DigestValue>
+        <dsig:DigestValue>mMU5DkMd36SSoV9C4OC7va8L9Q4t1oI5f8IWnzSUES0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>