feat: 正对特殊线路设置打卡时间

guzijian
1 parent 60715fd8
Showing 6 changed files with 65 additions and 26 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/DriverSignRecommendation.java → ruoyi-admin/src/main/java/com/ruoyi/pojo/DriverSignInRecommendation.java
ruoyi-admin/src/main/java/com/ruoyi/service/SchedulingService.java
ruoyi-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
@@ -24,7 +24,7 @@ import com.ruoyi.common.utils.file.MimeTypeUtils;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.job.DriverJob;
-import com.ruoyi.pojo.DriverSignRecommendation;
+import com.ruoyi.pojo.DriverSignInRecommendation;
 import com.ruoyi.domain.EquipmentDriverExpand;
 import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.pojo.request.DriverRequestVo;
@@ -57,7 +57,6 @@ 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.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
-import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW;
 /**
  * 驾驶员信息Service业务层处理
@@ -130,10 +129,10 @@ public class DriverServiceImpl implements IDriverService {
         return drivers;
     }
-    private DriverSignRecommendation checkTime(List<DriverScheduling> dto, Long now) {
-        Map<Integer, DriverSignRecommendation> timeMap = new HashMap<>();
+    private DriverSignInRecommendation checkTime(List<DriverScheduling> dto, Long now) {
+        Map<Integer, DriverSignInRecommendation> timeMap = new HashMap<>();
         for (int i = 0; i < dto.size(); i++) {
-            timeMap.put(i, new DriverSignRecommendation(dto.get(i), i));
+            timeMap.put(i, new DriverSignInRecommendation(dto.get(i), i));
         }
         long minDiff = Long.MAX_VALUE;
         Integer index = 0;
@@ -358,7 +357,7 @@ public class DriverServiceImpl implements IDriverService {
         DriverResponseVo vo = null;
         // 给出计划操作
         if (!CollectionUtil.isEmpty(dto)) {
-            DriverSignRecommendation recommendation = checkTime(dto, now);
+            DriverSignInRecommendation recommendation = checkTime(dto, now);
             if (BC_TYPE_OUT.equals(recommendation.getBcType())) {
                 // 售票员无需酒精测试
                 if (recommendation.getPosts().equals(PERSONNEL_POSTS_DRIVER))
@@ -27,7 +27,7 @@ import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.errorScheduling.service.IErrorJobcodeService;
-import com.ruoyi.pojo.DriverSignRecommendation;
+import com.ruoyi.pojo.DriverSignInRecommendation;
 import com.ruoyi.pojo.GlobalIndex;
 import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.pojo.response.SignInResponseVo;
@@ -427,7 +427,7 @@ public class SignInServiceImpl implements ISignInService {
         if (Objects.isNull(driver)) {
             return true;
         }
-        // TODO 排班校验 和签到超时校验 非司售未作
+        //  排班校验 和签到超时校验
         result = checkWorkDay(now, dto, globalIndex, signIn, driver.getPosts());
         // 酒精测试校验 确定 且员工工种是驾驶员
@@ -518,7 +518,7 @@ public class SignInServiceImpl implements ISignInService {
     private boolean driverCheckTimeOut(GlobalIndex globalIndex, SignIn signIn, List<DriverScheduling> dto, long now) {
         try {
             Boolean result = true;
-            DriverSignRecommendation currentScheduling = schedulingService.computedTheCurrentClosestTimestamp(dto, now, 0);
+            DriverSignInRecommendation currentScheduling = schedulingService.computedTheCurrentClosestTimestamp(dto, now, 0);
             LocalDateTime endTime = ConstDateUtil.getLocalDateTimeByLongTime(currentScheduling.getTimestamps());
             LocalDateTime nowTime = ConstDateUtil.getLocalDateTimeByLongTime(now);
             long nowBetween = ChronoUnit.MINUTES.between(endTime, nowTime);
@@ -530,7 +530,7 @@ public class SignInServiceImpl implements ISignInService {
             if (!(Math.abs(nowBetween) <= 60)) {
                 // 签到一个逻辑 当前无记录
                 if (currentScheduling.getBcType().equals(BC_TYPE_OUT) && Objects.isNull(currentScheduling.getSignInId())) {
-                    DriverSignRecommendation lastClosestTimestamp = schedulingService.computedTheCurrentClosestTimestamp(dto, now, -1);
+                    DriverSignInRecommendation lastClosestTimestamp = schedulingService.computedTheCurrentClosestTimestamp(dto, now, -1);
                     // 上一次无记|签到,type:签退  当前时间小于最近签到时间 -> 超时签退
                     if (nowBetween < -60L && Objects.isNull(lastClosestTimestamp.getSignInId()) && signIn.getType().equals(SIGN_OUT) && lastClosestTimestamp.getBcType().equals(BC_TYPE_IN)) {
                         signIn.setRemark(SIGN_OUT_TIMEOUT);
@@ -552,7 +552,7 @@ public class SignInServiceImpl implements ISignInService {
                 }
                 // 签退一个逻辑 当前无记录
                 if (currentScheduling.getBcType().equals(BC_TYPE_IN) && Objects.isNull(currentScheduling.getSignInId())) {
-                    DriverSignRecommendation lastClosestTimestamp = schedulingService.computedTheCurrentClosestTimestamp(dto, now, -1);
+                    DriverSignInRecommendation lastClosestTimestamp = schedulingService.computedTheCurrentClosestTimestamp(dto, now, -1);
                     // 上一次无记|签退,type:签到  当前时间小于最近签退时间 -> 签到异常
                     if (nowBetween < -60L && Objects.isNull(lastClosestTimestamp.getSignInId()) && signIn.getType().equals(SIGN_IN)) {
                         signIn.setRemark(SIGN_IN_TIMEOUT);
@@ -583,7 +583,7 @@ public class SignInServiceImpl implements ISignInService {
     }
     private Boolean handlerExceptionRecord(List<DriverScheduling> dto, long now, GlobalIndex globalIndex, SignIn signIn) {
-        DriverSignRecommendation currentScheduling = schedulingService.computedTheCurrentClosestTimestamp(dto, now, 0);
+        DriverSignInRecommendation currentScheduling = schedulingService.computedTheCurrentClosestTimestamp(dto, now, 0);
         LocalDateTime endTime = ConstDateUtil.getLocalDateTimeByLongTime(currentScheduling.getTimestamps());
         LocalDateTime nowTime = ConstDateUtil.getLocalDateTimeByLongTime(now);
         long nowBetween = ChronoUnit.MINUTES.between(endTime, nowTime);
@@ -39,6 +39,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
@@ -333,8 +334,8 @@ public class DriverJob implements InitializingBean {
             splitSaveScheduling(driverSchedulingMap, driverJobCode, driverName, item, PERSONNEL_POSTS_DRIVER);
             splitSaveScheduling(driverSchedulingMap, salePersonJobCode, salePersonName, item, PERSONNEL_POSTS_SALES);
         });
-        // TODO 处理跟班
-        handleBcCopy(driverSchedulingMap);
+        // 处理跟班
+        handlerBcCopy(driverSchedulingMap);
         // 排序
         List<String> keys = new ArrayList<>(driverSchedulingMap.keySet());
         for (String key : keys) {
@@ -349,15 +350,15 @@ public class DriverJob implements InitializingBean {
         return driverSchedulingMap;
     }
-    private void handleBcCopy(Map<String, List<ResponseSchedulingDto>> driverSchedulingMap) {
+    private void handlerBcCopy(Map<String, List<ResponseSchedulingDto>> driverSchedulingMap) {
         try {
-            Date date = new Date();
+            LocalDate localDate = LocalDate.now();
             DriverSchedulingExpand qwExpand = new DriverSchedulingExpand();
             qwExpand.setStatus(STATUS_NORMAL.longValue());
             List<ExpandResponseVo> expandList = EXPAND_MAPPER.queryExpandListByEntity(qwExpand);
             for (ExpandResponseVo expand : expandList) {
                 List<ResponseSchedulingDto> dtoList = driverSchedulingMap.get(expand.getMasterJobCode());
-                if (CollectionUtil.isNotEmpty(dtoList) && date.compareTo(expand.getEndDate()) < 0) {
+                if (CollectionUtil.isNotEmpty(dtoList) && localDate.compareTo(LocalDate.parse(ConstDateUtil.formatDate("yyyy-MM-dd", expand.getEndDate()))) <= 0) {
                     List<ResponseSchedulingDto> list = ListUtils.deepCopy(dtoList);
                     list = list.stream().peek(item -> {
                         item.setJobCode(expand.getSlaveJobCode());
@@ -11,7 +11,7 @@ import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_OUT;
  * @author 20412
  */
 @Data
-public class DriverSignRecommendation {
+public class DriverSignInRecommendation {
     private Long id;
     private String posts;
     private String bcType;
@@ -23,10 +23,10 @@ public class DriverSignRecommendation {
     private String lpName;
     private String lineName;
-    public DriverSignRecommendation() {
+    public DriverSignInRecommendation() {
     }
-    public DriverSignRecommendation(DriverScheduling dto, Integer index) {
+    public DriverSignInRecommendation(DriverScheduling dto, Integer index) {
         this.setIndex(index);
         this.setBcType(dto.getBcType());
         this.setTimestamps(BC_TYPE_OUT.equals(dto.getBcType()) ? dto.getFcsjT() : dto.getZdsjT());
@@ -5,7 +5,7 @@ import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.mapper.SignInMapper;
-import com.ruoyi.pojo.DriverSignRecommendation;
+import com.ruoyi.pojo.DriverSignInRecommendation;
 import com.ruoyi.pojo.GlobalIndex;
 import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.pojo.request.ReportViewRequestVo;
@@ -83,10 +83,10 @@ public class SchedulingService {
      * @param now
      * @return
      */
-    public DriverSignRecommendation computedTheCurrentClosestTimestamp(List<DriverScheduling> dto, Long now, Integer result) {
-        Map<Integer, DriverSignRecommendation> timeMap = new HashMap<>();
+    public DriverSignInRecommendation computedTheCurrentClosestTimestamp(List<DriverScheduling> dto, Long now, Integer result) {
+        Map<Integer, DriverSignInRecommendation> timeMap = new HashMap<>();
         for (int i = 0; i < dto.size(); i++) {
-            timeMap.put(i, new DriverSignRecommendation(dto.get(i), i));
+            timeMap.put(i, new DriverSignInRecommendation(dto.get(i), i));
         }
         long minDiff = Long.MAX_VALUE;
         Integer index = 0;
@@ -182,7 +182,7 @@ public class ThreadJobService {
     }
     private void sendNotice(SignIn signIn, Driver driver, List<DriverScheduling> dto, GlobalIndex globalIndex) {
-        if (SIGN_ALCOHOL_EX_NUM.equals(signIn.getExType())){
+        if (SIGN_ALCOHOL_EX_NUM.equals(signIn.getExType())) {
             SysNotice notice = new SysNotice();
             notice.setCreateBy("system");
             notice.setUpdateBy("system");
@@ -191,7 +191,7 @@ public class ThreadJobService {
             if (CollectionUtil.isEmpty(dto)) {
                 item = new DriverScheduling();
                 handlerNoScheduling(item, signIn, driver);
-            }else {
+            } else {
                 item = dto.get(globalIndex.getIndex());
             }
             String jobCode = "工号：" + item.getJobCode() + "\n";
@@ -210,6 +210,7 @@ public class ThreadJobService {
             noticeService.insertNotice(notice);
         }
     }
+
     private String getResultString(BigDecimal alcoholIntake) {
         if (alcoholIntake.compareTo(new BigDecimal(20)) >= 0 && alcoholIntake.compareTo(new BigDecimal(80)) < 0)
             return "饮酒后驾驶机动车";
@@ -485,11 +486,49 @@ public class ThreadJobService {
                 // 处理错误班次
                 nowScheduling = handleErrorBc(schedulingList);
             }
+            // 处理松青线
+            // 松1路牌 签到时间 07:20 |松2路牌 签到时间 07:40 |松3路牌 签到时间 08:35 |松4路牌 签到时间 10:30
+            if (nowScheduling.get(0).getLineName().equals("松青线") && checkLpName(nowScheduling.get(0))) {
+                updateScheduling(nowScheduling);
+            }
             bcList.addAll(nowScheduling);
         }
         return bcList;
     }
+    private void updateScheduling(List<DriverScheduling> nowScheduling) {
+        switch (nowScheduling.get(0).getLpName()){
+            case "松1":
+                nowScheduling.get(0).setFcsjT(ConstDateUtil.dateAddition(ConstDateUtil.formatDate("yyyy-MM-dd",new Date(nowScheduling.get(0).getFcsjT())),"07:20:00").getTime());
+                nowScheduling.get(nowScheduling.size() - 1).setZdsjT(ConstDateUtil.dateAddition(ConstDateUtil.formatDate("yyyy-MM-dd",new Date(nowScheduling.get(nowScheduling.size() - 1).getFcsjT())),"15:30:00").getTime());
+                break;
+            case "松2":
+                nowScheduling.get(0).setFcsjT(ConstDateUtil.dateAddition(ConstDateUtil.formatDate("yyyy-MM-dd",new Date(nowScheduling.get(0).getFcsjT())),"07:40:00").getTime());
+                nowScheduling.get(nowScheduling.size() - 1).setZdsjT(ConstDateUtil.dateAddition(ConstDateUtil.formatDate("yyyy-MM-dd",new Date(nowScheduling.get(nowScheduling.size() - 1).getFcsjT())),"19:00:00").getTime());
+                break;
+            case "松3":
+                nowScheduling.get(0).setFcsjT(ConstDateUtil.dateAddition(ConstDateUtil.formatDate("yyyy-MM-dd",new Date(nowScheduling.get(0).getFcsjT())),"08:35:00").getTime());
+                nowScheduling.get(nowScheduling.size() - 1).setZdsjT(ConstDateUtil.dateAddition(ConstDateUtil.formatDate("yyyy-MM-dd",new Date(nowScheduling.get(nowScheduling.size() - 1).getFcsjT())),"18:10:00").getTime());
+                break;
+            case "松4":
+                nowScheduling.get(0).setFcsjT(ConstDateUtil.dateAddition(ConstDateUtil.formatDate("yyyy-MM-dd",new Date(nowScheduling.get(0).getFcsjT())),"10:30:00").getTime());
+                nowScheduling.get(nowScheduling.size() - 1).setZdsjT(ConstDateUtil.dateAddition(ConstDateUtil.formatDate("yyyy-MM-dd",new Date(nowScheduling.get(nowScheduling.size() - 1).getFcsjT())),"18:35:00").getTime());
+                break;
+        }
+    }
+
+    private boolean checkLpName(DriverScheduling driverScheduling) {
+        switch (driverScheduling.getLpName()){
+            case "松1":
+            case "松2":
+            case "松3":
+            case "松4":
+                return true;
+            default:
+                return false;
+        }
+    }
+
     public static List<ErrorJobcode> getErrorScheduling(Map<String, List<DriverScheduling>> resultMap) {
         List<ErrorJobcode> errorList = new ArrayList<>();
         // 循环处理