diff --git a/langguanApi.xml b/langguanApi.xml index afba94c..8c9530f 100644 --- a/langguanApi.xml +++ b/langguanApi.xml @@ -1755,11 +1755,6 @@ 流量总量(mg/m3) - - - 设备记录时间 - - 总烃 是碳氢化合物(mg/m3) diff --git a/langguanApi/Model/Dto/HJ212_2017.cs b/langguanApi/Model/Dto/HJ212_2017.cs index 59a1633..4783bd0 100644 --- a/langguanApi/Model/Dto/HJ212_2017.cs +++ b/langguanApi/Model/Dto/HJ212_2017.cs @@ -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]; diff --git a/langguanApi/Service/HJ212SocketServer.cs b/langguanApi/Service/HJ212SocketServer.cs index 4d07fa6..9b2c41d 100644 --- a/langguanApi/Service/HJ212SocketServer.cs +++ b/langguanApi/Service/HJ212SocketServer.cs @@ -102,6 +102,8 @@ namespace langguanApi.Service Console.WriteLine("解析成功: " + body); var entity = JsonConvert.DeserializeObject(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) { diff --git a/langguanApi/Service/HomeService.cs b/langguanApi/Service/HomeService.cs index 77099d7..3b726b0 100644 --- a/langguanApi/Service/HomeService.cs +++ b/langguanApi/Service/HomeService.cs @@ -72,7 +72,7 @@ namespace langguanApi.Service // 获取远程接口污染物排放率 var rateResp = await _httpProxy.Get>>(null, _configuration.GetValue("Apis:RateUrl")); var rate = rateResp.data.ToList().Take(6); - rate.ForEach(x => x.val = Math.Round( x.val / 100,2)); + rate.ForEach(x => x.val = Math.Round(x.val / 100, 2)); var AlermResp = await _httpProxy.Get>(null, _configuration.GetValue("Apis:AlertUrl")); if (AlermResp.code == 0 && AlermResp.data.List.Any()) { @@ -87,10 +87,10 @@ namespace langguanApi.Service yesterday = 0.8, lastWeek = 0.6 }; - var today = await _hj212Service.GetTodayData(); - //Func> getTodayFunc = async () => await _hj212Service.GetTodayData(); - // today = await _cacheManager.GetConvertVale(RedisKeylist.Today, getTodayFunc, 60 * 60 * 24 * 30); - + // var today = await _hj212Service.GetTodayData(); + Func> getTodayFunc = async () => await _hj212Service.GetTodayData(); + var today = await _cacheManager.GetConvertVale(RedisKeylist.Today, getTodayFunc, 60 * 60 * 24 * 1); + return new ApiResult { code = 0,