排班不做特殊处理

liujun001
1 parent a2f2b911
Showing 5 changed files with 20 additions and 16 deletions
Bsth-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/resources/application-druid-dev.yml
@@ -149,8 +149,8 @@ public class DriverController extends BaseController {
      * @param request 请求头
      * @param vo      更新实际数据
      */
-    @PostMapping("/update/face")
-    @ApiOperation("人脸数据更新接口")
+   // @PostMapping("/update/face")
+   // @ApiOperation("人脸数据更新接口")
     public Result<?> updateFaceByJob(HttpServletRequest request, @ApiParam @Validated @RequestBody FaceUpdateReqVo vo) {
         try {
             return driverService.updateFaceByJob(request, vo);
@@ -157,7 +157,7 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
  
     private AjaxResult saveData(SignIn signIn, DriverScheduling scheduling, CalDriverScheduling calDriverScheduling, Driver driver, SignInV1 signInV1) {
         signIn.setExType1(signIn.getExType());
-        Integer type = Objects.isNull(signIn.getExType()) ? 0 : signIn.getExType() > 0 ? 1 : 0;
+        Integer type = Objects.isNull(signIn.getExType()) ? 0 : bigViewServiceV1.isSignStatusWineEnum(signIn) ? 3 : signIn.getExType() > 0 ? 1 : 0;
         signIn.setExType(type);
         signInMapper.insertSignIn(signIn);
         // 更新考勤
@@ -274,9 +274,9 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
             calendar1.set(Calendar.MILLISECOND, 999);
  
  
-            boolean flag = Math.abs(calendar.getTime().getTime() - time) > Math.abs(calendar1.getTime().getTime() - time) ? Boolean.FALSE:Boolean.TRUE;
+            boolean flag = Math.abs(calendar.getTime().getTime() - time) > Math.abs(calendar1.getTime().getTime() - time) ? Boolean.FALSE : Boolean.TRUE;
             String remark = org.apache.commons.lang3.StringUtils.join(ErrorTypeProperties.SIGN_OUT_TIMEOUT, "请在", fcsjHHMM, "到", dzsjHHMM, "之间打卡");
-            return switchAndChooseTime(signIn, dateTime, calendar1.getTime(), calendar.getTime(), remark,flag);
+            return switchAndChooseTime(signIn, dateTime, calendar1.getTime(), calendar.getTime(), remark, flag);
         } else {
             Date fcsj = new Date(scheduling.getFcsjT());
  
@@ -295,10 +295,10 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
             calendar1.set(Calendar.SECOND, 0);
             calendar1.set(Calendar.MILLISECOND, 0);
  
-            boolean flag = Math.abs(calendar.getTime().getTime() - time) > Math.abs(calendar1.getTime().getTime() - time) ? Boolean.FALSE:Boolean.TRUE;
+            boolean flag = Math.abs(calendar.getTime().getTime() - time) > Math.abs(calendar1.getTime().getTime() - time) ? Boolean.FALSE : Boolean.TRUE;
             String remark = org.apache.commons.lang3.StringUtils.join(ErrorTypeProperties.SIGN_IN_TIMEOUT, "请在", fcsjHHMM, "到", dzsjHHMM, "之间打卡");
  
-            return switchAndChooseTime(signIn, dateTime, calendar1.getTime(), calendar.getTime(), remark,flag);
+            return switchAndChooseTime(signIn, dateTime, calendar1.getTime(), calendar.getTime(), remark, flag);
         }
     }
  
@@ -327,18 +327,18 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
      * @author liujun
      * @date 2024/9/20 17:14
      */
-    private int switchAndChooseTime(SignIn signIn, long dateTime, Date date, Date endDate, String remark,boolean flag) {
+    private int switchAndChooseTime(SignIn signIn, long dateTime, Date date, Date endDate, String remark, boolean flag) {
         long startTime = date.getTime();
-      //  date = org.apache.commons.lang3.time.DateUtils.addMinutes(date, value);
+        //  date = org.apache.commons.lang3.time.DateUtils.addMinutes(date, value);
         long endTime = endDate.getTime();
  
-        if(dateTime < startTime){
+        if (dateTime < startTime) {
             signIn.setExType(20);
             signIn.setRemark(remark);
             signIn.setStatus(2);
  
             return 1;
-        }else if(dateTime > endTime){
+        } else if (dateTime > endTime) {
             signIn.setExType(30);
             signIn.setRemark(remark);
             signIn.setStatus(2);
@@ -26,6 +26,7 @@ import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.ListUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -487,6 +488,9 @@ public class DriverJob implements InitializingBean {
     }
  
     public static List<Driver> handlerDrivers(Date date, PersonnelResultResponseVo vo) {
+        if(Objects.nonNull(vo) && CollectionUtils.isNotEmpty(vo.getData())){
+            log.error("refresh driver:[{}]",JSON.toJSONString(vo.getData()));
+        }
         List<Driver> drivers = vo.getData().stream().map(item -> {
             Driver driver = new Driver();
             FormData formData = item.getFormData();
@@ -649,10 +649,10 @@ public class ThreadJobService {
         if (nowScheduling.get(0).getLineName().equals("虹桥枢纽6路") && nowScheduling.get(0).getLpName().equals("9") && nowScheduling.size() == 5) {
             nowScheduling.remove(3);
         }
-        // 处理青浦20路 2号路牌 签到时间调整为07:20  | 5号路牌 签到时间调整为07:05
-        if (nowScheduling.get(0).getLineName().equals("青浦20路")) {
-            updateQinpu2With5(nowScheduling);
-        }
+//        // 处理青浦20路 2号路牌 签到时间调整为07:20  | 5号路牌 签到时间调整为07:05
+//        if (nowScheduling.get(0).getLineName().equals("青浦20路")) {
+//            updateQinpu2With5(nowScheduling);
+//        }
         return nowScheduling;
     }
  
@@ -181,7 +181,7 @@ api:
 log:
     path: D:/ruoyi/logs
 server:
-    port: 8101
+    port: 8100
 netty:
     # 是否开启netty服务
     enabled: true