优化气象站接口

This commit is contained in:
xukanghao 2024-03-20 17:47:29 +08:00
parent 1aa935980e
commit 8353ce6d37
37 changed files with 171 additions and 25 deletions

View File

@ -15,6 +15,6 @@ namespace DataService.api
public class meteorological_stationData
{
public string name { get; set; }
public string value { get; set; }
public int value { get; set; }
}
}

View File

@ -27,14 +27,78 @@ namespace LonglslandExhibitionCenter.Controllers.api
var data = new List<meteorological_stationData>();
var list = bll.GetModelList("");
var time=Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
var alist=list.Where(x=>x.EntireTime==time).ToList();
foreach (var item in alist)
var model1 = new meteorological_stationData();
model1.name = "风速";
var list1 = list.Where(x => x.MeteorologicalName == model1.name&&x.EntireTime==time).FirstOrDefault();
if (list1 == null)
{
var model = new meteorological_stationData();
model.name = item.MeteorologicalName;
model.value = Convert.ToString(item.MeteorologicalValue);
data.Add(model);
model1.value = 0;
}
else
{
model1.value = Convert.ToInt32(list1.MeteorologicalValue);
}
data.Add(model1);
var model2=new meteorological_stationData();
model2.name = "雨量";
var list2=list.Where(x=>x.MeteorologicalName==model2.name&&x.EntireTime==time).FirstOrDefault();
if (list2 == null)
{
model2.value = 0;
}
else
{
model2.value = Convert.ToInt32(list2.MeteorologicalValue);
}
data.Add(model2);
var model3 = new meteorological_stationData();
model3.name = "光照度";
var list3 = list.Where(x => x.MeteorologicalName == model3.name && x.EntireTime == time).FirstOrDefault();
if(list3 == null)
{
model3.value = 0;
}
else
{
model3.value = Convert.ToInt32(list3.MeteorologicalValue);
}
data.Add(model3);
var model4 = new meteorological_stationData();
model4.name = "雨雪状态";
var list4 = list.Where(x => x.MeteorologicalName == model4.name && x.EntireTime == time).FirstOrDefault();
if(list4 == null)
{
model4.value = 0;
}
else
{
model4.value = Convert.ToInt32(list4.MeteorologicalValue);
}
data.Add(model4);
var model5 = new meteorological_stationData();
model5.name = "风向";
var list5 = list.Where(x => x.MeteorologicalName == model5.name && x.EntireTime == time).FirstOrDefault();
if(list5 == null)
{
model5.value = 0;
}
else
{
model5.value = Convert.ToInt32(list5.MeteorologicalValue);
}
data.Add(model5);
var model6 = new meteorological_stationData();
model6.name = "空气质量";
var list6 = list.Where(x => x.MeteorologicalName == model6.name && x.EntireTime == time).FirstOrDefault();
if(list6 == null)
{
model6.value = 0;
}
else
{
model6.value = Convert.ToInt32(list6.MeteorologicalValue);
}
data.Add(model6);
res.code = 200;
res.msg = "成功";
res.data = data;

View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>E:\林谷项目\长岛展览馆项目\后端\LonglslandExhibitionCenter\LonglslandExhibitionCenter\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>

View File

@ -191,15 +191,21 @@ namespace Security
}
var now = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
var ddate=Convert.ToDateTime(now);
var dtime =DateTime.Now.AddMonths(-1).ToString("yyyyMM");
var sddate=Convert.ToDateTime(ddate.AddHours(-1));
var list = bll.GetModelListDate("", date).Where(x => x.EntireTime == ddate).ToList();
if (list.Count < 83)
if (list.Count < 84)
{
var list1= list.Select(x => x.DeviceName).ToList();
var list2 = bll_info.GetModelLists(list1);
var vlist = bll.GetModelListDate(" ", date);
if (vlist.Count == 0)
{
vlist = bll.GetModelListDate("", dtime);
}
foreach (var aitem in list2)
{
var svlist = vlist.FirstOrDefault(x => x.DeviceName == aitem.DeviceName);
var svlist = vlist.Where(x=>x.DeviceName==aitem.DeviceName).OrderByDescending(x=>x.EntireTime).FirstOrDefault();
var model = new DataService.Model.electricity_data();
model.ElectricityId = Guid.NewGuid().ToString("N");
model.DeviceName = aitem.DeviceName;
@ -357,7 +363,7 @@ namespace Security
var now = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
var ddate = Convert.ToDateTime(now);
var list = bll.GetModelListDate("", date).Where(x => x.EntireTime == ddate).ToList();
if (list.Count < 83)
if (list.Count < 84)
{
var list1 = list.Select(x => x.DeviceName).ToList();
var list2 = bll_info.GetModelLists(list1);
@ -511,16 +517,14 @@ namespace Security
var name = "";
char delimiter = '.'; // 分隔符
int lastDotIndex = item.da.LastIndexOf(delimiter); // 查找最后一个分隔符的位置
if (lastDotIndex != -1) // 如果找到分隔符
{
name = item.da.Substring(lastDotIndex + 1); // 截取分隔符后面的子字符串
}
var now = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
var ddate = Convert.ToDateTime(now);
var list = bll.GetModelListDate("", date).Where(x => x.EntireTime == ddate).ToList();
if (list.Count < 83)
if (list.Count < 84)
{
var list1 = list.Select(x => x.DeviceName).ToList();
var list2 = bll_info.GetModelLists(list1);

View File

@ -0,0 +1,78 @@
------------------------------------------------
------------------------------------------------
------------------------------------------------
2024-03-20 14:34:08,223 [3] INFO loginfo - 服务开始
2024-03-20 14:34:08,252 [3] INFO loginfo - 开始
2024-03-20 14:34:08,293 [3] INFO loginfo - 连接成功
2024-03-20 14:34:08,293 [3] INFO loginfo - 连接失败
------------------------------------------------
------------------------------------------------
------------------------------------------------
2024-03-20 14:44:23,824 [3] INFO loginfo - 服务开始
2024-03-20 14:44:23,871 [3] INFO loginfo - 开始
2024-03-20 14:44:23,928 [3] INFO loginfo - 连接成功
2024-03-20 14:44:23,928 [3] INFO loginfo - 连接失败
2024-03-20 14:45:07,764 [7] INFO loginfo - 进入方法
2024-03-20 14:45:07,764 [7] INFO loginfo - count0
2024-03-20 14:45:08,029 [7] INFO loginfo - 配电室低压msgJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}}
2024-03-20 14:45:08,168 [7] INFO loginfo - 配电室低压:DataService.api.get_data
2024-03-20 14:45:27,663 [7] INFO loginfo - 处理失败数据J{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}},原因:未将对象引用设置到对象的实例。
2024-03-20 14:45:27,672 [7] INFO loginfo - 进入方法
2024-03-20 14:45:27,672 [7] INFO loginfo - count0
2024-03-20 14:45:27,674 [7] INFO loginfo - 配电室低压msgJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}}
2024-03-20 14:45:27,674 [7] INFO loginfo - 配电室低压:DataService.api.get_data
2024-03-20 14:45:27,991 [7] INFO loginfo - 处理失败数据J{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}},原因:未将对象引用设置到对象的实例。
2024-03-20 14:45:32,407 [22] INFO loginfo - 进入方法
2024-03-20 14:45:32,407 [22] INFO loginfo - count0
2024-03-20 14:45:32,408 [22] INFO loginfo - 配电室低压msgJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}}
2024-03-20 14:45:32,408 [22] INFO loginfo - 配电室低压:DataService.api.get_data
------------------------------------------------
------------------------------------------------
------------------------------------------------
2024-03-20 14:48:37,622 [3] INFO loginfo - 服务开始
2024-03-20 14:48:37,653 [3] INFO loginfo - 开始
2024-03-20 14:48:37,676 [3] INFO loginfo - 连接成功
2024-03-20 14:48:37,676 [3] INFO loginfo - 连接失败
2024-03-20 14:48:46,138 [5] INFO loginfo - 进入方法
2024-03-20 14:48:46,139 [5] INFO loginfo - count0
2024-03-20 14:48:46,366 [5] INFO loginfo - 配电室低压msgJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}}
2024-03-20 14:48:46,513 [5] INFO loginfo - 配电室低压:DataService.api.get_data
2024-03-20 14:49:06,738 [5] INFO loginfo - 处理失败数据J{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}},原因:未将对象引用设置到对象的实例。
2024-03-20 14:49:10,417 [17] INFO loginfo - 进入方法
2024-03-20 14:49:10,417 [17] INFO loginfo - count0
2024-03-20 14:49:10,418 [17] INFO loginfo - 配电室低压msgJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}}
2024-03-20 14:49:10,418 [17] INFO loginfo - 配电室低压:DataService.api.get_data
------------------------------------------------
------------------------------------------------
------------------------------------------------
2024-03-20 14:50:02,648 [3] INFO loginfo - 服务开始
2024-03-20 14:50:02,677 [3] INFO loginfo - 开始
2024-03-20 14:50:02,700 [3] INFO loginfo - 连接成功
2024-03-20 14:50:02,701 [3] INFO loginfo - 连接失败
2024-03-20 14:50:05,292 [11] INFO loginfo - 进入方法
2024-03-20 14:50:05,293 [11] INFO loginfo - count0
2024-03-20 14:50:05,535 [11] INFO loginfo - 配电室低压msgJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}}
2024-03-20 14:50:05,733 [11] INFO loginfo - 配电室低压:DataService.api.get_data
2024-03-20 14:50:08,693 [11] INFO loginfo - 处理失败数据J{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}},原因:未将对象引用设置到对象的实例。
2024-03-20 14:50:14,736 [8] INFO loginfo - 进入方法
2024-03-20 14:50:14,736 [8] INFO loginfo - count0
2024-03-20 14:50:14,738 [8] INFO loginfo - 配电室低压msgJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}}
2024-03-20 14:50:14,738 [8] INFO loginfo - 配电室低压:DataService.api.get_data
------------------------------------------------
------------------------------------------------
------------------------------------------------
2024-03-20 14:51:52,283 [3] INFO loginfo - 服务开始
2024-03-20 14:51:52,305 [3] INFO loginfo - 开始
2024-03-20 14:51:52,322 [3] INFO loginfo - 连接成功
2024-03-20 14:51:52,322 [3] INFO loginfo - 连接失败
2024-03-20 14:51:57,076 [8] INFO loginfo - 进入方法
2024-03-20 14:51:57,076 [8] INFO loginfo - count0
2024-03-20 14:51:57,237 [8] INFO loginfo - 配电室低压msgJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}}
2024-03-20 14:51:57,375 [8] INFO loginfo - 配电室低压:DataService.api.get_data
------------------------------------------------
------------------------------------------------
------------------------------------------------
2024-03-20 14:54:47,018 [3] INFO loginfo - 服务开始
2024-03-20 14:54:47,046 [3] INFO loginfo - 开始
2024-03-20 14:54:47,071 [3] INFO loginfo - 连接成功
2024-03-20 14:54:47,071 [3] INFO loginfo - 连接失败

Binary file not shown.

Binary file not shown.

View File

@ -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>ysT40iU2igpjZx6kj9cCT/Lt6BsLUnPOcZvNsro9iuE=</dsig:DigestValue>
<dsig:DigestValue>bcXn55NFL8EJhw0A9ivpI+YS2VJCWWH+VGpQA160YR4=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

View File

@ -42,14 +42,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataService.dll" size="123904">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataService.dll" size="118272">
<assemblyIdentity name="DataService" 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>lQLMjFJzajZHSOUSCvVbfOucJWf30Tx0kbX6cpFzI6I=</dsig:DigestValue>
<dsig:DigestValue>XpswRERzQVlk45kN8e/ojbzD5/2lpQtcPSGdMv655N4=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
@ -138,14 +138,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="41952">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="42464">
<assemblyIdentity name="ServiceSecurity" 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>PjYy6ISYr4bq31n++DEc+IDHQiIXzrTgXBqwVLjbPCY=</dsig:DigestValue>
<dsig:DigestValue>vx0PPghT8a6/XULityhjI65QG+UBPR1c4+nbgpo4Pp0=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

View File

@ -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>ysT40iU2igpjZx6kj9cCT/Lt6BsLUnPOcZvNsro9iuE=</dsig:DigestValue>
<dsig:DigestValue>bcXn55NFL8EJhw0A9ivpI+YS2VJCWWH+VGpQA160YR4=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

View File

@ -42,14 +42,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataService.dll" size="123904">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataService.dll" size="118272">
<assemblyIdentity name="DataService" 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>lQLMjFJzajZHSOUSCvVbfOucJWf30Tx0kbX6cpFzI6I=</dsig:DigestValue>
<dsig:DigestValue>XpswRERzQVlk45kN8e/ojbzD5/2lpQtcPSGdMv655N4=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
@ -138,14 +138,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="41952">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="42464">
<assemblyIdentity name="ServiceSecurity" 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>PjYy6ISYr4bq31n++DEc+IDHQiIXzrTgXBqwVLjbPCY=</dsig:DigestValue>
<dsig:DigestValue>vx0PPghT8a6/XULityhjI65QG+UBPR1c4+nbgpo4Pp0=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>