Browse Source

查询条件优化

zhuhao 2 years ago
parent
commit
810c6489d7

+ 2 - 1
IMCS_CCS/Repository/TaskCallbackRepository.cs

@@ -45,8 +45,9 @@ namespace IMCS.CCS.Repository
         //查机器人动作列表
         public async Task<TaskCallback> GetRobotActionList(TaskCallback vo)
         {
+            DateTime currentTime = DateTime.Now.AddMinutes(-2);
             IQueryable<TaskCallback> list = _context.TaskCallback;
-            list.Where(x => DateTime.Now.Subtract(x.CreateTime).TotalMinutes <= 2);
+            list = list.Where(x => x.CreateTime >= currentTime);
             if (!string.IsNullOrEmpty(vo.IP))
             {
                 list = list.Where(x => x.IP == vo.IP);

+ 3 - 2
IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -2220,8 +2220,9 @@ namespace IMCS.CCS.Services
                 TaskCallback taskCallBack = await _taskCallbackService.GetRobotActionList(queryTaskCallback); 
                 
                  if(taskCallBack != null)
-                { 
-                    if((currentAction == ActionTypeEnum.MoveRobotPosition.ToString() && taskCallBack.OperateType != ActionTypeEnum.SendQualityCenter.ToString())
+                {
+                   
+                    if ((currentAction == ActionTypeEnum.MoveRobotPosition.ToString() && taskCallBack.OperateType != ActionTypeEnum.SendQualityCenter.ToString())
                         || (currentAction == ActionTypeEnum.GetQualityCenter.ToString() && taskCallBack.OperateType != ActionTypeEnum.MoveRobotPosition.ToString())
                         || (currentAction == ActionTypeEnum.SendQualityCenter.ToString() && taskCallBack.OperateType != ActionTypeEnum.GetQualityCenter.ToString()))
                     {