fix: 可视化大屏-》增加状态判断策略异常等级排未签 -》迟到 -》酒驾

guzijian
1 parent a00169ae
Showing 1 changed file with 25 additions and 12 deletions
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceImpl.java
@@ -50,8 +50,8 @@ public class BigViewServiceImpl implements BigViewService {
     private NowSchedulingCache cache;
     @Override
-    public Integer queryNumberByType(String type,String dateKey) {
-        Integer x = handleType(type,dateKey);
+    public Integer queryNumberByType(String type, String dateKey) {
+        Integer x = handleType(type, dateKey);
         if (x != null) return x;
         return 0;
     }
@@ -59,7 +59,7 @@ public class BigViewServiceImpl implements BigViewService {
     @Override
     public List<FleetInfoVo> queryFleetInfoByFleetName(String dateKey) {
         // 从缓存中读取数据，但是调度表中还好包含飞司售人员信息  需要过滤一下  非司售人员nbbm不会存在
-        String key = dateKey.replaceAll("-","");
+        String key = dateKey.replaceAll("-", "");
         Map<String, List<DriverScheduling>> map = cache.getCacheScheduling(key);
         Map<String, LineInfo> matchMap = transformMapByMacheList(map);
@@ -76,7 +76,7 @@ public class BigViewServiceImpl implements BigViewService {
     @Override
     public SignInfoVo querySignDetails(String date, String jobCode) {
         SignInfoVo vo = null;
-        Map<String, List<DriverScheduling>> map = cache.getCacheScheduling(date.replaceAll("-",""));
+        Map<String, List<DriverScheduling>> map = cache.getCacheScheduling(date.replaceAll("-", ""));
         List<DriverScheduling> list = map.get(jobCode);
         if (CollectionUtil.isNotEmpty(list)) {
             vo = new SignInfoVo();
@@ -100,7 +100,7 @@ public class BigViewServiceImpl implements BigViewService {
                 info.setResult(Objects.isNull(scheduling.getRemark()) ? "未签" : scheduling.getRemark());
                 vo.getSignInfos().add(info);
             }
-            vo.setLpName(StringUtils.join(lpNameMap.keySet(),"/"));
+            vo.setLpName(StringUtils.join(lpNameMap.keySet(), "/"));
         }
         return vo;
     }
@@ -235,19 +235,32 @@ 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();
-            // 第二次签到时间未到不记录状态
-            if (!Objects.isNull(driverInfoVo) && time - scheduling.getFcsjT() < 0) {
-                return;
+            if (!Objects.isNull(driverInfoVo)) {
+                // 第二次签到时间未到不记录状态
+                if (time - scheduling.getFcsjT() < 0) {
+                    return;
+                }
+                //   如有多异常覆盖策略 异常等级排 未签 -》 迟到 -》 酒驾
+                if (driverInfoVo.getSignStatus().compareTo(personInfoVo.getSignStatus()) < 0) {
+                    return;
+                }
             }
             matchMap.get(nbbm).setDriverInfoVo(personInfoVo);
         } else {
             LineInfo.PersonInfoVo saleInfoVo = matchMap.get(nbbm).getSaleInfoVo();
-            // 第二次签到时间未到不记录状态
-            if (!Objects.isNull(saleInfoVo) && time - scheduling.getFcsjT() < 0) {
-                return;
+            if (!Objects.isNull(saleInfoVo)) {
+                // 第二次签到时间未到不记录状态
+                if (time - scheduling.getFcsjT() < 0) {
+                    return;
+                }
+                //   如有多异常覆盖策略 异常等级排 未签 -》 迟到 -》 酒驾
+                if (saleInfoVo.getSignStatus().compareTo(personInfoVo.getSignStatus()) < 0) {
+                    return;
+                }
             }
             matchMap.get(nbbm).setSaleInfoVo(personInfoVo);
         }
@@ -281,7 +294,7 @@ public class BigViewServiceImpl implements BigViewService {
     }
     private Integer handleType(String type, String dateKey) {
-        String key = dateKey.replaceAll("-","");
+        String key = dateKey.replaceAll("-", "");
         Map<String, List<DriverScheduling>> map = cache.getCacheScheduling(key);
         Map<String, Object> typeMap = new HashMap<>(map.size());
         switch (type) {