蓝斯二期

liujun001
1 parent 4280fcf0
Showing 7 changed files with 85 additions and 20 deletions
Bsth-admin/src/main/java/com/ruoyi/in/domain/SignIn.java
Bsth-admin/src/main/java/com/ruoyi/in/service/SignInServiceV1.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/service/BigViewServiceV1.java
Bsth-admin/src/main/java/com/ruoyi/service/SchedulingService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/sign/in/resource/LinggangSignInResourceServiceImpl.java
@@ -98,6 +98,9 @@ public class SignIn extends BaseEntity {
     @ApiModelProperty("异常类型")
     private Integer exType;
+    @ApiModelProperty("异常类型")
+    private Integer exType1;
+
     /***排班信息ID*/
     @Excel(name = "排班信息ID")
     private java.lang.Long schedulingId;
@@ -15,4 +15,6 @@ public interface SignInServiceV1 extends IService&lt;SignInV1&gt; {
     AjaxResult addSignInOffice(SignIn signIn);
     CalDriverScheduling findSchedulingByDateTime(String job, Date date,Integer type);
+
+    boolean updateImage(SignInV1 signIn);
 }
@@ -2,6 +2,7 @@ package com.ruoyi.in.service.impl;
 import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.ConstDriverProperties;
 import com.ruoyi.common.ConstSignInConstSignInProperties;
@@ -29,6 +30,7 @@ import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.domain.SignInV1;
 import com.ruoyi.in.mapper.SignInMapper;
 import com.ruoyi.in.mapper.SignInMapperV1;
+import com.ruoyi.in.service.ISignInService;
 import com.ruoyi.in.service.SignInServiceV1;
 import com.ruoyi.scheduling.domain.DriverSchedulingV1;
 import com.ruoyi.scheduling.service.SchedulingServiceV1;
@@ -84,6 +86,8 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
     private UploadUtil uploadUtil;
     @Autowired
     private LinggangSignInResourceService signInResourceService;
+    @Autowired
+    private ISignInService signInService;
     private static final FastDateFormat HHMM = FastDateFormat.getInstance("HH:mm");
@@ -228,7 +232,6 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
         signInV1.setSignIn(signIn);
-
         return saveData(signIn, scheduling, calDriverScheduling, driver, signInV1);
     }
@@ -245,16 +248,29 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
         }
     }
+    @Override
+    public boolean updateImage(SignInV1 signIn) {
+        LambdaUpdateChainWrapper<SignIn> wrapper = new LambdaUpdateChainWrapper<>(signInMapper);
+        wrapper.set(SignIn::getImage, signIn.getImage()).eq(SignIn::getId, signIn.getId());
+
+        return wrapper.update();
+    }
+
     private AjaxResult saveData(SignIn signIn, DriverScheduling scheduling, CalDriverScheduling calDriverScheduling, Driver driver, SignInV1 signInV1) {
         String videoContent = signIn.getImage();
         signIn.setImage(null);
+
+        signIn.setExType1(signIn.getExType());
+        Integer type = Objects.isNull(signIn.getExType()) ? 0 : signIn.getExType() > 0 ? 1 : 0;
+        signIn.setExType(type);
+
         signInMapper.insertSignIn(signIn);
         if (org.apache.commons.lang3.StringUtils.isNotEmpty(signIn.getImage())) {
             signIn.setImage(null);
         }
-        if(org.apache.commons.lang3.StringUtils.isNotEmpty(videoContent)){
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(videoContent)) {
             StringBuilder builder = new StringBuilder();
             builder.append("sign");
             builder.append(File.separator);
@@ -282,7 +298,7 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
         signInV1.setId(signInV1.getId());
         // 更新考勤
         if (Objects.nonNull(calDriverScheduling)) {
-            schedulingService.computedSignInBySignIn(scheduling, calDriverScheduling.getIndex(), signIn, true);
+            schedulingService.computedSignInBySignIn(scheduling, calDriverScheduling.getIndex(), signIn, true, signInService);
         }
         if (TempCache.checkJobCodeExist(signIn.getJobCode())) {
@@ -32,6 +32,13 @@ public interface BigViewServiceV1 {
     AjaxResult getAjaxResultByDriverSignInfo(SignIn signIn, SignInV1 signInV1, DriverScheduling driverScheduling);
     /***
+     * 是否正常
+     * @param signIn
+     * @return
+     */
+    boolean isNormal(SignIn signIn);
+
+    /***
      *  是否是早签
      * @author liujun
      * @date 2024/9/25 14:51
@@ -8,6 +8,7 @@ import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.mapper.SignInMapper;
+import com.ruoyi.in.service.ISignInService;
 import com.ruoyi.in.service.impl.SignInServiceImpl;
 import com.ruoyi.pojo.DriverSignInRecommendation;
 import com.ruoyi.pojo.GlobalIndex;
@@ -138,7 +139,7 @@ public class SchedulingService {
      *
      * @param signIn
      */
-    public void computedSignInBySignIn(DriverScheduling driverScheduling, int index, SignIn signIn, boolean isNew) {
+    public void computedSignInBySignIn(DriverScheduling driverScheduling, int index, SignIn signIn, boolean isNew, ISignInService signInService) {
         // 无排班不记录不在考勤表不更新
         if (Objects.isNull(driverScheduling)) {
             return;
@@ -147,22 +148,41 @@ public class SchedulingService {
         // 更新最新的签到记录判断是否需要更新考勤
         // 记录为空直接插入记录
         if (Objects.isNull(driverScheduling.getSignInId())) {
-            schedulingMapper.updateRoster(driverScheduling, signIn.getId(), signIn.getExType(), signIn.getCreateTime(), remark, signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
-            // 更新缓存
-            nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(driverScheduling.getScheduleDate()), index, signIn, isNew, driverScheduling);
-        }
-        // 之前的无效
-        else if (!SIGN_NO_EX_NUM.equals(driverScheduling.getExType())) {
-            schedulingMapper.updateRoster(driverScheduling, signIn.getId(), signIn.getExType(), signIn.getCreateTime(), remark, signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
-            nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(driverScheduling.getScheduleDate()), index, signIn, isNew, driverScheduling);
-        }
-        // 之前的有效
-        else {
-            handlerRecord(driverScheduling, signIn, index, isNew);
+            changeScheduling(driverScheduling,signIn,remark,index,isNew);
+        }else{
+            SignIn sourceSign = signInService.selectSignInById(driverScheduling.getSignInId());
+            if(Objects.isNull(sourceSign)){
+                changeScheduling(driverScheduling,signIn,remark,index,isNew);
+            }else if(bigViewServiceV1.isEarly(sourceSign) && bigViewServiceV1.isNormal(signIn)){
+                //第一次是早签，第二次正常签到，覆盖原来的数据。
+                changeScheduling(driverScheduling,signIn,remark,index,isNew);
+            }else if(bigViewServiceV1.isNormal(sourceSign)  && bigViewServiceV1.isSignStatusWineEnum(signIn)){
+                //第一次正常签到，第二次酒驾，覆盖原来的数据。
+                changeScheduling(driverScheduling,signIn,remark,index,isNew);
+            }else if(!bigViewServiceV1.isEarly(sourceSign) && !bigViewServiceV1.isSignStatusDelayEnum(sourceSign) &&
+                    !bigViewServiceV1.isSignStatusWineEnum(sourceSign) && bigViewServiceV1.isSignStatusWineEnum(signIn)){
+                //第一次正常签到，第二次酒驾，覆盖原来的数据。
+                changeScheduling(driverScheduling,signIn,remark,index,isNew);
+            }else if(!bigViewServiceV1.isEarly(sourceSign) && !bigViewServiceV1.isSignStatusDelayEnum(sourceSign) &&
+                    bigViewServiceV1.isSignStatusWineEnum(sourceSign) && bigViewServiceV1.isNormal(signIn)){
+                //第一次在签到时间范围内签到且酒驾，第二次正常，覆盖原来的数据。
+                changeScheduling(driverScheduling,signIn,remark,index,isNew);
+            }else if(bigViewServiceV1.isSignStatusDelayEnum(sourceSign) &&  bigViewServiceV1.isSignStatusWineEnum(sourceSign) ){
+                //第一次迟到签到且酒驾，第二次测试覆盖原来的数据。
+                changeScheduling(driverScheduling,signIn,remark,index,isNew);
+            }else{
+                handlerRecord(driverScheduling, signIn, index, isNew);
+            }
         }
     }
+    private void changeScheduling(DriverScheduling driverScheduling,SignIn signIn,String remark,Integer index,boolean isNew){
+        schedulingMapper.updateRoster(driverScheduling, signIn.getId(), signIn.getExType(), signIn.getCreateTime(), remark, signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
+        // 更新缓存
+        nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(driverScheduling.getScheduleDate()), index, signIn, isNew, driverScheduling);
+    }
+
     private String getRemark(DriverScheduling scheduling, SignIn signIn) {
         StringBuilder sb = new StringBuilder();
         if (bigViewServiceV1.isEarly(signIn)) {
@@ -119,27 +119,32 @@ public class BigViewServiceV1Impl implements BigViewServiceV1 {
         return null;
     }
+    @Override
+    public boolean isNormal(SignIn signIn) {
+        return Objects.nonNull(signIn) && Objects.equals(signIn.getExType1(), 0);
+    }
+
     @Override
     public boolean isEarly(SignIn signIn) {
-        return Objects.nonNull(signIn) && signIn.getExType() >= 20 && signIn.getExType() < 30;
+        return Objects.nonNull(signIn) && signIn.getExType1() >= 20 && signIn.getExType1() < 30;
     }
     @Override
     public boolean isSignStatusWineEnum(SignIn signIn) {
-        return Objects.nonNull(signIn) && (Objects.equals(3, signIn.getExType()) || Objects.equals(23, signIn.getExType()) || Objects.equals(33, signIn.getExType()));
+        return Objects.nonNull(signIn) && Objects.nonNull(signIn.getExType1()) && signIn.getExType1() % 10 == 3;
     }
     @Override
     public boolean isSignStatusDelayEnum(SignIn signIn) {
-        return Objects.nonNull(signIn) && Objects.nonNull(signIn.getExType()) && signIn.getExType() >= 30 && signIn.getExType() < 40;
+        return Objects.nonNull(signIn) && Objects.nonNull(signIn.getExType1()) && signIn.getExType1() >= 30 && signIn.getExType1() < 40;
     }
     @Override
     public boolean isSignStatusZoneEnum(SignIn signIn) {
-        return Objects.nonNull(signIn) && Objects.nonNull(signIn.getExType()) && signIn.getExType() % 10 == 3;
+        return !isSignStatusWineEnum(signIn);
     }
     @Override
@@ -9,8 +9,13 @@ import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.sign.in.resource.LinggangSignInResource;
 import com.ruoyi.exception.InterruptException;
+import com.ruoyi.in.domain.SignIn;
+import com.ruoyi.in.domain.SignInV1;
+import com.ruoyi.in.service.ISignInService;
+import com.ruoyi.in.service.SignInServiceV1;
 import com.ruoyi.mapper.sign.in.resource.LinggangSignInResourceMapper;
 import com.ruoyi.service.sign.in.resource.LinggangSignInResourceService;
+import com.ruoyi.utils.SpringApplicationUtil;
 import com.ruoyi.utils.UploadUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -154,6 +159,13 @@ public class LinggangSignInResourceServiceImpl extends ServiceImpl&lt;LinggangSignI
                 if (!result.isSuccess() && Objects.equals(result.getData(), Boolean.FALSE)) {
                     throw new InterruptException("图片上传失败，请检查服务器");
                 }
+
+                SignInServiceV1 signInServiceV1 = SpringApplicationUtil.getBean(SignInServiceV1.class);
+                SignInV1 signInV1 = new SignInV1();
+                signInV1.setImage(en.getPath());
+                signInV1.setId(en.getSignId());
+
+                signInServiceV1.updateImage(signInV1);
             });
         }