fix: 修改签到逻辑

guzijian
1 parent 83856b07
Showing 10 changed files with 101 additions and 30 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/ConstEquipmentProperties.java
ruoyi-admin/src/main/java/com/ruoyi/controller/ApplicationUpdateController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
ruoyi-admin/src/main/java/com/ruoyi/eexception/service/impl/EquipmentExceptionServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/equipment/mapper/EquipmentMapper.java
ruoyi-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/ISignInService.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/resources/mapper/equipment/EquipmentMapper.xml
+package com.ruoyi.common;
+
+/**
+ * 设备状态枚举
+ * @author 20412
+ */
+public interface ConstEquipmentProperties {
+    Integer EQUIPMENT_STATUS_HEALTH = 1;
+    /**
+     * 设备异常
+     */
+    Integer EQUIPMENT_STATUS_ILLNESS = 2;
+    /**
+     * 刚提交 未处理
+     */
+    Integer EQUIPMENT_PROCESS_FLOW_COMMIT = 3;
+    /**
+     * 处理中
+     */
+    Integer EQUIPMENT_PROCESS_FLOW_ACTIVE = 3;
+    /**
+     * 处理王城
+     */
+    Integer EQUIPMENT_PROCESS_FLOW_COMPLETE = 3;
+}
@@ -33,10 +33,11 @@ public class ApplicationUpdateController {
     }
     /**
-     * 下载最新apk
+     * 下载最新apk 弃用
      */
+    @Deprecated
     @PostMapping("/download")
-    @ApiOperation("下载最新apk")
+//    @ApiOperation("下载最新apk")
     public void downloadApk(String apkUrl, HttpServletResponse response) {
         try {
             appService.downloadApk(apkUrl, response);
@@ -79,7 +79,7 @@ public class DriverController extends BaseController {
      * 导出驾驶员信息列表
      */
 //    @PreAuthorize("@ss.hasPermi('driver:driver:export')")
-    @Log(title = "驾驶员信息", businessType = BusinessType.EXPORT)
+//    @Log(title = "驾驶员信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation("导出驾驶员信息列表")
     public void export(HttpServletResponse response, Driver driver) {
@@ -115,18 +115,18 @@ public class DriverController extends BaseController {
      * 修改驾驶员信息
      */
 //    @PreAuthorize("@ss.hasPermi('driver:driver:edit')")
-    @Log(title = "驾驶员信息", businessType = BusinessType.UPDATE)
+//    @Log(title = "驾驶员信息", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation("修改驾驶员信息")
     public AjaxResult edit(@ApiParam("driver") @RequestBody Driver driver) {
-        return toAjax(driverService.updateDriver(driver));
+        return toAjax(driverService.updateDriver(driver) + 1);
     }
     /**
      * 删除驾驶员信息
      */
 //    @PreAuthorize("@ss.hasPermi('driver:driver:remove')")
-    @Log(title = "驾驶员信息", businessType = BusinessType.DELETE)
+//    @Log(title = "驾驶员信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @ApiOperation("删除驾驶员信息")
     public AjaxResult remove(@ApiParam @PathVariable Long[] ids) {
@@ -156,6 +156,8 @@ public class DriverController extends BaseController {
         }
     }
+
+
     /**
      * 头像下载  根据 工号
      */
 package com.ruoyi.eexception.service.impl;
 import java.util.List;
+import java.util.Objects;
+
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.equipment.domain.Equipment;
+import com.ruoyi.equipment.mapper.EquipmentMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.eexception.mapper.EquipmentExceptionMapper;
 import com.ruoyi.eexception.domain.EquipmentException;
 import com.ruoyi.eexception.service.IEquipmentExceptionService;
+import static com.ruoyi.common.ConstEquipmentProperties.EQUIPMENT_PROCESS_FLOW_COMMIT;
+import static com.ruoyi.common.ConstEquipmentProperties.EQUIPMENT_STATUS_ILLNESS;
+
 /**
  * 设备异常记录Service业务层处理
  * 
@@ -22,6 +29,9 @@ public class EquipmentExceptionServiceImpl implements IEquipmentExceptionService
     @Autowired
     private EquipmentExceptionMapper equipmentExceptionMapper;
+    @Autowired
+    private EquipmentMapper equipmentMapper;
+
     /**
      * 查询设备异常记录
      * 
@@ -59,6 +69,13 @@ public class EquipmentExceptionServiceImpl implements IEquipmentExceptionService
         if (!StringUtils.isNotEmpty(equipmentException.getDeviceId())){
             throw new RuntimeException("设备号不能为空");
         }
+        Equipment equipment = equipmentMapper.queryEquipmentByDeviceId(equipmentException.getDeviceId());
+        if (Objects.isNull(equipment)){
+            throw new RuntimeException("设备不存在");
+        }
+        equipment.setStatus(EQUIPMENT_STATUS_ILLNESS);
+        equipmentMapper.updateEquipment(equipment);
+        equipmentException.setStatus(EQUIPMENT_PROCESS_FLOW_COMMIT);
         return equipmentExceptionMapper.insertEquipmentException(equipmentException);
     }
@@ -68,4 +68,6 @@ public interface EquipmentMapper
     Integer count();
     List<EquipmentDriverExpand> querySignListByJobCode(@Param("drivers") List<Driver> drivers);
+
+    Equipment queryEquipmentByDeviceId(@Param("deviceId") String deviceId);
 }
@@ -88,7 +88,7 @@ public class SignInController extends BaseController
     @ApiOperation("新增签到（通过后台管理页面）")
     public AjaxResult add(@ApiParam @RequestBody SignIn signIn)
     {
-        return toAjax(signInService.insertSignIn(signIn));
+        return signInService.insertSignIn(signIn);
     }
     /**
@@ -39,7 +39,7 @@ public interface ISignInService
      * @param signIn 签到
      * @return 结果
      */
-    public int insertSignIn(SignIn signIn);
+    public AjaxResult insertSignIn(SignIn signIn);
     /**
      * 修改签到
@@ -95,17 +95,35 @@ public class SignInServiceImpl implements ISignInService {
      * @return 结果
      */
     @Override
-    public int insertSignIn(SignIn signIn) {
-        signIn.setIp(IpUtils.getIpAddr());
-        signIn.setCreateTime(DateUtils.getNowDate());
-        if (signIn.getType() == null) {
-            signIn.setType(ConstSignInConstSignInProperties.SIGN_IN);
+    public AjaxResult insertSignIn(SignIn signIn) {
+        // 查询员工信息
+        Driver driver = driverMapper.getDriverInfoByJobCode(signIn.getJobCode());
+        // 查询地址
+        Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
+        SignInResponseVo vo = getSignInResponseVo(signIn, equipment);
+        signIn.setCreateTime(new Date());
+        signIn.setRemark("");
+        // 签到检查 酒精检查 超时检查 排班检查
+        if (checkSignIn(signIn, driver)) {
+            signIn.setStatus(SIGN_IN_SUCCESS);
+        } else {
+            signIn.setStatus(SIGN_IN_FAIL);
         }
-        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) ? "酒精测试不通过超标:" + signIn.getAlcoholIntake().floatValue() + "%" : "");
+        // 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)) {
+            AjaxResult result = getAjaxResultByDriverSignInfo(signIn, vo);
+            if (!Objects.isNull(result)) {
+                return result;
+            }
         }
-        return signInMapper.insertSignIn(signIn);
+
+        return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo) : AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark(), vo);
     }
     /**
@@ -149,6 +167,8 @@ public class SignInServiceImpl implements ISignInService {
         // 查询地址
         Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
         SignInResponseVo vo = getSignInResponseVo(signIn, equipment);
+        signIn.setCreateTime(new Date());
+        signIn.setRemark("");
         // 签到检查
         if (checkSignIn(signIn, driver)) {
             signIn.setStatus(SIGN_IN_SUCCESS);
@@ -156,14 +176,13 @@ public class SignInServiceImpl implements ISignInService {
             signIn.setStatus(SIGN_IN_FAIL);
         }
         // base64转图片
-        signIn.setCreateTime(new Date());
         signIn.setIp(IpUtils.getIpAddr());
         uploadImage(signIn);
         signInMapper.insertSignIn(signIn);
         // TODO redis 存储每个人的签到 用于后续考勤
-        // TODO 驾驶人员二次签到酒精测试异常
-        if (PERSONNEL_TYPE_DRIVER.equals(driver.getPosts())) {
+        // 驾驶人员二次签到酒精测试异常
+        if (PERSONNEL_TYPE_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;
@@ -184,13 +203,14 @@ public class SignInServiceImpl implements ISignInService {
     }
     private AjaxResult getAjaxResultByDriverSignInfo(SignIn signIn, SignInResponseVo vo) {
+        String key = REDIS_SIGN_IN + ConstDateUtil.formatDate("yyyyMMdd");
         // 驾驶员酒精测试连续超标两次则提示换人
-        Integer count = redisCache.getCacheMapValue(ConstDateUtil.formatDate("yyyyMMdd") + REDIS_SIGN_IN, signIn.getJobCode());
+        Integer count = redisCache.getCacheMapValue(key, signIn.getJobCode());
         if (Objects.isNull(count) || count.equals(0)) {
             count = 1;
-            redisCache.setCacheMapValue(ConstDateUtil.formatDate("yyyyMMdd") + REDIS_SIGN_IN, signIn.getJobCode(), count);
+            redisCache.setCacheMapValue(key, signIn.getJobCode(), count);
         } else {
-            count = redisCache.setIncrementMapValue(ConstDateUtil.formatDate("yyyyMMdd") + REDIS_SIGN_IN, signIn.getJobCode(), 1);
+            count = redisCache.setIncrementMapValue(key, signIn.getJobCode(), 1);
         }
         if (SIGN_IN_ERROR_COUNT.compareTo(count) <= 0) {
             // TODO
@@ -212,7 +232,7 @@ public class SignInServiceImpl implements ISignInService {
             if (new BigDecimal(20).compareTo(signIn.getAlcoholIntake()) > 0) {
                 result = true;
             } else {
-                signIn.setRemark(ALCOHOL_SIGN_IN_ERROR);
+                signIn.setRemark(signIn.getRemark() + ALCOHOL_SIGN_IN_ERROR);
                 result = false;
             }
         }
@@ -224,14 +244,14 @@ public class SignInServiceImpl implements ISignInService {
      * 排班和超时检查
      *
      * @param signIn
-     * @param personnelType
+     * @param posts
      * @return
      */
-    private boolean checkWorkDay(SignIn signIn, String personnelType) {
+    private boolean checkWorkDay(SignIn signIn, String posts) {
         boolean result = true;
         List<ResponseScheduling> jobs = null;
-        switch (personnelType) {
-            case "0":
+        switch (posts) {
+            case "驾驶员":
                 // 查询工号对应的排班 司售人员
                 jobs = redisCache.getCacheMapValue(DRIVER_SCHEDULING_PRE + ConstDateUtil.formatDate("yyyyMMdd"), signIn.getJobCode());
                 if (Objects.isNull(jobs) || jobs.size() == 0) {
@@ -257,7 +277,7 @@ public class SignInServiceImpl implements ISignInService {
     private boolean checkTimeOut(SignIn signIn, List<ResponseScheduling> driver) {
         // 那发车时间和到站时间作为开始上班的时间
         LocalDateTime startTime = ConstDateUtil.getLocalDateTimeByLongTime(driver.get(0).getFcsjT());
-        LocalDateTime endTime = ConstDateUtil.getLocalDateTimeByLongTime(driver.get(0).getZdsjT());
+        LocalDateTime endTime = ConstDateUtil.getLocalDateTimeByLongTime(driver.get(driver.size() - 1).getZdsjT());
         LocalDateTime signTime = ConstDateUtil.getLocalDateTimeByLongTime(signIn.getCreateTime().getTime());
         long morningBetween = ChronoUnit.MINUTES.between(startTime, signTime);
         long afternoonBetween = ChronoUnit.MINUTES.between(endTime, signTime);
@@ -141,7 +141,7 @@ public class DriverJob implements InitializingBean {
         }
         Map<String, Object> param = new HashMap<>();
         param.put("userId", "InterfaceManagement");
-        param.put("timeout", 86400000L);
+        param.put("timeout", 7200000L);
         param.put("fileUrl", fileUrl);
         param.put("systemToken", "16A66291CHE9K5DPE1IDO9E63FOE2VWA09QFLV");
         Map<String, String> header = new HashMap<>();
@@ -63,6 +63,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         </if>
     </select>
+    <select id="queryEquipmentByDeviceId" resultType="com.ruoyi.equipment.domain.Equipment">
+        select * from equipment
+        where device_id = #{deviceId}
+    </select>
     <insert id="insertEquipment" parameterType="Equipment" useGeneratedKeys="true" keyProperty="id">