fix: 修复没有地址bug

guzijian
1 parent 9c617f46
Showing 1 changed file with 5 additions and 1 deletions
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
@@ -147,6 +147,10 @@ public class SignInServiceImpl implements ISignInService {
         signInMapper.insertSignIn(signIn);
         // TODO 驾驶人员二次签到酒精测试异常
         if (true) {
+            Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
+            SignInResponseVo vo = new SignInResponseVo();
+            vo.setAddress(equipment.getAddress());
+            vo.setDeviceId(signIn.getDeviceId());
             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);
@@ -155,7 +159,7 @@ public class SignInServiceImpl implements ISignInService {
             }
             if (count.compareTo(2) >= 0) {
                 // TODO
-                return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING) : AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark() + "，酒精测试不通过两次请更换车辆驾驶员");
+                return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING,vo) : AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark() + "，酒精测试不通过两次请更换车辆驾驶员",vo);
             }
         }