fix: 解决签到非司售工种处理报错空指针异常

guzijian
1 parent 3f6190a9
Showing 7 changed files with 42 additions and 42 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/ConstDriverProperties.java
ruoyi-admin/src/main/java/com/ruoyi/common/global/GlobalDriverInfoCache.java
ruoyi-admin/src/main/java/com/ruoyi/common/redispre/GlobalRedisPreName.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/domain/SignInExpand.java
ruoyi-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
ruoyi-admin/src/main/java/com/ruoyi/upgrade/controller/VersionUpgradeController.java
@@ -5,5 +5,8 @@ package com.ruoyi.common;
  * @author 20412
  */
 public interface ConstDriverProperties {
-    String PERSONNEL_TYPE_DRIVER = "驾驶员";
+    String PERSONNEL_POSTS_DRIVER = "驾驶员";
+
+
+    String PERSONNEL_POSTS_SALES = "售票员";
 }
@@ -2,10 +2,8 @@ package com.ruoyi.common.global;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.pojo.domain.SignInExpand;
-import com.ruoyi.utils.ConstDateUtil;
 import org.springframework.stereotype.Component;
-import java.security.Principal;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -15,13 +13,9 @@ import java.util.concurrent.ConcurrentHashMap;
 @Component
 public class GlobalDriverInfoCache {
     /**
-     * 上午签到汇总
+     * 签到次数汇总
      */
-    private final ConcurrentHashMap<String, List<SignInExpand>> morningUserSignInMap = new ConcurrentHashMap();
-    /**
-     * 下午签到汇总
-     */
-    private final ConcurrentHashMap<String, List<SignInExpand>> afternoonUserSignInMap = new ConcurrentHashMap();
+    private final ConcurrentHashMap<String, List<SignInExpand>> userCurrentMap = new ConcurrentHashMap<>();
     /**
      * 驾驶员签到成功
@@ -30,27 +24,19 @@ public class GlobalDriverInfoCache {
      */
     public void putDriverSignInSuccess(SignIn signIn) {
         ConcurrentHashMap<String, List<SignInExpand>> userCurrentMap = null;
-        int hour = Integer.parseInt(ConstDateUtil.formatDate("HH"));
-        if (hour >= 0 && hour < 12) {
-            userCurrentMap = morningUserSignInMap;
             if (Objects.isNull(userCurrentMap.get(signIn.getJobCode()))) {
                 SignInExpand signInExpand = new SignInExpand();
                 signInExpand.setJobCode(signIn.getJobCode());
-                signInExpand.setMorningSignInIds(signInExpand.getMorningSignInIds() + signIn.getId() + ",");
+                signInExpand.setSignCount(signIn.getId() + ",");
                 userCurrentMap.put(signIn.getJobCode(), new ArrayList<>(Arrays.asList(signInExpand)));
             } else {
-                userCurrentMap.get(signIn.getJobCode()).add(null);
+                SignInExpand signInExpand = new SignInExpand();
+                signInExpand.setJobCode(signIn.getJobCode());
+                signInExpand.setSignCount(signInExpand.getSignCount() + signIn.getId() + ",");
+                userCurrentMap.get(signIn.getJobCode()).add(signInExpand);
             }
-        }else {
-            userCurrentMap = afternoonUserSignInMap;
         }
-        /**
-         * 存在判断  上下午只保留一条作为正式的签到结果
-         * 上午签到 -》 成功  | 下午签到 -》异常，成功
-         * 上午签到 -》 异常，异常 | 下午签到 -》 成功
-         */
     }
-}
@@ -5,7 +5,10 @@ package com.ruoyi.common.redispre;
  */
 public interface GlobalRedisPreName {
     String DRIVER_SCHEDULING_PRE = "driver:scheduling:";
-    String REDIS_SIGN_IN = "sign:in:";
+    /**
+     * 存储驾驶员酒精测试异常
+     */
+    String REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW = "sign:in:driver";
     /**
      * 请求人事系统token
      */
@@ -15,7 +15,6 @@ import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.ConstSignInConstSignInProperties;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.ip.IpUtils;
 import com.ruoyi.common.utils.uuid.Seq;
@@ -29,6 +28,8 @@ import com.ruoyi.pojo.response.SignInResponseVo;
 import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.utils.ConstDateUtil;
 import org.apache.commons.io.FilenameUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.in.mapper.SignInMapper;
@@ -37,11 +38,11 @@ import com.ruoyi.in.service.ISignInService;
 import javax.annotation.Resource;
-import static com.ruoyi.common.ConstDriverProperties.PERSONNEL_TYPE_DRIVER;
+import static com.ruoyi.common.ConstDriverProperties.PERSONNEL_POSTS_DRIVER;
 import static com.ruoyi.common.ErrorTypeProperties.*;
 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;
+import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW;
 /**
  * 签到Service业务层处理
@@ -51,6 +52,8 @@ import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_SIGN_IN;
  */
 @Service
 public class SignInServiceImpl implements ISignInService {
+
+    private Logger log = LoggerFactory.getLogger(SignInServiceImpl.class);
     @Autowired
     private SignInMapper signInMapper;
@@ -98,6 +101,7 @@ public class SignInServiceImpl implements ISignInService {
     public AjaxResult insertSignIn(SignIn signIn) {
         // 查询员工信息
         Driver driver = driverMapper.getDriverInfoByJobCode(signIn.getJobCode());
+        if (Objects.isNull(driver)) return AjaxResult.error("这个工号的员工不存在！");
         // 查询地址
         Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
         SignInResponseVo vo = getSignInResponseVo(signIn, equipment);
@@ -109,14 +113,14 @@ public class SignInServiceImpl implements ISignInService {
         } else {
             signIn.setStatus(SIGN_IN_FAIL);
         }
-        // base64转图片
         signIn.setIp(IpUtils.getIpAddr());
+        // base64转图片
 //        uploadImage(signIn);
         signInMapper.insertSignIn(signIn);
         // TODO redis 存储每个人的签到 用于后续考勤
         // 驾驶人员二次签到酒精测试异常
-        if (PERSONNEL_TYPE_DRIVER.equals(driver.getPosts()) && SIGN_IN_FAIL.equals(signIn.getStatus()) && signIn.getRemark().contains(ALCOHOL_SIGN_IN_ERROR)) {
+        if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && SIGN_IN_FAIL.equals(signIn.getStatus()) && signIn.getRemark().contains(ALCOHOL_SIGN_IN_ERROR)) {
             AjaxResult result = getAjaxResultByDriverSignInfo(signIn, vo);
             if (!Objects.isNull(result)) {
                 return result;
@@ -164,6 +168,7 @@ public class SignInServiceImpl implements ISignInService {
     public AjaxResult addSignIn(SignIn signIn) throws IOException {
         // 查询员工信息
         Driver driver = driverMapper.getDriverInfoByJobCode(signIn.getJobCode());
+        if (Objects.isNull(driver)) return AjaxResult.error("这个工号的员工不存在！");
         // 查询地址
         Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
         SignInResponseVo vo = getSignInResponseVo(signIn, equipment);
@@ -177,18 +182,18 @@ public class SignInServiceImpl implements ISignInService {
         }
         // base64转图片
         signIn.setIp(IpUtils.getIpAddr());
+
         uploadImage(signIn);
         signInMapper.insertSignIn(signIn);
         // TODO redis 存储每个人的签到 用于后续考勤
         // 驾驶人员二次签到酒精测试异常
-        if (PERSONNEL_TYPE_DRIVER.equals(driver.getPosts()) && SIGN_IN_FAIL.equals(signIn.getStatus()) && signIn.getRemark().contains(ALCOHOL_SIGN_IN_ERROR)) {
+        if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && SIGN_IN_FAIL.equals(signIn.getStatus()) && signIn.getRemark().contains(ALCOHOL_SIGN_IN_ERROR)) {
             AjaxResult result = getAjaxResultByDriverSignInfo(signIn, vo);
             if (!Objects.isNull(result)) {
                 return result;
             }
         }
-
         return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo) : AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark(), vo);
     }
@@ -203,7 +208,7 @@ public class SignInServiceImpl implements ISignInService {
     }
     private AjaxResult getAjaxResultByDriverSignInfo(SignIn signIn, SignInResponseVo vo) {
-        String key = REDIS_SIGN_IN + ConstDateUtil.formatDate("yyyyMMdd");
+        String key = REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW + ConstDateUtil.formatDate("yyyyMMdd");
         // 驾驶员酒精测试连续超标两次则提示换人
         Integer count = redisCache.getCacheMapValue(key, signIn.getJobCode());
         if (Objects.isNull(count) || count.equals(0)) {
@@ -228,7 +233,7 @@ public class SignInServiceImpl implements ISignInService {
         result = checkWorkDay(signIn, driver.getPosts());
         // 酒精测试校验 确定 且员工工种是驾驶员
-        if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag()) && PERSONNEL_TYPE_DRIVER.equals(driver.getPosts())) {
+        if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag()) && PERSONNEL_POSTS_DRIVER.equals(driver.getPosts())) {
             if (new BigDecimal(20).compareTo(signIn.getAlcoholIntake()) > 0) {
                 result = true;
             } else {
@@ -269,13 +274,21 @@ public class SignInServiceImpl implements ISignInService {
         // 超时校验司售人员
         if (result) {
             // TODO 非司售人员
-            result = checkTimeOut(signIn, jobs);
+            result = checkTimeOut(signIn, jobs, posts);
         }
         return result;
     }
-    private boolean checkTimeOut(SignIn signIn, List<ResponseScheduling> driver) {
+    private boolean checkTimeOut(SignIn signIn, List<ResponseScheduling> driver, String posts) {
         // 那发车时间和到站时间作为开始上班的时间
+        if (PERSONNEL_POSTS_DRIVER.equals(posts)) {
+            return driverCheckTimeOut(signIn, driver);
+        } else {
+            return true;
+        }
+    }
+
+    private static boolean driverCheckTimeOut(SignIn signIn, List<ResponseScheduling> driver) {
         LocalDateTime startTime = ConstDateUtil.getLocalDateTimeByLongTime(driver.get(0).getFcsjT());
         LocalDateTime endTime = ConstDateUtil.getLocalDateTimeByLongTime(driver.get(driver.size() - 1).getZdsjT());
         LocalDateTime signTime = ConstDateUtil.getLocalDateTimeByLongTime(signIn.getCreateTime().getTime());
@@ -14,13 +14,9 @@ public class SignInExpand {
     private Integer id;
     private String jobCode;
     /**
-     * 上午签到集合 1，2
+     * 签到集合 1，2
      */
-    private String morningSignInIds;
-    /**
-     * 下午签到集合 1，2
-     */
-    private String afternoonSignInIds;
+    private String signCount;
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date dated;
 }
@@ -74,6 +74,7 @@ public class ThreadJobService {
             outputStream = new FileOutputStream(url);
             outputStream.write(photoBase64);
             outputStream.flush();
+            log.info("文件上传完毕");
         } catch (Exception e) {
             log.error("文件上传异常:{}", e.getMessage());
         } finally {
@@ -3,7 +3,6 @@ package com.ruoyi.upgrade.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -54,7 +53,6 @@ public class VersionUpgradeController extends BaseController
     @PreAuthorize("@ss.hasPermi('upgrade:upgrade:export')")
     @Log(title = "upgrade", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    @ApiOperation("")
     public void export(HttpServletResponse response, VersionUpgrade versionUpgrade)
     {
         List<VersionUpgrade> list = versionUpgradeService.selectVersionUpgradeList(versionUpgrade);