XKH
/
DongYing
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

版本1.1

This commit is contained in:
xukanghao 2024-01-15 15:53:06 +08:00
parent 3623fa1f35
commit 09064b0f94
28 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DataServer/api/EnergyEfficiency/get_device_operation_response.cs
View File

@ -29,7 +29,7 @@ namespace DataServer.api.EnergyEfficiency
public class device_operation_response public class device_operation_response
{ {
public string SystematicName { get; set; } public string SystematicName { get; set; }
public string SystematicState { get; set; } public int SystematicState { get; set; }
public string InstrumentAddress { get; set; } public string InstrumentAddress { get; set; }
public string InstrumentType { get; set; } public string InstrumentType { get; set; }
} }

2
DataServer/api/get_equipment_monitoring.cs
View File

@ -28,6 +28,6 @@ namespace DataServer.api
public int SerialNumber { get; set; } public int SerialNumber { get; set; }
public string DeviceName { get; set; } public string DeviceName { get; set; }
public decimal? EH { get; set; } public decimal? EH { get; set; }
public string DeviceState { get; set; } public int DeviceState { get; set; }
} }
} }

2
DataServer/api/get_lighting_strategy.cs
View File

@ -26,6 +26,6 @@ namespace DataServer.api
public class lighting_strategyData public class lighting_strategyData
{ {
public string StrategyName { get; set; } public string StrategyName { get; set; }
public string StrategyState { get; set;} public int StrategyState { get; set;}
} }
} }

2
DataServer/api/get_realtime_data.cs
View File

@ -35,6 +35,6 @@ namespace DataServer
/// 变损率 /// 变损率
/// </summary> /// </summary>
public decimal? ConversionRate { get; set; } public decimal? ConversionRate { get; set; }
public string DeviceState { get; set; } public int DeviceState { get; set; }
} }
} }

2
DataServer/api/get_running status.cs
View File

@ -26,7 +26,7 @@ namespace DataServer.api
public class running_statusData public class running_statusData
{ {
public string DeviceName { get; set; } public string DeviceName { get; set; }
public string DeviceState { get; set; } public int DeviceState { get; set; }
public decimal? EH { get; set; } public decimal? EH { get; set; }
} }
} }

BIN
DataServer/bin/Debug/DataServer.pdb
View File

Binary file not shown.

BIN
DataServer/obj/Debug/DataServer.dll
View File

Binary file not shown.

BIN
DataServer/obj/Debug/DataServer.pdb
View File

Binary file not shown.

4
DongYingAPI/Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs
View File

@ -75,11 +75,11 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
} }
if (kcount1 == kcount2) if (kcount1 == kcount2)
{ {
model.SystematicState = "正常"; model.SystematicState = 1;
} }
else else
{ {
model.SystematicState = "异常"; model.SystematicState = 0;
} }
model.InstrumentType = item.EquipmentClassification; model.InstrumentType = item.EquipmentClassification;
data.Add(model); data.Add(model);

12
DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs
View File

@ -80,11 +80,11 @@ namespace DongYingAPI.Controllers.api
model.EH = num1 - num2; model.EH = num1 - num2;
if(model.EH == 0) if(model.EH == 0)
{ {
model.DeviceState = "异常"; model.DeviceState = 0;
} }
else else
{ {
model.DeviceState = "正常"; model.DeviceState = 1;
} }
data.Add(model); data.Add(model);
@ -132,11 +132,11 @@ namespace DongYingAPI.Controllers.api
model.EH = num1 - num2; model.EH = num1 - num2;
if(model.EH == 0) if(model.EH == 0)
{ {
model.DeviceState = "异常"; model.DeviceState = 0;
} }
else else
{ {
model.DeviceState = "正常"; model.DeviceState = 1;
} }
data.Add(model); data.Add(model);
@ -183,11 +183,11 @@ namespace DongYingAPI.Controllers.api
model.EH = num1 - num2; model.EH = num1 - num2;
if (model.EH == 0) if (model.EH == 0)
{ {
model.DeviceState = "异常"; model.DeviceState = 0;
} }
else else
{ {
model.DeviceState = "正常"; model.DeviceState = 1;
} }
data.Add(model); data.Add(model);
} }

10
DongYingAPI/Controllers/api/GetLightingStrategyController.cs
View File

@ -28,7 +28,15 @@ namespace DongYingAPI.Controllers.api
{ {
var model=new lighting_strategyData(); var model=new lighting_strategyData();
model.StrategyName = item.StrategyName; model.StrategyName = item.StrategyName;
model.StrategyState = item.StrategyState; if (item.StrategyState == "正常")
{
model.StrategyState = 1;
}
if (item.StrategyState == "异常")
{
model.StrategyState = 0;
}
//model.StrategyState = item.StrategyState;
data.Add(model); data.Add(model);
} }

2
DongYingAPI/Controllers/api/GetRealtimeDataController.cs
View File

@ -49,7 +49,7 @@ namespace DongYingAPI.Controllers.api
var cnum = Math.Round(Convert.ToDouble(item.P) / Convert.ToDouble(num), 3); var cnum = Math.Round(Convert.ToDouble(item.P) / Convert.ToDouble(num), 3);
model.LoadRate = Convert.ToDecimal(cnum) * 100; model.LoadRate = Convert.ToDecimal(cnum) * 100;
model.ConversionRate = Math.Round(Convert.ToDecimal(5.5) / Convert.ToDecimal(item.EH), 3) * 100; model.ConversionRate = Math.Round(Convert.ToDecimal(5.5) / Convert.ToDecimal(item.EH), 3) * 100;
model.DeviceState = "正常"; model.DeviceState = 1;
data.Add(model); data.Add(model);
} }
} }

2
DongYingAPI/Controllers/api/GetRunningStatusController.cs
View File

@ -50,7 +50,7 @@ namespace DongYingAPI.Controllers.api
{ {
var model=new running_statusData(); var model=new running_statusData();
model.DeviceName= aitem.DeviceName; model.DeviceName= aitem.DeviceName;
model.DeviceState = "正常"; model.DeviceState = 1;
var jlist = bll.GetModelListDate("", jtime).Where(x => x.DeviceId == aitem.DeviceId && x.EntireTime == Convert.ToDateTime(jdate)).ToList(); var jlist = bll.GetModelListDate("", jtime).Where(x => x.DeviceId == aitem.DeviceId && x.EntireTime == Convert.ToDateTime(jdate)).ToList();
var slist = bll.GetModelListDate("", stime).Where(x => x.DeviceId == aitem.DeviceId && x.EntireTime == Convert.ToDateTime(sdate)).ToList(); var slist = bll.GetModelListDate("", stime).Where(x => x.DeviceId == aitem.DeviceId && x.EntireTime == Convert.ToDateTime(sdate)).ToList();
foreach (var item in jlist) foreach (var item in jlist)

18
DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
View File

@ -79,16 +79,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>09/10/2013 16:29:20</publishTime> <publishTime>09/10/2013 16:29:20</publishTime>
</File> </File>
<File Include="bin/DataServer.dll"> <File Include="bin/DataServer.dll">
<publishTime>01/15/2024 13:49:51</publishTime> <publishTime>01/15/2024 15:27:20</publishTime>
</File> </File>
<File Include="bin/DataServer.pdb"> <File Include="bin/DataServer.pdb">
<publishTime>01/15/2024 13:49:51</publishTime> <publishTime>01/15/2024 15:27:20</publishTime>
</File> </File>
<File Include="bin/DongYingAPI.dll"> <File Include="bin/DongYingAPI.dll">
<publishTime>01/15/2024 13:50:11</publishTime> <publishTime>01/15/2024 15:27:50</publishTime>
</File> </File>
<File Include="bin/DongYingAPI.pdb"> <File Include="bin/DongYingAPI.pdb">
<publishTime>01/15/2024 13:50:11</publishTime> <publishTime>01/15/2024 15:27:50</publishTime>
</File> </File>
<File Include="bin/HslCommunication.dll"> <File Include="bin/HslCommunication.dll">
<publishTime>08/03/2021 14:52:26</publishTime> <publishTime>08/03/2021 14:52:26</publishTime>
@ -364,7 +364,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/10/2024 17:33:29</publishTime> <publishTime>01/10/2024 17:33:29</publishTime>
</File> </File>
<File Include="Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs"> <File Include="Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs">
<publishTime>01/12/2024 18:47:54</publishTime> <publishTime>01/15/2024 15:26:02</publishTime>
</File> </File>
<File Include="Controllers/api/EnergyEfficiency/GetElectricityPriceController.cs"> <File Include="Controllers/api/EnergyEfficiency/GetElectricityPriceController.cs">
<publishTime>01/11/2024 14:58:40</publishTime> <publishTime>01/11/2024 14:58:40</publishTime>
@ -457,7 +457,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/12/2024 17:11:08</publishTime> <publishTime>01/12/2024 17:11:08</publishTime>
</File> </File>
<File Include="Controllers/api/GetEquipmentMonitoringController.cs"> <File Include="Controllers/api/GetEquipmentMonitoringController.cs">
<publishTime>01/12/2024 16:11:58</publishTime> <publishTime>01/15/2024 15:24:36</publishTime>
</File> </File>
<File Include="Controllers/api/GetEssentialInformationController.cs"> <File Include="Controllers/api/GetEssentialInformationController.cs">
<publishTime>01/08/2024 13:30:31</publishTime> <publishTime>01/08/2024 13:30:31</publishTime>
@ -481,7 +481,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/10/2024 16:58:07</publishTime> <publishTime>01/10/2024 16:58:07</publishTime>
</File> </File>
<File Include="Controllers/api/GetLightingStrategyController.cs"> <File Include="Controllers/api/GetLightingStrategyController.cs">
<publishTime>01/11/2024 13:18:52</publishTime> <publishTime>01/15/2024 15:20:41</publishTime>
</File> </File>
<File Include="Controllers/api/GetMeteorologicalStationController.cs"> <File Include="Controllers/api/GetMeteorologicalStationController.cs">
<publishTime>01/11/2024 13:47:16</publishTime> <publishTime>01/11/2024 13:47:16</publishTime>
@ -490,7 +490,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/09/2024 17:02:14</publishTime> <publishTime>01/09/2024 17:02:14</publishTime>
</File> </File>
<File Include="Controllers/api/GetRealtimeDataController.cs"> <File Include="Controllers/api/GetRealtimeDataController.cs">
<publishTime>01/09/2024 16:25:24</publishTime> <publishTime>01/15/2024 15:22:34</publishTime>
</File> </File>
<File Include="Controllers/api/GetRealtimeLoadController.cs"> <File Include="Controllers/api/GetRealtimeLoadController.cs">
<publishTime>01/09/2024 17:02:14</publishTime> <publishTime>01/09/2024 17:02:14</publishTime>
@ -499,7 +499,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/12/2024 17:11:08</publishTime> <publishTime>01/12/2024 17:11:08</publishTime>
</File> </File>
<File Include="Controllers/api/GetRunningStatusController.cs"> <File Include="Controllers/api/GetRunningStatusController.cs">
<publishTime>01/12/2024 15:48:49</publishTime> <publishTime>01/15/2024 15:25:54</publishTime>
</File> </File>
<File Include="Controllers/api/GetWaterConsumptionController.cs"> <File Include="Controllers/api/GetWaterConsumptionController.cs">
<publishTime>01/11/2024 16:51:02</publishTime> <publishTime>01/11/2024 16:51:02</publishTime>

BIN
DongYingAPI/bin/DataServer.dll
View File

Binary file not shown.

BIN
DongYingAPI/bin/DataServer.pdb
View File

Binary file not shown.

BIN
DongYingAPI/bin/DongYingAPI.dll
View File

Binary file not shown.

BIN
DongYingAPI/bin/DongYingAPI.pdb
View File

Binary file not shown.

BIN
DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
DongYingAPI/obj/Debug/DongYingAPI.dll
View File

Binary file not shown.

BIN
DongYingAPI/obj/Debug/DongYingAPI.pdb
View File

Binary file not shown.

BIN
Security/bin/Debug/DataServer.dll
View File

Binary file not shown.

BIN
Security/bin/Debug/DataServer.pdb
View File

Binary file not shown.

2
Security/bin/Debug/ServiceSecurity.application
View File

@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms> </dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>GScl3CZ2qpJ9jFdPcw+ZnX68DCAS4LmifkveDdn+/cU=</dsig:DigestValue> <dsig:DigestValue>u5NQ+1BbZ+XTbzSltn6OyRRl/GKXQgavUmtE1SWYYIM=</dsig:DigestValue>
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>

2
Security/bin/Debug/ServiceSecurity.exe.manifest
View File

@ -49,7 +49,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms> </dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>xQiQI9ifmRrHXRlAxTYTlEi5Knw8SbX1q8Yjn1kRweo=</dsig:DigestValue> <dsig:DigestValue>t3t2VUAEbBgQYqqvQWmyeTfU5g8NBCHvqQak5Dp1RNc=</dsig:DigestValue>
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>

BIN
Security/obj/Debug/Security.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
Security/obj/Debug/ServiceSecurity.application
View File

@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms> </dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>GScl3CZ2qpJ9jFdPcw+ZnX68DCAS4LmifkveDdn+/cU=</dsig:DigestValue> <dsig:DigestValue>u5NQ+1BbZ+XTbzSltn6OyRRl/GKXQgavUmtE1SWYYIM=</dsig:DigestValue>
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>

2
Security/obj/Debug/ServiceSecurity.exe.manifest
View File

@ -49,7 +49,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms> </dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>xQiQI9ifmRrHXRlAxTYTlEi5Knw8SbX1q8Yjn1kRweo=</dsig:DigestValue> <dsig:DigestValue>t3t2VUAEbBgQYqqvQWmyeTfU5g8NBCHvqQak5Dp1RNc=</dsig:DigestValue>
</hash> </hash>
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>