yanghongwei
/
lg_backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

voc

This commit is contained in:
yanghongwei 2024-08-19 23:53:36 +08:00
parent fa9f138d82
commit 32f9e8a1f5
5 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
langguanApi.xml
View File

@ -1820,6 +1820,11 @@
苯
</summary>
</member>
<member name="P:langguanApi.Model.HJ212.a25005_Cou">
<summary>
二 甲苯
</summary>
</member>
<member name="T:langguanApi.Model.InstrumentationDataFlag">
<summary>
检测仪器数据标记
@ -2926,7 +2931,7 @@
</summary>
<returns></returns>
</member>
<member name="M:langguanApi.Service.Hj212Service.GetWeekData(System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String})">
<member name="M:langguanApi.Service.Hj212Service.GetWeekData">
<summary>
一周之内的排放数据
</summary>

5
langguanApi/Model/HJ212.cs
View File

@ -160,7 +160,10 @@ namespace langguanApi.Model
/// 苯
/// </summary>
public double a25002_Cou { get; set; }
/// <summary>
///二 甲苯
/// </summary>
public double a25005_Cou { get; set; }
#endregion

5
langguanApi/Service/HJ212/NetSession.cs
View File

@ -51,9 +51,8 @@ namespace langguanApi.Service.HJ212
try
{
byte[] data = ReadBuffer.ReadLine();
Console.WriteLine($"原始数据:{data}----------");
Console.WriteLine($"原始数据HexString:{data.ToHexString()}--------------------");
//Console.WriteLine($"原始数据:{data}----------");
//Console.WriteLine($"原始数据HexString:{data.ToHexString()}--------------------");
//Console.WriteLine($"原始数据ASCII:{Encoding.ASCII.GetString(data)}-");
//Position position = ParsePosition(data);

52
langguanApi/Service/Hj212Service.cs
View File

@ -73,51 +73,45 @@ namespace langguanApi.Service
return new
{
today = new { voc, cems },
week = await GetWeekData(vocList, cemsList)
week = await GetWeekData()
};
}
/// <summary>
/// 一周之内的排放数据
/// </summary>
/// <returns></returns>
public async Task<object> GetWeekData(List<string> vocList, List<string> cemsList)
public async Task<object> GetWeekData()
{
// Expression<Func<Model.HJ212, bool>> exp = filter => filter.CreateDateTime >= DateTime.Now.AddDays(-7);
// CN = 2031是日数据
//Expression<Func<Model.HJ212, bool>> exp = filter => filter.CN == 2031 && filter.CreateDateTime >= DateTime.Now.AddDays(-7);
Expression<Func<Model.HJ212, bool>> exp = filter => filter.ST == 31 || filter.ST == 27 && filter.CN == 2031 && filter.CreateDateTime >= DateTime.Now.AddDays(-7);
////a21026_Cou,a21002_Cou,a34013_Cou
//var result = (await base.GetListWithExp(exp)).ToList().Select(s => new
//{
// //
//});
var filter = Builders<Model.HJ212>.Filter.In(s => s.deviceMN, vocList.Concat(cemsList))
& Builders<Model.HJ212>.Filter.Gte(s => s.CreateDateTime, DateTime.Now.AddDays(-3));
var result = await base.FindListyFilter(filter);
var voc = result.Where(s => vocList.Contains(s.deviceMN)).Select(s => new
var result = (await base.GetListWithExp(exp)).ToList();
//cems
var cems = result.Where(s => s.ST == 31).Select(s => new
{
s.a34001,
s.a21002_Cou,
s.a21026_Cou,
s.a34013_Cou,
s.a00000_Cou,
date = s.CreateDateTime.ToString("MM-dd")
}).GroupBy(s => s.date)
.Select(s => new
{
s.Key,
value = Math.Round(s.Sum(t => t.a34001))
}).GroupBy(g => g.date).Select(s => new {
s.Key,
value = Math.Round(s.Sum(t => t.a21002_Cou + t.a21026_Cou + t.a34013_Cou + t.a00000_Cou))
});
var cems = result.Where(s => cemsList.Contains(s.deviceMN)).Select(s => new
//voc
var voc = result.Where(s => s.ST == 27).Select(s => new
{
s.a34002,
s.a05002_Cou,
s.a24087_Cou,
s.a24088_Cou,
s.a25002_Cou,
s.a25005_Cou,
s.a00000_Cou,
date = s.CreateDateTime.ToString("MM-dd")
}).GroupBy(s => s.date)
.Select(s => new
{
}).GroupBy(g => g.date).Select(s => new {
s.Key,
value = Math.Round(s.Sum(t => t.a34002))
value = Math.Round(s.Sum(t => t.a05002_Cou + t.a24087_Cou + t.a24088_Cou + t.a25002_Cou+t.a25005_Cou+t.a00000_Cou))
});
return new { voc, cems };
}

4
langguanApi/Service/HomeService.cs
View File

@ -87,8 +87,10 @@ namespace langguanApi.Service
yesterday = 0.8,
lastWeek = 0.6
};
var today = await _hj212Service.GetTodayData();
Func<Task<object>> getTodayFunc = async () => await _hj212Service.GetTodayData();
var today = await _cacheManager.GetConvertVale(RedisKeylist.Today, getTodayFunc, 60 * 60 * 24 * 30);
today = await _cacheManager.GetConvertVale(RedisKeylist.Today, getTodayFunc, 60 * 60 * 24 * 30);
return new ApiResult
{
code = 0,