Merge branch 'master' of http://101.43.201.20:3000/yanghongwei/lg_backend

langguanApi.xml

@@ -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）

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];

langguanApi/Service/HJ212SocketServer.cs

@@ -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)
                 {

langguanApi/Service/HomeService.cs

@@ -72,7 +72,7 @@ namespace langguanApi.Service
             // 获取远程接口污染物排放率
             var rateResp = await _httpProxy.Get<RespModel<List<Rate>>>(null, _configuration.GetValue<string>("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<RespModel<alarmList>>(null, _configuration.GetValue<string>("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();
+            //    var today = await _hj212Service.GetTodayData();
-            //Func<Task<object>> getTodayFunc = async () => 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 _cacheManager.GetConvertVale(RedisKeylist.Today, getTodayFunc, 60 * 60 * 24 * 1);
-        
+
             return new ApiResult
             {
                 code = 0,