From ea7140711e2f2aec1559049ee139d69dfbe1575d Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期四, 01 六月 2023 13:47:26 +0800
Subject: [PATCH] 提交更新
---
src/main/java/com/boying/service/impl/BarrierServiceImpl.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/boying/service/impl/BarrierServiceImpl.java b/src/main/java/com/boying/service/impl/BarrierServiceImpl.java
index 20542d9..4e6a807 100644
--- a/src/main/java/com/boying/service/impl/BarrierServiceImpl.java
+++ b/src/main/java/com/boying/service/impl/BarrierServiceImpl.java
@@ -58,19 +58,24 @@
.orderByDesc(EnterPark::getId)
.last(" limit 1");
EnterPark enterPark = enterParkMapper.selectOne(wrapper);
- long dif = DateUtil.between(Date.from( enterPark.getCreateTime().atZone( ZoneId.systemDefault()).toInstant()), new Date(), DateUnit.SECOND, false);
- if(dif >= 5 && dif <= 7){
- return true;
- }else {
- //鍒ゆ柇鍋滆溅鍦烘槸鍚︽湁浜嗚溅浣�
- String s = redisTemplate.opsForValue().get("park_change_in_" + enterPark.getParkId());
- if("true".equals(s)){
- redisTemplate.opsForValue().set("park_change_in_"+enterPark.getParkId(),"false",1, TimeUnit.DAYS);
+ if(enterPark != null){
+ long dif = DateUtil.between(Date.from( enterPark.getCreateTime().atZone( ZoneId.systemDefault()).toInstant()), new Date(), DateUnit.SECOND, false);
+ if(dif >= 5 && dif <= 7){
return true;
}else {
- return false;
+ //鍒ゆ柇鍋滆溅鍦烘槸鍚︽湁浜嗚溅浣�
+ String s = redisTemplate.opsForValue().get("park_change_in_" + enterPark.getParkId());
+ if("true".equals(s)){
+ redisTemplate.opsForValue().set("park_change_in_"+enterPark.getParkId(),"false",1, TimeUnit.DAYS);
+ return true;
+ }else {
+ return false;
+ }
}
+ }else {
+ return false;
}
+
}
@@ -82,9 +87,13 @@
.orderByDesc(OutPark::getId)
.last(" limit 1");
OutPark outPark = outParkMapper.selectOne(wrapper);
- long dif = DateUtil.between(Date.from( outPark.getCreateTime().atZone( ZoneId.systemDefault()).toInstant()), new Date(), DateUnit.SECOND, false);
- if(dif >= 20 && dif <= 23){
- return true;
+ if(outPark != null){
+ long dif = DateUtil.between(Date.from( outPark.getCreateTime().atZone( ZoneId.systemDefault()).toInstant()), new Date(), DateUnit.SECOND, false);
+ if(dif >= 20 && dif <= 23){
+ return true;
+ }else {
+ return false;
+ }
}else {
return false;
}
--
Gitblit v1.9.1