feat: 设定时间界限

guzijian
1 parent d9f8d937
Showing 1 changed file with 4 additions and 3 deletions
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
@@ -61,7 +61,6 @@ import javax.servlet.http.HttpServletResponse;
 import static com.ruoyi.common.ApiProperties.PERSONNEL_API_KEY;
 import static com.ruoyi.common.ConstDriverProperties.*;
 import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
-import static com.ruoyi.common.ErrorTypeProperties.WORK_DAY_ERROR;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
  
 /**
@@ -544,7 +543,7 @@ public class DriverServiceImpl implements IDriverService {
             nowTimerList.add(timeMap.get(index));
         }
         // 处理当前时间段未签人员
-        nowTimerList = handleTimeOutPerson(nowTimerList);
+        nowTimerList = handleTimeOutPerson(nowTimerList,now);
         sendNotice(nowTimerList);
     }
  
@@ -574,10 +573,12 @@ public class DriverServiceImpl implements IDriverService {
         noticeService.saveBatch(noticeList);
     }
  
-    private List<DriverSignInRecommendation> handleTimeOutPerson(List<DriverSignInRecommendation> nowTimerList) {
+    private List<DriverSignInRecommendation> handleTimeOutPerson(List<DriverSignInRecommendation> nowTimerList, Long now) {
         return nowTimerList.stream()
                 // 只需要签到
                 .filter(item-> BC_TYPE_OUT.equals(item.getBcType()) && checkPosts(item))
+                // 给出范围界限 不能未到具体时间的也发送通知
+                .filter(item -> now - item.getTimestamps() >= 0)
                 // 筛选应签未签人员
                 .filter(item -> Objects.isNull(item.getSignTime()) || item.getTimestamps() - item.getSignTime() < 0)
                 .collect(Collectors.toList());