feat: 新增车队状态

guzijian
1 parent 77c4099a
Showing 3 changed files with 68 additions and 15 deletions
Bsth-admin/src/main/java/com/ruoyi/pojo/vo/bigViewVo/FleetInfoVo.java
Bsth-admin/src/main/java/com/ruoyi/pojo/vo/bigViewVo/FleetState.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceImpl.java
@@ -19,7 +19,8 @@ public class FleetInfoVo {
     private String title;
     @ApiModelProperty("车队信息")
     private List<FleetInfo> fleetInfos;
-
+    @ApiModelProperty("车队状态")
+    private List<FleetState> fleetStates;
     @Data
     public static class FleetInfo{
         private String lineName;
+package com.ruoyi.pojo.vo.bigViewVo;
+
+import lombok.Data;
+
+/**
+ *
+ * @author 20412
+ */
+@Data
+public class FleetState {
+    private String lineName;
+    private Integer state;
+}
@@ -8,10 +8,7 @@ import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.in.service.ISignInService;
 import com.ruoyi.pojo.response.SignInResponseVo;
-import com.ruoyi.pojo.vo.bigViewVo.FleetInfoVo;
-import com.ruoyi.pojo.vo.bigViewVo.LineInfo;
-import com.ruoyi.pojo.vo.bigViewVo.SignInfoVo;
-import com.ruoyi.pojo.vo.bigViewVo.SignNumberVo;
+import com.ruoyi.pojo.vo.bigViewVo.*;
 import com.ruoyi.service.BigViewService;
 import com.ruoyi.service.ThreadJobService;
 import org.slf4j.Logger;
@@ -72,12 +69,48 @@ public class BigViewServiceImpl implements BigViewService {
         // 进一步处理人员信息
         List<FleetInfoVo> fleetInfoVos = handleFleetWithLinePersonInfo(matchMap, mapVo);
         // 特殊处理 处理进博会线路信息
-        if (LocalDate.now().toString().compareTo("2023-11-12") < 0){
+        if (LocalDate.now().toString().compareTo("2023-11-12") < 0) {
             specialTreatment(fleetInfoVos);
         }
+        // 处理车队线路状态
+        handleFleetStates(fleetInfoVos);
         return fleetInfoVos;
     }
+    private void handleFleetStates(List<FleetInfoVo> fleetInfoVos) {
+        // 车队 -》 线路 -》 车辆自编号 -》 人员状态 层级遍历
+        for (FleetInfoVo fleetInfoVo : fleetInfoVos) {
+            List<FleetState> fleetStates = new ArrayList<>(fleetInfoVo.getFleetInfos().size());
+            for (FleetInfoVo.FleetInfo fleetInfo : fleetInfoVo.getFleetInfos()) {
+                int state = 0;
+                for (LineInfo lineInfo : fleetInfo.getLineInfos()) {
+                    LineInfo.PersonInfoVo driverInfoVo = lineInfo.getDriverInfoVo();
+                    LineInfo.PersonInfoVo saleInfoVo = lineInfo.getSaleInfoVo();
+                    Integer driverStatus = handleStateByPerson(driverInfoVo);
+                    Integer saleStatus = handleStateByPerson(saleInfoVo);
+                    int maxState = Math.max(driverStatus, saleStatus);
+                    state = Math.max(maxState, state);
+                }
+                FleetState fleetState = new FleetState();
+                fleetState.setState(state);
+                fleetState.setLineName(fleetInfo.getLineName());
+                fleetStates.add(fleetState);
+            }
+            fleetInfoVo.setFleetStates(fleetStates);
+        }
+        // 排序
+        for (FleetInfoVo fleetInfoVo : fleetInfoVos) {
+            fleetInfoVo.getFleetStates().sort(Comparator.comparing(FleetState::getState));
+        }
+    }
+
+    private Integer handleStateByPerson(LineInfo.PersonInfoVo personInfoVo) {
+        if (Objects.isNull(personInfoVo)) {
+            return 0;
+        }
+        return personInfoVo.getSignStatus();
+    }
+
     private void specialTreatment(List<FleetInfoVo> fleetInfoVos) {
         List<FleetInfoVo.FleetInfo> jinbo = new ArrayList<>();
         // 把进博会线路单独拎出来 进博短驳
@@ -85,6 +118,13 @@ public class BigViewServiceImpl implements BigViewService {
             fleetInfoVo.setFleetInfos(
                     fleetInfoVo.getFleetInfos().stream().filter(item -> {
                         if (item.getLineName().startsWith("进博短驳")) {
+                            // 这个循环是因为不同车队的人在拼接到进博会时出现相同线路两条记录问题
+                            for (FleetInfoVo.FleetInfo fleetInfo : jinbo) {
+                                if (fleetInfo.getLineName().equals(item.getLineName())){
+                                    fleetInfo.getLineInfos().addAll(item.getLineInfos());
+                                    return false;
+                                }
+                            }
                             jinbo.add(item);
                             return false;
                         }
@@ -93,29 +133,29 @@ public class BigViewServiceImpl implements BigViewService {
             );
         }
         // 究极特殊情况遇到了调度接口存在的人员 但是 人事接口不存在的人员 会导致fleetName 为空
-        // 在青浦的车队就是一个特殊的部门只是以车队开头命名 如果存在。。
+        // 在青浦的车队就是一个特殊的部门只是以车队开头命名 如果不存在。。说明调度出现了问题直接删除不存在的车队信息  该方法可以删除deleteErrorData
         deleteErrorData(fleetInfoVos);
-        alertJinboList(jinbo,fleetInfoVos);
+        alertJinboList(jinbo, fleetInfoVos);
     }
     private void alertJinboList(List<FleetInfoVo.FleetInfo> jinbo, List<FleetInfoVo> fleetInfoVos) {
-        if (CollectionUtil.isEmpty(fleetInfoVos)){
+        if (CollectionUtil.isEmpty(fleetInfoVos)) {
             return;
         }
         FleetInfoVo fleetInfoVo = new FleetInfoVo();
         fleetInfoVo.setTitle("进博会");
         fleetInfoVo.setFleetInfos(jinbo);
-        fleetInfoVos.add(0,fleetInfoVo);
+        fleetInfoVos.add(0, 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())){
+            if (Objects.isNull(fleetInfoVos.get(i).getTitle())) {
                 t = i;
             }
         }
-        if (t!=null){
+        if (t != null) {
             fleetInfoVos.remove(t.intValue());
         }
     }
@@ -167,10 +207,10 @@ public class BigViewServiceImpl implements BigViewService {
             vo.getFleetInfos().sort(new Comparator<FleetInfoVo.FleetInfo>() {
                 @Override
                 public int compare(FleetInfoVo.FleetInfo o1, FleetInfoVo.FleetInfo o2) {
-                    if (o1.getLineInfos().size() > o2.getLineInfos().size()){
+                    if (o1.getLineInfos().size() > o2.getLineInfos().size()) {
                         return -1;
                     }
-                    if (o1.getLineInfos().size() < o2.getLineInfos().size()){
+                    if (o1.getLineInfos().size() < o2.getLineInfos().size()) {
                         return 1;
                     }
                     return 0;
@@ -296,7 +336,6 @@ public class BigViewServiceImpl implements BigViewService {
      * @param driverScheduling
      */
     private void handleMoreStatus(Map<String, LineInfo> matchMap, DriverScheduling scheduling, String nbbm, LineInfo.PersonInfoVo personInfoVo, DriverScheduling driverScheduling) {
-        // TODO 判断多异常
         long time = System.currentTimeMillis();
         if (DRIVER_STRING.equals(scheduling.getPosts())) {
             LineInfo.PersonInfoVo driverInfoVo = matchMap.get(nbbm).getDriverInfoVo();