From 3ef02177eae63e4287e27aa36493d696b53c5621 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 20 九月 2023 17:17:44 +0800
Subject: [PATCH] 修改
---
src/main/java/com/boying/controller/OutParkController.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/boying/controller/OutParkController.java b/src/main/java/com/boying/controller/OutParkController.java
index a70ad40..47d3411 100644
--- a/src/main/java/com/boying/controller/OutParkController.java
+++ b/src/main/java/com/boying/controller/OutParkController.java
@@ -71,7 +71,11 @@
page.setTotal(count);
return R.ok(page);
}
-
+ //getById
+ @PostMapping("/getById")
+ public Object getById(Long id) {
+ return R.ok(outParkService.getById(id));
+ }
//閬撻椄code
@PostMapping("/findByBarrierCode")
public Object findById(String code) {
@@ -100,6 +104,34 @@
}
}
+ //閬撻椄code
+ @PostMapping("/findByBarrierCode2")
+ public Object findById2(String code2) {
+ QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Barrier::getCode2,code2);
+ List<Barrier> all = barrierService.list(wrapper);
+ if(all.size()==0){
+ return R.failed("鏈壘鍒拌璁惧");
+ }else{
+ Barrier barrier = all.get(0);
+ String carNo = barrier.getCarNo();
+
+ OutPark outPark = outParkService.findByCarNoAndBarrierId(carNo,barrier.getId());
+ if(outPark==null){
+ return R.failed("鏈瘑鍒埌杞︾墝鍙�");
+ }else{
+ outPark.setParkName(barrier.getName());
+ if(outPark.getTime() > 0){
+ outPark.setTimeStr(DateUtilOther.millisToDayHrMinSec(new Double(outPark.getTime()).longValue()));
+ }else {
+ outPark.setTimeStr("涓嶈冻涓�鍒嗛挓");
+ }
+ return R.ok(outPark);
+ }
+ }
+ }
+
@PostMapping("/delete")
public Object delete(Long id) {
outParkService.removeById(id);
--
Gitblit v1.9.1