From 20737dfd697d89bbb4eec0e2f96f62f9f61830f8 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期六, 23 九月 2023 00:58:04 +0800
Subject: [PATCH] 修改
---
src/main/java/com/boying/controller/OutParkController.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/boying/controller/OutParkController.java b/src/main/java/com/boying/controller/OutParkController.java
index 673ba49..47d3411 100644
--- a/src/main/java/com/boying/controller/OutParkController.java
+++ b/src/main/java/com/boying/controller/OutParkController.java
@@ -71,13 +71,45 @@
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) {
QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(Barrier::getCode2,code);
+ 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);
+ }
+ }
+ }
+
+ //閬撻椄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("鏈壘鍒拌璁惧");
@@ -214,7 +246,7 @@
@GetMapping("/statisticParkOrder/count")
public R statisticParkOrder(String parkIds) {
Map<String,Object> resultMap = new HashMap<>();
- if(parkIds != null){
+ if(StringUtils.isNotBlank(parkIds)){
String[] split = parkIds.split(",");
long[] array = Arrays.stream(split).mapToLong(Long::parseLong).toArray();
List<Long> parkIdList = new ArrayList<>();
--
Gitblit v1.9.1