feat: 增加特殊处理

guzijian
1 parent a96d30ea
Showing 2 changed files with 44 additions and 16 deletions
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceImpl.java
@@ -48,7 +48,6 @@ import java.io.*;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
  
 import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_IN;
@@ -170,7 +169,7 @@ public class ThreadJobService {
             exception.setRemark(signIn.getRemark());
             exception.setCreateTime(signIn.getCreateTime());
             exception.setFleetName(driver.getFleetName());
-            if (CollectionUtil.isNotEmpty(dto)) {
+            if (CollectionUtil.isNotEmpty(dto) && dto.size() > 0) {
                 DriverScheduling scheduling = dto.get(globalIndex.getIndex());
                 exception.setNbbm(scheduling.getNbbm());
                 exception.setLineName(scheduling.getLineName());
@@ -466,19 +465,19 @@ public class ThreadJobService {
         return bcList;
     }
  
-    private DriverScheduling getDriverSchedulingTest(String startTime, String endTime,String bcType) {
+    private DriverScheduling getDriverSchedulingTest(String startTime, String endTime, String bcType) {
         DriverScheduling scheduling = new DriverScheduling();
-        	scheduling.setJobCode("700001");
-        	scheduling.setName("测试");
-        	scheduling.setPosts("测试");
-        	scheduling.setScheduleDate(new Date());
-        	scheduling.setLineName("");
-        	scheduling.setLpName("");
-        	scheduling.setNbbm("");
-        	scheduling.setFcsjT(ConstDateUtil.parseDate(startTime).getTime());
-        	scheduling.setZdsjT(ConstDateUtil.parseDate(endTime).getTime());
-        	scheduling.setFleetName("");
-        	scheduling.setBcType(bcType);
+        scheduling.setJobCode("700001");
+        scheduling.setName("测试");
+        scheduling.setPosts("测试");
+        scheduling.setScheduleDate(new Date());
+        scheduling.setLineName("");
+        scheduling.setLpName("");
+        scheduling.setNbbm("");
+        scheduling.setFcsjT(ConstDateUtil.parseDate(startTime).getTime());
+        scheduling.setZdsjT(ConstDateUtil.parseDate(endTime).getTime());
+        scheduling.setFleetName("");
+        scheduling.setBcType(bcType);
         return scheduling;
     }
  
@@ -516,6 +515,14 @@ public class ThreadJobService {
                 if (nowScheduling.get(0).getLineName().equals("松青线") && checkLpName(nowScheduling.get(0))) {
                     updateScheduling(nowScheduling);
                 }
+                // 处理青浦20路 2号路牌 签到时间调整为07:20  | 5号路牌 签到时间调整为07:05
+                if (nowScheduling.get(0).getLineName().equals("青浦20路")) {
+                    updateQinpu2With5(nowScheduling);
+                }
+                // 处理青蒸线区间 区间删除注意特殊情况放到最后可能没有全部都是区间倒是nowScheduling 为0 然后get报错
+                if (nowScheduling.get(0).getLineName().startsWith("青蒸线")) {
+                    nowScheduling = handleQinZhengLine(nowScheduling);
+                }
                 bcList.addAll(nowScheduling);
             } else {
                 // 处理无进出场
@@ -525,6 +532,27 @@ public class ThreadJobService {
         return bcList;
     }
  
+    private void updateQinpu2With5(List<DriverScheduling> nowScheduling) {
+        if ("2".equals(nowScheduling.get(0).getLpName())) {
+            for (DriverScheduling scheduling : nowScheduling) {
+                if (BC_TYPE_OUT.equals(scheduling.getBcType())) {
+                    scheduling.setFcsjT(ConstDateUtil.dateAddition(ConstDateUtil.formatDate("yyyy-MM-dd", new Date(nowScheduling.get(0).getFcsjT())), "07:20:00").getTime());
+                }
+            }
+        }
+        if ("5".equals(nowScheduling.get(0).getLpName())) {
+            for (DriverScheduling scheduling : nowScheduling) {
+                if (BC_TYPE_OUT.equals(scheduling.getBcType())) {
+                    scheduling.setFcsjT(ConstDateUtil.dateAddition(ConstDateUtil.formatDate("yyyy-MM-dd", new Date(nowScheduling.get(0).getFcsjT())), "07:05:00").getTime());
+                }
+            }
+        }
+    }
+
+    private List<DriverScheduling> handleQinZhengLine(List<DriverScheduling> nowScheduling) {
+        return nowScheduling.stream().filter(item -> !item.getLineName().contains("区间")).collect(Collectors.toList());
+    }
+
     private void updateScheduling(List<DriverScheduling> nowScheduling) {
         switch (nowScheduling.get(0).getLpName()) {
             case "松1":
@@ -345,7 +345,7 @@ public class BigViewServiceImpl implements BigViewService {
                     return;
                 }
                 //   如有多异常覆盖策略 异常等级排 未签 -》 迟到 -》 酒驾
-                if (driverInfoVo.getSignStatus().compareTo(personInfoVo.getSignStatus()) < 0) {
+                if (driverInfoVo.getSignStatus().compareTo(personInfoVo.getSignStatus()) > 0) {
                     return;
                 }
             }
@@ -358,7 +358,7 @@ public class BigViewServiceImpl implements BigViewService {
                     return;
                 }
                 //   如有多异常覆盖策略 异常等级排 未签 -》 迟到 -》 酒驾
-                if (saleInfoVo.getSignStatus().compareTo(personInfoVo.getSignStatus()) < 0) {
+                if (saleInfoVo.getSignStatus().compareTo(personInfoVo.getSignStatus()) > 0) {
                     return;
                 }
             }