fix: 特殊处理

guzijian
1 parent 36ef2a86
Showing 2 changed files with 50 additions and 9 deletions
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceImpl.java
@@ -216,10 +216,8 @@ public class DriverServiceImpl implements IDriverService {
         driver.setUpdateTime(new Date());
         // 修改排班表scheduling  以及缓存信息
         List<DriverScheduling> driverSchedulings = cache.getCacheScheduling(ConstDateUtil.getStringNowLocalDate("-")).get(driver.getJobCode());
+        // 只改变车队信息 其他信息由调度接口 和 人事系统决定  本来是不修改的但是人事数据有问题
         for (DriverScheduling scheduling : driverSchedulings) {
-            if (StringUtil.isNotEmpty(driver.getPosts())){
-                scheduling.setPosts(driver.getPosts());
-            }
             if (StringUtil.isNotEmpty(driver.getFleetName())){
                 scheduling.setFleetName(driver.getFleetName());
             }
@@ -70,9 +70,53 @@ public class BigViewServiceImpl implements BigViewService {
         handleFleetWithLine(map, mapVo);
         // 进一步处理人员信息
         List<FleetInfoVo> fleetInfoVos = handleFleetWithLinePersonInfo(matchMap, mapVo);
+        // 特殊处理 处理进博会线路信息
+        specialTreatment(fleetInfoVos);
         return fleetInfoVos;
     }
+    private void specialTreatment(List<FleetInfoVo> fleetInfoVos) {
+        List<FleetInfoVo.FleetInfo> jinbo = new ArrayList<>();
+        // 把进博会线路单独拎出来 进博短驳
+        for (FleetInfoVo fleetInfoVo : fleetInfoVos) {
+            fleetInfoVo.setFleetInfos(
+                    fleetInfoVo.getFleetInfos().stream().filter(item -> {
+                        if (item.getLineName().startsWith("进博短驳")) {
+                            jinbo.add(item);
+                            return false;
+                        }
+                        return true;
+                    }).collect(Collectors.toList())
+            );
+        }
+        // 究极特殊情况遇到了调度接口存在的人员 但是 人事接口不存在的人员 会导致fleetName 为空
+        // 在青浦的车队就是一个特殊的部门只是以车队开头命名 如果存在。。
+        deleteErrorData(fleetInfoVos);
+        alertJinboList(jinbo,fleetInfoVos);
+    }
+
+    private void alertJinboList(List<FleetInfoVo.FleetInfo> jinbo, List<FleetInfoVo> fleetInfoVos) {
+        if (CollectionUtil.isEmpty(fleetInfoVos)){
+            return;
+        }
+        FleetInfoVo fleetInfoVo = new FleetInfoVo();
+        fleetInfoVo.setTitle("进博会");
+        fleetInfoVo.setFleetInfos(jinbo);
+        fleetInfoVos.add(fleetInfoVo);
+    }
+
+    private void deleteErrorData(List<FleetInfoVo> fleetInfoVos) {
+        Integer t = null;
+        for (int i = 0; i < fleetInfoVos.size(); i++) {
+            if (Objects.isNull(fleetInfoVos.get(i).getTitle())){
+                t = i;
+            }
+        }
+        if (t!=null){
+            fleetInfoVos.remove(t.intValue());
+        }
+    }
+
     @Override
     public SignInfoVo querySignDetails(String date, String jobCode) {
         SignInfoVo vo = null;
@@ -115,7 +159,6 @@ public class BigViewServiceImpl implements BigViewService {
             vo.setFleetInfos(handleLineInfos(value, map));
             vos.add(vo);
         }
-
         return vos;
     }
@@ -322,7 +365,7 @@ public class BigViewServiceImpl implements BigViewService {
                 vo.setNowNumber(typeMap.size());
                 return vo;
             case "sale":
-                Map<String,Object> saleAllMap = new HashMap<>();
+                Map<String, Object> saleAllMap = new HashMap<>();
                 for (Map.Entry<String, List<DriverScheduling>> entry : map.entrySet()) {
                     for (DriverScheduling scheduling : entry.getValue()) {
                         if (SALE_STRING.equals(scheduling.getPosts()) && BC_TYPE_OUT.equals(scheduling.getBcType()) && !Objects.isNull(scheduling.getNbbm())) {
@@ -338,11 +381,11 @@ public class BigViewServiceImpl implements BigViewService {
                 vo.setAllNumber(saleAllMap.size());
                 return vo;
             case "driver":
-                Map<String,Object> driverAllMap = new HashMap<>();
+                Map<String, Object> driverAllMap = new HashMap<>();
                 for (Map.Entry<String, List<DriverScheduling>> entry : map.entrySet()) {
                     for (DriverScheduling scheduling : entry.getValue()) {
                         if (DRIVER_STRING.equals(scheduling.getPosts()) && BC_TYPE_OUT.equals(scheduling.getBcType()) && !Objects.isNull(scheduling.getNbbm())) {
-                            if (!Objects.isNull(scheduling.getSignInId())){
+                            if (!Objects.isNull(scheduling.getSignInId())) {
                                 typeMap.put(scheduling.getJobCode() + scheduling.getBcType(), "");
                             }
                             driverAllMap.put(scheduling.getJobCode() + scheduling.getBcType(), "");
@@ -354,11 +397,11 @@ public class BigViewServiceImpl implements BigViewService {
                 vo.setAllNumber(driverAllMap.size());
                 return vo;
             case "auxiliary":
-                Map<String,Object> auxiliaryAllMap = new HashMap<>();
+                Map<String, Object> auxiliaryAllMap = new HashMap<>();
                 for (Map.Entry<String, List<DriverScheduling>> entry : map.entrySet()) {
                     for (DriverScheduling scheduling : entry.getValue()) {
                         if (Objects.isNull(scheduling.getNbbm()) && BC_TYPE_OUT.equals(scheduling.getBcType())) {
-                            if ( !Objects.isNull(scheduling.getSignInId())){
+                            if (!Objects.isNull(scheduling.getSignInId())) {
                                 typeMap.put(scheduling.getJobCode() + scheduling.getBcType(), "");
                             }
                             auxiliaryAllMap.put(scheduling.getJobCode() + scheduling.getBcType(), "");