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

langguanApi.xml

@@ -195,6 +195,12 @@
             客户端push消息
             </summary>
         </member>
+        <member name="M:langguanApi.Common.WebSocket.PushService.#ctor(Microsoft.AspNetCore.SignalR.IHubContext{langguanApi.Common.WebSocket.SocketHub})">
+            <summary>
+            构造函数
+            </summary>
+            <param name="hubContext"></param>
+        </member>
         <member name="M:langguanApi.Common.WebSocket.PushService.SendMessageToAll(System.Object)">
             <summary>
             全部消息
@@ -3041,7 +3047,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:langguanApi.Service.GpsService.Send(System.String)">
+        <member name="M:langguanApi.Service.GpsService.HandleClientAsync(System.Net.Sockets.TcpClient)">
             <summary>
             发送GPS数据
             </summary>

langguanApi/Program.cs

@@ -105,11 +105,11 @@ app.UseCors("CorsPolicy");
 
  
 
-if (!await GetNowTimeAsync())
-{
-    Console.WriteLine("当前时间不在可运行时间范围内，请联系供应商。");
-    Environment.Exit(0);
-}
+//if (!await GetNowTimeAsync())
+//{
+//    Console.WriteLine("当前时间不在可运行时间范围内，请联系供应商。");
+//    Environment.Exit(0);
+//}
 app.Run();
 
 

langguanApi/Service/Hj212Service.cs

@@ -61,9 +61,20 @@ namespace langguanApi.Service
         /// <returns></returns>
         public async Task<object> GetTodayData()
         {
-            // 只取当天的日数据
-            Expression<Func<Model.HJ212, bool>> exp = filter => filter.ST == 31 || filter.ST == 27 && filter.CN == 2031 && filter.CreateDateTime >= DateTime.Now.Date;
-            var result = (await base.GetListWithExp(exp)).ToList();
+
+            //   Expression<Func<Model.HJ212, bool>> exp = filter => filter.CreateDateTime >= DateTime.Now.AddDays(-7);
+            //   CN = 2031是日数据
+            var dateFilter = BuildFilter(DateTime.Now.Date);
+            // 构建查询
+            var conditionFilter = Builders<Model.HJ212>.Filter.Or(
+        Builders<Model.HJ212>.Filter.Eq(x => x.ST, 31),
+        Builders<Model.HJ212>.Filter.And(
+            Builders<Model.HJ212>.Filter.Eq(x => x.ST, 27),
+            Builders<Model.HJ212>.Filter.Eq(x => x.CN, 2031)
+        )
+    );
+            var finalFilter = Builders<Model.HJ212>.Filter.And(dateFilter, conditionFilter);
+            var result = await base.FindListyFilter(finalFilter);
             // 过滤掉voc设备
             var voc = result.Where(s => s.ST == 31).ToList().Select(s => s.a05002_Cou +
                 s.a24087_Cou +
@@ -90,10 +101,20 @@ namespace langguanApi.Service
         {
             //   Expression<Func<Model.HJ212, bool>> exp = filter => filter.CreateDateTime >= DateTime.Now.AddDays(-7);
             //   CN = 2031是日数据
-            Expression<Func<Model.HJ212, bool>> exp = filter => filter.ST == 31 || filter.ST == 27 && filter.CN == 2031 && filter.CreateDateTime >= DateTime.Now.AddDays(-7);
+            var dateFilter = Builders<Model.HJ212>.Filter.Gte(x => x.CreateDateTime, DateTime.Now.AddDays(-7));
+
+            // 构建查询
+            var conditionFilter = Builders<Model.HJ212>.Filter.Or(
+        Builders<Model.HJ212>.Filter.Eq(x => x.ST, 31),
+        Builders<Model.HJ212>.Filter.And(
+            Builders<Model.HJ212>.Filter.Eq(x => x.ST, 27),
+            Builders<Model.HJ212>.Filter.Eq(x => x.CN, 2031)
+        )
+    );
+            // 组合过滤器（先按时间，再按其他条件）
+            var finalFilter = Builders<Model.HJ212>.Filter.And(dateFilter, conditionFilter);
+            var result = await base.FindListyFilter(finalFilter);
             ////a21026_Cou,a21002_Cou,a34013_Cou
-            var result = (await base.GetListWithExp(exp)).ToList();
-            //cems
             var cems = result.Where(s => s.ST == 31).Select(s => new
             {
                 s.a21002_Cou,
@@ -124,6 +145,10 @@ namespace langguanApi.Service
             });
             return new { voc, cems };
         }
+        private FilterDefinition<Model.HJ212> BuildFilter(DateTime end)
+        {
+            return Builders<Model.HJ212>.Filter.Gte(x => x.CreateDateTime, end);
+        }
         /// <summary>
         /// 新加数据
         /// </summary>

langguanApi/Service/HomeService.cs

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