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

Compare commits

base: yanghongwei:354492d6efa9a90fc3e8fc75d58ae5dd524c39bb
Branches Tags
yanghongwei:master
yanghongwei:master_sxs_new
...
compare: yanghongwei:3852e62f581f1f9f390bd26e72e70d908bcdbaea
Branches Tags
yanghongwei:master
yanghongwei:master_sxs_new

2 Commits
354492d6ef ... 3852e62f58

Author SHA1 Message Date
yanghongwei 3852e62f58 Merge branch 'master' of http://101.43.201.20:3000/yanghongwei/lg_backend 2024-08-27 21:42:28 +08:00
yanghongwei 7420acdbad 提交代码 2024-08-27 21:42:16 +08:00
4 changed files with 12 additions and 11 deletions
Show Stats Expand all files Collapse all files

5
langguanApi.xml
View File

@ -1755,11 +1755,6 @@
流量总量(mg/m3)
</summary>
</member>
<member name="P:langguanApi.Model.HJ212.ReportTime">
<summary>
设备记录时间
</summary>
</member>
<member name="P:langguanApi.Model.HJ212.a24087">
<summary>
总烃 是碳氢化合物（mg/m3）

6
langguanApi/Model/Dto/HJ212_2017.cs
View File

@ -62,7 +62,11 @@ namespace langguanApi.Model.Dto
for (int j = 0; j < d_6.Length; j++)
{
string[] d_7 = d_6[j].Split(new char[] { '=' });
CP.Add(d_7[0].Replace("-RTD", ""), d_7[1]);
//兼容设备厂家不规范的命名，会有重复的CP名称
if (!CP.ContainsKey(d_7[0].Replace("-RTD", "")))
{
CP.Add(d_7[0].Replace("-RTD", "").Replace("-COU", "_Cou"), d_7[1]);
}
}
}
CRC = data_0[2];

2
langguanApi/Service/HJ212SocketServer.cs
View File

@ -102,6 +102,8 @@ namespace langguanApi.Service
Console.WriteLine("解析成功: " + body);
var entity = JsonConvert.DeserializeObject<Model.HJ212>(body);
entity.deviceMN = hj.DATA_HEAD["MN"];
entity.ST = int.Parse(hj.DATA_HEAD["ST"]);
entity.CN = int.Parse(hj.DATA_HEAD["CN"]);
int deviceType = SetDeviceType(hj.DATA_HEAD["ST"]);
if (entity.a34001 > 0 && deviceType == 3)
{

6
langguanApi/Service/HomeService.cs
View File

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