This commit is contained in:
parent
632635429d
commit
6cf4cfb5f3
|
@ -546,7 +546,7 @@ namespace DataServer.DAL
|
|||
{
|
||||
StringBuilder strSql = new StringBuilder();
|
||||
strSql.Append("select ElectricityId,DeviceId,EH,P,Kvar,Ia,Ib,Ic,Ua,Ub,Uc,ServiceRating,CreateTime,EntireTime,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5 ");
|
||||
strSql.Append(" FROM electricity_data_ "+date);
|
||||
strSql.Append(" FROM electricity_data_"+date);
|
||||
if (strWhere.Trim() != "")
|
||||
{
|
||||
strSql.Append(" where " + strWhere);
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -55,8 +55,9 @@ namespace DongYingAPI.Controllers.api
|
|||
num1 += aitem.P;
|
||||
}
|
||||
model.P = num1;
|
||||
data.Add(model);
|
||||
|
||||
}
|
||||
data.Add(model);
|
||||
}
|
||||
}
|
||||
else if (date == "月")
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -14,7 +14,7 @@
|
|||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>brRB6Tj3UIh+1hHSCP7cVnP1AJt+M46i6AtPawgLXRE=</dsig:DigestValue>
|
||||
<dsig:DigestValue>wz4nd8r90dO71rHMl0A46+kFV1ComXowjuSBrJUCbSs=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
|
|
|
@ -42,14 +42,14 @@
|
|||
</dependentAssembly>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="72192">
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="73728">
|
||||
<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>pmVu1FdbipTM+/iwPnGrii8WA9GAUkEuZ67Robx/skY=</dsig:DigestValue>
|
||||
<dsig:DigestValue>fFVjvwM2ibdsQhpAwww7UhuCyZEMeyTJEqNJArAq5Y8=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
|
|
Binary file not shown.
|
@ -14,7 +14,7 @@
|
|||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>brRB6Tj3UIh+1hHSCP7cVnP1AJt+M46i6AtPawgLXRE=</dsig:DigestValue>
|
||||
<dsig:DigestValue>wz4nd8r90dO71rHMl0A46+kFV1ComXowjuSBrJUCbSs=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
|
|
|
@ -42,14 +42,14 @@
|
|||
</dependentAssembly>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="72192">
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="73728">
|
||||
<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>pmVu1FdbipTM+/iwPnGrii8WA9GAUkEuZ67Robx/skY=</dsig:DigestValue>
|
||||
<dsig:DigestValue>fFVjvwM2ibdsQhpAwww7UhuCyZEMeyTJEqNJArAq5Y8=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
|
|
Loading…
Reference in New Issue