From 18087f533cd48ddb9f972c0848ffe920ec58ee8e Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 26 九月 2022 16:01:14 +0800
Subject: [PATCH] 修改打包和app
---
src/main/java/com/boying/controller/OutParkController.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/boying/controller/OutParkController.java b/src/main/java/com/boying/controller/OutParkController.java
index 6d9e5c3..9dc9719 100644
--- a/src/main/java/com/boying/controller/OutParkController.java
+++ b/src/main/java/com/boying/controller/OutParkController.java
@@ -12,6 +12,7 @@
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -26,6 +27,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import static com.boying.common.util.DateUtil.getMinute;
@@ -46,6 +48,10 @@
@Autowired
private CostRuleService costRuleService;
+ @Autowired
+ private ParkService parkService;
+ @Autowired
+ private StringRedisTemplate redisTemplate;
@PostMapping("findPage")
public Object findPage(int page,int pageSize) {
@@ -188,7 +194,22 @@
Barrier barrier1 = findBarrier(code2);
barrierId = barrier1.getId();
parkId = barrier1.getParkId();
-
+ Park park = (Park)parkService.findById(parkId);
+ int num = 0;
+ String s = redisTemplate.opsForValue().get("car_park_" + parkId);
+ if(park != null){
+ num = park.getNum();
+ if(s !=null){
+ if(Integer.parseInt(s) >= num){
+ redisTemplate.opsForValue().set("park_up_" + parkId,"false",30, TimeUnit.DAYS);
+ return "false";
+ }
+ }else {
+ s= "0";
+ redisTemplate.opsForValue().set("car_park_" + parkId,s,30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+ }
+ }
enterParkService.deleteByCarNo(carNo,parkId);
EnterPark enterPark = new EnterPark();
enterPark.setCreateTime(new Date());
@@ -212,6 +233,10 @@
// enterPark.setStatus(1);//鍙戠幇鏈夎繚绔�
// }
enterParkService.save(enterPark);
+ int i = Integer.parseInt(s);
+ i++;
+ redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
Barrier barrier = (Barrier) barrierService.findById(barrierId);
barrier.setType2(1);
@@ -233,6 +258,7 @@
outPark.setCode(System.currentTimeMillis()+"");
EnterPark enterPark = enterParkService.findByCarNo(carNo).get(0);
+
if(enterPark==null){
s += "鏈彂鐜板叆鍦鸿溅杈嗭細"+carNo+"\n";
writeTxt(s);
@@ -241,8 +267,9 @@
s += "鍙戠幇鍏ュ満杞﹁締: "+enterPark.getCarNo()+",閬撻椄id涓猴細"+enterPark.getBarrierId()+",鍋滆溅鍦篿d锛�"+enterPark.getParkId()+",杩濈珷鏍囪瘑锛�"+enterPark.getStatus()+"\n";
outPark.setEnterTime(enterPark.getCreateTime());
}
+ String redis = redisTemplate.opsForValue().get("car_park_" + parkId);
long l = outPark.getCreateTime().getTime() - enterPark.getCreateTime().getTime();
- s+= "鍦哄唴鏃堕暱涓猴細"+l+"姣,鍚堣涓�: "+l/(1000*60)+"绉抃n";
+ s+= "鍦哄唴鏃堕暱涓猴細"+l+"姣,鍚堣涓�: "+l/(1000*60)+"鍒哱n";
outPark.setTime(l/(1000*60));
double money = 0;
try {
@@ -255,6 +282,15 @@
//outPark.setStatus3(findTicket(carNo));
outParkService.save(outPark);
+ int i = Integer.parseInt(redis);
+ i--;
+ if(i<0){
+ redisTemplate.opsForValue().set("car_park_" + parkId,"0",30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+ }else {
+ redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+ }
Barrier barrier = (Barrier) barrierService.findById(barrierId);
barrier.setCarNo(carNo);
--
Gitblit v1.9.1