diff --git a/DataServer/api/EnergyEfficiency/get_device_operation_response.cs b/DataServer/api/EnergyEfficiency/get_device_operation_response.cs
index 0447f57..72b64a2 100644
--- a/DataServer/api/EnergyEfficiency/get_device_operation_response.cs
+++ b/DataServer/api/EnergyEfficiency/get_device_operation_response.cs
@@ -29,7 +29,7 @@ namespace DataServer.api.EnergyEfficiency
public class device_operation_response
{
public string SystematicName { get; set; }
- public string SystematicState { get; set; }
+ public int SystematicState { get; set; }
public string InstrumentAddress { get; set; }
public string InstrumentType { get; set; }
}
diff --git a/DataServer/api/get_equipment_monitoring.cs b/DataServer/api/get_equipment_monitoring.cs
index 5f4b670..5e8147d 100644
--- a/DataServer/api/get_equipment_monitoring.cs
+++ b/DataServer/api/get_equipment_monitoring.cs
@@ -28,6 +28,6 @@ namespace DataServer.api
public int SerialNumber { get; set; }
public string DeviceName { get; set; }
public decimal? EH { get; set; }
- public string DeviceState { get; set; }
+ public int DeviceState { get; set; }
}
}
diff --git a/DataServer/api/get_lighting_strategy.cs b/DataServer/api/get_lighting_strategy.cs
index dd4fba4..dd756ff 100644
--- a/DataServer/api/get_lighting_strategy.cs
+++ b/DataServer/api/get_lighting_strategy.cs
@@ -26,6 +26,6 @@ namespace DataServer.api
public class lighting_strategyData
{
public string StrategyName { get; set; }
- public string StrategyState { get; set;}
+ public int StrategyState { get; set;}
}
}
diff --git a/DataServer/api/get_realtime_data.cs b/DataServer/api/get_realtime_data.cs
index 4374797..ba34292 100644
--- a/DataServer/api/get_realtime_data.cs
+++ b/DataServer/api/get_realtime_data.cs
@@ -35,6 +35,6 @@ namespace DataServer
/// 变损率
///
public decimal? ConversionRate { get; set; }
- public string DeviceState { get; set; }
+ public int DeviceState { get; set; }
}
}
diff --git a/DataServer/api/get_running status.cs b/DataServer/api/get_running status.cs
index c92270c..1892b0d 100644
--- a/DataServer/api/get_running status.cs
+++ b/DataServer/api/get_running status.cs
@@ -26,7 +26,7 @@ namespace DataServer.api
public class running_statusData
{
public string DeviceName { get; set; }
- public string DeviceState { get; set; }
+ public int DeviceState { get; set; }
public decimal? EH { get; set; }
}
}
diff --git a/DataServer/bin/Debug/DataServer.pdb b/DataServer/bin/Debug/DataServer.pdb
index bee30bf..a2dc1e2 100644
Binary files a/DataServer/bin/Debug/DataServer.pdb and b/DataServer/bin/Debug/DataServer.pdb differ
diff --git a/DataServer/obj/Debug/DataServer.dll b/DataServer/obj/Debug/DataServer.dll
index a997f50..173637b 100644
Binary files a/DataServer/obj/Debug/DataServer.dll and b/DataServer/obj/Debug/DataServer.dll differ
diff --git a/DataServer/obj/Debug/DataServer.pdb b/DataServer/obj/Debug/DataServer.pdb
index bee30bf..a2dc1e2 100644
Binary files a/DataServer/obj/Debug/DataServer.pdb and b/DataServer/obj/Debug/DataServer.pdb differ
diff --git a/DongYingAPI/Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs b/DongYingAPI/Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs
index 72b557a..228fa67 100644
--- a/DongYingAPI/Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs
+++ b/DongYingAPI/Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs
@@ -75,11 +75,11 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
}
if (kcount1 == kcount2)
{
- model.SystematicState = "正常";
+ model.SystematicState = 1;
}
else
{
- model.SystematicState = "异常";
+ model.SystematicState = 0;
}
model.InstrumentType = item.EquipmentClassification;
data.Add(model);
diff --git a/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs b/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs
index 9694efa..71134c0 100644
--- a/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs
+++ b/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs
@@ -80,11 +80,11 @@ namespace DongYingAPI.Controllers.api
model.EH = num1 - num2;
if(model.EH == 0)
{
- model.DeviceState = "异常";
+ model.DeviceState = 0;
}
else
{
- model.DeviceState = "正常";
+ model.DeviceState = 1;
}
data.Add(model);
@@ -132,11 +132,11 @@ namespace DongYingAPI.Controllers.api
model.EH = num1 - num2;
if(model.EH == 0)
{
- model.DeviceState = "异常";
+ model.DeviceState = 0;
}
else
{
- model.DeviceState = "正常";
+ model.DeviceState = 1;
}
data.Add(model);
@@ -183,11 +183,11 @@ namespace DongYingAPI.Controllers.api
model.EH = num1 - num2;
if (model.EH == 0)
{
- model.DeviceState = "异常";
+ model.DeviceState = 0;
}
else
{
- model.DeviceState = "正常";
+ model.DeviceState = 1;
}
data.Add(model);
}
diff --git a/DongYingAPI/Controllers/api/GetLightingStrategyController.cs b/DongYingAPI/Controllers/api/GetLightingStrategyController.cs
index f10f6e4..e5caed2 100644
--- a/DongYingAPI/Controllers/api/GetLightingStrategyController.cs
+++ b/DongYingAPI/Controllers/api/GetLightingStrategyController.cs
@@ -28,7 +28,15 @@ namespace DongYingAPI.Controllers.api
{
var model=new lighting_strategyData();
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);
}
diff --git a/DongYingAPI/Controllers/api/GetRealtimeDataController.cs b/DongYingAPI/Controllers/api/GetRealtimeDataController.cs
index e978ac0..c6e9fc4 100644
--- a/DongYingAPI/Controllers/api/GetRealtimeDataController.cs
+++ b/DongYingAPI/Controllers/api/GetRealtimeDataController.cs
@@ -49,7 +49,7 @@ namespace DongYingAPI.Controllers.api
var cnum = Math.Round(Convert.ToDouble(item.P) / Convert.ToDouble(num), 3);
model.LoadRate = Convert.ToDecimal(cnum) * 100;
model.ConversionRate = Math.Round(Convert.ToDecimal(5.5) / Convert.ToDecimal(item.EH), 3) * 100;
- model.DeviceState = "正常";
+ model.DeviceState = 1;
data.Add(model);
}
}
diff --git a/DongYingAPI/Controllers/api/GetRunningStatusController.cs b/DongYingAPI/Controllers/api/GetRunningStatusController.cs
index 721c095..5d6f2c1 100644
--- a/DongYingAPI/Controllers/api/GetRunningStatusController.cs
+++ b/DongYingAPI/Controllers/api/GetRunningStatusController.cs
@@ -50,7 +50,7 @@ namespace DongYingAPI.Controllers.api
{
var model=new running_statusData();
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 slist = bll.GetModelListDate("", stime).Where(x => x.DeviceId == aitem.DeviceId && x.EntireTime == Convert.ToDateTime(sdate)).ToList();
foreach (var item in jlist)
diff --git a/DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 24b77a5..732fda1 100644
--- a/DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -79,16 +79,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
09/10/2013 16:29:20
- 01/15/2024 13:49:51
+ 01/15/2024 15:27:20
- 01/15/2024 13:49:51
+ 01/15/2024 15:27:20
- 01/15/2024 13:50:11
+ 01/15/2024 15:27:50
- 01/15/2024 13:50:11
+ 01/15/2024 15:27:50
08/03/2021 14:52:26
@@ -364,7 +364,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
01/10/2024 17:33:29
- 01/12/2024 18:47:54
+ 01/15/2024 15:26:02
01/11/2024 14:58:40
@@ -457,7 +457,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
01/12/2024 17:11:08
- 01/12/2024 16:11:58
+ 01/15/2024 15:24:36
01/08/2024 13:30:31
@@ -481,7 +481,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
01/10/2024 16:58:07
- 01/11/2024 13:18:52
+ 01/15/2024 15:20:41
01/11/2024 13:47:16
@@ -490,7 +490,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
01/09/2024 17:02:14
- 01/09/2024 16:25:24
+ 01/15/2024 15:22:34
01/09/2024 17:02:14
@@ -499,7 +499,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
01/12/2024 17:11:08
- 01/12/2024 15:48:49
+ 01/15/2024 15:25:54
01/11/2024 16:51:02
diff --git a/DongYingAPI/bin/DataServer.dll b/DongYingAPI/bin/DataServer.dll
index a997f50..173637b 100644
Binary files a/DongYingAPI/bin/DataServer.dll and b/DongYingAPI/bin/DataServer.dll differ
diff --git a/DongYingAPI/bin/DataServer.pdb b/DongYingAPI/bin/DataServer.pdb
index bee30bf..a2dc1e2 100644
Binary files a/DongYingAPI/bin/DataServer.pdb and b/DongYingAPI/bin/DataServer.pdb differ
diff --git a/DongYingAPI/bin/DongYingAPI.dll b/DongYingAPI/bin/DongYingAPI.dll
index 2f01a18..685b458 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 9576914..bdbe5fd 100644
Binary files a/DongYingAPI/bin/DongYingAPI.pdb and b/DongYingAPI/bin/DongYingAPI.pdb differ
diff --git a/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache b/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache
index 5a16342..f1b83ed 100644
Binary files a/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache and b/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache differ
diff --git a/DongYingAPI/obj/Debug/DongYingAPI.dll b/DongYingAPI/obj/Debug/DongYingAPI.dll
index f820edf..a41cc16 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 781f83b..a6a38d5 100644
Binary files a/DongYingAPI/obj/Debug/DongYingAPI.pdb and b/DongYingAPI/obj/Debug/DongYingAPI.pdb differ
diff --git a/Security/bin/Debug/DataServer.dll b/Security/bin/Debug/DataServer.dll
index 6ae026f..a997f50 100644
Binary files a/Security/bin/Debug/DataServer.dll and b/Security/bin/Debug/DataServer.dll differ
diff --git a/Security/bin/Debug/DataServer.pdb b/Security/bin/Debug/DataServer.pdb
index 820d27f..bee30bf 100644
Binary files a/Security/bin/Debug/DataServer.pdb and b/Security/bin/Debug/DataServer.pdb differ
diff --git a/Security/bin/Debug/ServiceSecurity.application b/Security/bin/Debug/ServiceSecurity.application
index ea60503..22d358f 100644
--- a/Security/bin/Debug/ServiceSecurity.application
+++ b/Security/bin/Debug/ServiceSecurity.application
@@ -14,7 +14,7 @@
- GScl3CZ2qpJ9jFdPcw+ZnX68DCAS4LmifkveDdn+/cU=
+ u5NQ+1BbZ+XTbzSltn6OyRRl/GKXQgavUmtE1SWYYIM=
diff --git a/Security/bin/Debug/ServiceSecurity.exe.manifest b/Security/bin/Debug/ServiceSecurity.exe.manifest
index 80759ec..823fef6 100644
--- a/Security/bin/Debug/ServiceSecurity.exe.manifest
+++ b/Security/bin/Debug/ServiceSecurity.exe.manifest
@@ -49,7 +49,7 @@
- xQiQI9ifmRrHXRlAxTYTlEi5Knw8SbX1q8Yjn1kRweo=
+ t3t2VUAEbBgQYqqvQWmyeTfU5g8NBCHvqQak5Dp1RNc=
diff --git a/Security/obj/Debug/Security.csproj.AssemblyReference.cache b/Security/obj/Debug/Security.csproj.AssemblyReference.cache
index 3dc45fa..764fb70 100644
Binary files a/Security/obj/Debug/Security.csproj.AssemblyReference.cache and b/Security/obj/Debug/Security.csproj.AssemblyReference.cache differ
diff --git a/Security/obj/Debug/ServiceSecurity.application b/Security/obj/Debug/ServiceSecurity.application
index ea60503..22d358f 100644
--- a/Security/obj/Debug/ServiceSecurity.application
+++ b/Security/obj/Debug/ServiceSecurity.application
@@ -14,7 +14,7 @@
- GScl3CZ2qpJ9jFdPcw+ZnX68DCAS4LmifkveDdn+/cU=
+ u5NQ+1BbZ+XTbzSltn6OyRRl/GKXQgavUmtE1SWYYIM=
diff --git a/Security/obj/Debug/ServiceSecurity.exe.manifest b/Security/obj/Debug/ServiceSecurity.exe.manifest
index 80759ec..823fef6 100644
--- a/Security/obj/Debug/ServiceSecurity.exe.manifest
+++ b/Security/obj/Debug/ServiceSecurity.exe.manifest
@@ -49,7 +49,7 @@
- xQiQI9ifmRrHXRlAxTYTlEi5Knw8SbX1q8Yjn1kRweo=
+ t3t2VUAEbBgQYqqvQWmyeTfU5g8NBCHvqQak5Dp1RNc=