From 8e51195319ea210e7ba06aabdabc40d64df14b08 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期日, 07 四月 2024 17:58:17 +0800
Subject: [PATCH] fix：出场车辆新增判断是否支付过的接口
---
src/main/java/com/boying/controller/OutParkController.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/boying/controller/OutParkController.java b/src/main/java/com/boying/controller/OutParkController.java
index fdaea6f..99aef6e 100644
--- a/src/main/java/com/boying/controller/OutParkController.java
+++ b/src/main/java/com/boying/controller/OutParkController.java
@@ -29,6 +29,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -80,6 +81,9 @@
//閬撻椄code
@PostMapping("/findByBarrierCode")
public Object findById(String code) {
+ if(StringUtils.isBlank(code)){
+ return R.failed(null,"鍙傛暟閿欒");
+ }
QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(Barrier::getCode2,code);
@@ -109,6 +113,9 @@
//閬撻椄code
@PostMapping("/findByBarrierCode2")
public Object findById2(String code2) {
+ if(StringUtils.isBlank(code2)){
+ return R.failed(null,"鍙傛暟閿欒");
+ }
System.out.println("code2 :"+code2);
QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -292,6 +299,45 @@
}
}
+ @GetMapping("/getByCarAndPark")
+ public Object getByCarAndPark(String carNo ,Integer parkId) {
+ QueryWrapper<OutPark> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(OutPark::getCarNo,carNo)
+ .eq(OutPark::getParkId,parkId)
+ .orderByDesc(OutPark::getCreateTime);
+ List<OutPark> list = outParkService.list(wrapper);
+ if(list.size() > 0){
+ OutPark outPark = list.get(0);
+ if(outPark.getTime() > 0){
+ outPark.setTimeStr(DateUtilOther.millisToDayHrMinSec(new Double(outPark.getTime()).longValue()));
+ }else {
+ outPark.setTimeStr("涓嶈冻涓�鍒嗛挓");
+ }
+ return R.ok(outPark,"鎵惧埌鏁版嵁");
+ }else {
+ return R.failed(null,"鏈壘鍒版暟鎹�");
+ }
+ }
+ @GetMapping("/editEnterPark")
+ public Object editEnterPark(String carNo ,Integer parkId,String time) {
+ QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Barrier::getParkId,parkId)
+ .eq(Barrier::getType,1);
+ List<Barrier> list = barrierService.list(wrapper);
+ EnterPark enterPark = new EnterPark();
+ enterPark.setCreateTime(LocalDateTime.parse(time, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ enterPark.setCarNo(carNo);
+ enterPark.setParkId(parkId);
+ enterPark.setBarrierId(list.get(0).getId());
+ enterPark.setStatus(0);
+ enterPark.setIsPay(0);
+ enterPark.setImgId(null);
+ enterParkService.saveOrUpdate(enterPark);
+ return R.ok("淇敼鎴愬姛");
+ }
+
public Barrier findBarrier(String code2) {
QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
--
Gitblit v1.9.1