From 989e2766b2465297d4cf4226f75209f34e94b625 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期四, 23 二月 2023 16:07:29 +0800
Subject: [PATCH] 默认变更列表
---
src/main/java/com/boying/controller/LedShowController.java | 16 +++++++++++++---
src/main/java/com/boying/controller/car/PlateServlet.java | 3 ++-
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/boying/controller/LedShowController.java b/src/main/java/com/boying/controller/LedShowController.java
index 5a5ad6a..1089c0c 100644
--- a/src/main/java/com/boying/controller/LedShowController.java
+++ b/src/main/java/com/boying/controller/LedShowController.java
@@ -33,6 +33,8 @@
private final ParkService parkService;
private final StringRedisTemplate redisTemplate;
+ private Boolean flag = false;
+
@GetMapping("/getNew")
public Object getNew(Integer number) {
QueryWrapper<LedShow> wrapper = new QueryWrapper<>();
@@ -47,6 +49,8 @@
String num = redisTemplate.opsForValue().get("car_park_" + byCode.getParkId());
Park byId = parkService.getById(byCode.getParkId());
int i = byId.getNum() - Integer.parseInt(num);
+ o.setStatus(0);
+ ledShowService.saveOrUpdate(o);
return R.ok(o,i+"");
}else {
QueryWrapper<LedShow> wrapper1 = new QueryWrapper<>();
@@ -67,6 +71,10 @@
@GetMapping("/getNew2")
public Object getNew2(String code) {
+ if(flag){
+ return null;
+ }
+ flag = true;
Barrier byCode = barrierService.findByCode(code);
if(byCode != null){
QueryWrapper<LedShow> wrapper = new QueryWrapper<>();
@@ -80,14 +88,19 @@
String num = redisTemplate.opsForValue().get("car_park_" + byCode.getParkId());
Park byId = parkService.getById(byCode.getParkId());
int i = byId.getNum() - Integer.parseInt(num);
+ o.setStatus(0);
+ ledShowService.saveOrUpdate(o);
+ flag = false;
return R.ok(o,i+"");
}else {
String num = redisTemplate.opsForValue().get("car_park_" + byCode.getParkId());
Park byId = parkService.getById(byCode.getParkId());
int i = byId.getNum() - Integer.parseInt(num);
+ flag = false;
return R.ok(null,i+"");
}
}else {
+ flag = false;
return R.failed("鏈煡璇㈠埌姝ら椄鏈�");
}
}
@@ -100,9 +113,6 @@
@GetMapping("/updateLedShow")
public Object updateLedShow(Integer id) {
- LedShow byId = ledShowService.getById(id);
- byId.setStatus(0);
- ledShowService.saveOrUpdate(byId);
return R.ok("鏌ヨ鎴愬姛","鏌ヨ鎴愬姛");
}
diff --git a/src/main/java/com/boying/controller/car/PlateServlet.java b/src/main/java/com/boying/controller/car/PlateServlet.java
index 31c3651..dd49366 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet.java
@@ -211,7 +211,7 @@
s+="鏌ヨ閬撻椄涓虹┖\n";
}else{
if(barrier.getType()==0){
- noOpen(request,response);
+ //noOpen(request,response);
outPark(license, barrier.getId(), barrier.getParkId());
s+=license+"-淇濆瓨鍑哄満璁板綍\n";
}else{
@@ -384,6 +384,7 @@
}
outLedShow(barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId());
if(outPark.getPrice()==0&&outPark.getStatus3()==0){
+ System.out.println(outPark.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐�");
barrier.setType2(1);
}
barrierService.saveOrUpdate(barrier);
--
Gitblit v1.9.1