fix: 修改签到逻辑,修复接口注解错误

guzijian
1 parent dd0dee29
Showing 7 changed files with 54 additions and 18 deletions
ruoyi-admin/src/main/java/com/ruoyi/redispre/GlobalRedisPreName.java → ruoyi-admin/src/main/java/com/ruoyi/common/redispre/GlobalRedisPreName.java
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
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/utils/ConstDateUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
-package com.ruoyi.redispre;
+package com.ruoyi.common.redispre;
 /**
  * @author 20412
  */
 public interface GlobalRedisPreName {
     String DRIVER_SCHEDULING_PRE = "driver:scheduling:";
+    String REDIS_SIGN_IN = "sign:in:";
 }
@@ -168,7 +168,7 @@ public class DriverController extends BaseController {
     /**
      * 头像下载  根据 工号
      */
-    @ApiModelProperty("头像下载")
+    @ApiOperation("头像下载")
     @GetMapping("/download/{jobCode}")
     public void downLoadHeadImage(@PathVariable("jobCode") String jobCode, HttpServletResponse response) {
         driverService.downloadHeadImage(jobCode, response);
 package com.ruoyi.driver.service.impl;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.*;
@@ -10,7 +9,6 @@ import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.file.InvalidExtensionException;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
@@ -31,7 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import static com.ruoyi.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
+import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
 /**
  * 驾驶员信息Service业务层处理
@@ -3,6 +3,8 @@ package com.ruoyi.in.service.impl;
 import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.Base64;
 import java.util.Date;
 import java.util.List;
@@ -33,6 +35,7 @@ import javax.annotation.Resource;
 import static com.ruoyi.common.ErrorTypeProperties.*;
 import static com.ruoyi.common.SignInEnum.*;
+import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_SIGN_IN;
 /**
  * 签到Service业务层处理
@@ -129,10 +132,6 @@ public class SignInServiceImpl implements ISignInService {
     @Override
     public AjaxResult addSignIn(SignIn signIn) throws  IOException {
-        String resultMsg = "签到成功";
-        if (!StringUtils.isNotEmpty(signIn.getDeviceId())){
-            throw new RuntimeException("设备号不能为空");
-        }
         // 签到检查
         checkSignIn(signIn);
         // base64转图片
@@ -140,6 +139,19 @@ public class SignInServiceImpl implements ISignInService {
         signIn.setIp(IpUtils.getIpAddr());
         uploadImage(signIn);
         signInMapper.insertSignIn(signIn);
+        // TODO 驾驶人员二次签到酒精测试异常
+        if (true){
+            Integer count = redisCache.getCacheMapValue(ConstDateUtil.formatDate("yyyyMMdd") + REDIS_SIGN_IN, signIn.getJobCode());
+            if (Objects.isNull(count)){
+                redisCache.setCacheMapValue(ConstDateUtil.formatDate("yyyyMMdd") + REDIS_SIGN_IN, signIn.getJobCode(),0);
+            }
+            count = redisCache.increment(ConstDateUtil.formatDate("yyyyMMdd") + REDIS_SIGN_IN, signIn.getJobCode(), 1);
+            if (count.equals(2) || count.compareTo(2) == 1){
+
+            }
+        }
+
+
         return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING): AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark());
     }
@@ -152,9 +164,8 @@ public class SignInServiceImpl implements ISignInService {
         }
         // TODO 排班校验 非司售未作
         checkWorkDay(signIn,driver.getPersonnelType());
-        // TODO 超时校验
-        checkTimeOut(signIn,driver);
-        // 酒精测试校验
+
+        // 酒精测试校验 TODO 判断人员类型
         if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag())){
             signIn.setStatus(signIn.getAlcoholIntake().compareTo(new BigDecimal(20)) < 0 ? SIGN_IN_SUCCESS : SIGN_IN_FAIL);
             signIn.setRemark(signIn.getStatus().equals(SIGN_IN_FAIL) ? ALCOHOL_SIGN_IN_ERROR : "");
@@ -166,10 +177,11 @@ public class SignInServiceImpl implements ISignInService {
     }
     private void checkWorkDay(SignIn signIn, String personnelType) {
+        List<ResponseScheduling> jobs = null;
         switch (personnelType){
             case "0":
                 // 查询工号对应的排班 司售人员
-                List<ResponseScheduling> jobs= redisCache.getCacheMapValue(ConstDateUtil.formatDate("yyyyMMdd"),signIn.getJobCode());
+                jobs = redisCache.getCacheMapValue(ConstDateUtil.formatDate("yyyyMMdd"),signIn.getJobCode());
                 if (Objects.isNull(jobs)|| jobs.size() == 0){
                     signIn.setStatus(SIGN_IN_FAIL);
                     signIn.setRemark(WORK_DAY_ERROR);
@@ -181,11 +193,25 @@ public class SignInServiceImpl implements ISignInService {
                 break;
         }
+        // 超时校验司售人员
+        checkTimeOut(signIn,jobs);
+        // TODO 非司售人员
     }
-    private void checkTimeOut(SignIn signIn, Driver driver) {
-        // SIGN_IN_TIMEOUT 签到超时
+    private void checkTimeOut(SignIn signIn, List<ResponseScheduling> driver) {
+        // 那发车时间和到站时间作为开始上班的时间
+        LocalDateTime startTime = ConstDateUtil.getLocalDateTimeByLongTime(driver.get(0).getFcsjT());
+        LocalDateTime endTime = ConstDateUtil.getLocalDateTimeByLongTime(driver.get(0).getZdsjT());
+        LocalDateTime signTime = ConstDateUtil.getLocalDateTimeByLongTime(signIn.getCreateTime().getTime());
+        long morningBetween = ChronoUnit.MINUTES.between(startTime, signTime);
+        long afternoonBetween = ChronoUnit.MINUTES.between(endTime, signTime);
+        if (Math.abs(morningBetween) <= 60 || Math.abs(afternoonBetween) <= 60) {
+            signIn.setStatus(SIGN_IN_SUCCESS);
+        } else {
+            signIn.setStatus(SIGN_IN_FAIL);
+            signIn.setRemark(SIGN_IN_TIMEOUT);
+        }
     }
 package com.ruoyi.job;
 import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.service.IDriverService;
 import com.ruoyi.pojo.response.ResponseScheduling;
 import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.ListUtils;
-import org.apache.commons.math3.distribution.RealDistribution;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -22,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-import static com.ruoyi.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
+import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
 /**
  * 该定时任务用户获取驾驶员信息
 package com.ruoyi.utils;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Date;
 public class ConstDateUtil {
@@ -8,4 +11,10 @@ public class ConstDateUtil {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(str);
         return simpleDateFormat.format(new Date());
     }
+
+    public static LocalDateTime getLocalDateTimeByLongTime(long time){
+        Instant instant = Instant.ofEpochMilli(time);
+        LocalDateTime localDateTime = instant.atZone(ZoneId.systemDefault()).toLocalDateTime();
+        return localDateTime;
+    }
 }
@@ -263,6 +263,10 @@ public class RedisCache {
         return redisTemplate.opsForHash().delete(key, hKey) > 0;
     }
+    public Integer increment(String key, String hkey,Integer value){
+        return redisTemplate.opsForHash().increment(key,hkey,value.longValue()).intValue();
+    }
+
     /**
      * 获得缓存的基本对象列表
      *