From 83a1aa3133ce9c35fb428d0cdf4a84adda4ba3ac Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 24 四月 2024 16:33:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/boying/controller/LedShowController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/boying/controller/LedShowController.java b/src/main/java/com/boying/controller/LedShowController.java
index 5a5ad6a..b26fc70 100644
--- a/src/main/java/com/boying/controller/LedShowController.java
+++ b/src/main/java/com/boying/controller/LedShowController.java
@@ -8,6 +8,7 @@
import com.boying.service.BarrierService;
import com.boying.service.LedShowService;
import com.boying.service.ParkService;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.web.bind.annotation.GetMapping;
@@ -26,12 +27,15 @@
@RestController
@RequestMapping("ledshow")
@RequiredArgsConstructor
+@Tag(description = "ledshow" , name = "led鏃ュ織锛堝凡搴熷純锛�" )
public class LedShowController {
private final LedShowService ledShowService;
private final BarrierService barrierService;
private final ParkService parkService;
private final StringRedisTemplate redisTemplate;
+
+ private Boolean flag = false;
@GetMapping("/getNew")
public Object getNew(Integer number) {
@@ -47,6 +51,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 +73,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 +90,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 +115,6 @@
@GetMapping("/updateLedShow")
public Object updateLedShow(Integer id) {
- LedShow byId = ledShowService.getById(id);
- byId.setStatus(0);
- ledShowService.saveOrUpdate(byId);
return R.ok("鏌ヨ鎴愬姛","鏌ヨ鎴愬姛");
}
--
Gitblit v1.9.1