From ea7140711e2f2aec1559049ee139d69dfbe1575d Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期四, 01 六月 2023 13:47:26 +0800
Subject: [PATCH] 提交更新
---
src/main/java/com/boying/controller/OutParkController.java | 74 +++++++++++++++++--------------------
1 files changed, 34 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/boying/controller/OutParkController.java b/src/main/java/com/boying/controller/OutParkController.java
index f1e5b4b..adf15a8 100644
--- a/src/main/java/com/boying/controller/OutParkController.java
+++ b/src/main/java/com/boying/controller/OutParkController.java
@@ -32,7 +32,7 @@
import java.util.concurrent.TimeUnit;
@RestController
-@RequestMapping("outPark")
+@RequestMapping("ffzf/outpark")
@RequiredArgsConstructor
public class OutParkController {
@@ -59,7 +59,7 @@
}
//閬撻椄code
- @PostMapping("findByBarrierCode")
+ @PostMapping("/findByBarrierCode")
public Object findById(String code) {
QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -197,45 +197,39 @@
return R.ok(outPark);
}
- @GetMapping("/statisticParkOrder")
- public Object statisticParkOrder(Integer userId) {
- User byId = userService.getById(userId);
+ @GetMapping("/statisticParkOrder/count")
+ public R statisticParkOrder(String parkIds) {
Map<String,Object> resultMap = new HashMap<>();
- if(byId != null){
- String parkIds = byId.getParkIds();
- if(parkIds != null){
- String[] split = parkIds.split(",");
- int[] array = Arrays.stream(split).mapToInt(Integer::parseInt).toArray();
- List<Integer> parkIdList = new ArrayList<>();
- for (int i : array) {
- parkIdList.add(i);
- }
- QueryWrapper<OutPark> wrapper = new QueryWrapper<>();
- wrapper.lambda()
- .between(OutPark::getCreateTime, DateUtil.beginOfDay(new Date()),DateUtil.endOfDay(new Date()))
- .eq(OutPark::getStatus,1)
- .in(OutPark::getParkId,parkIdList);
- wrapper.select("IFNULL(ROUND(SUM(price)),0) as num");
- Map<String, Object> map = outParkService.getMap(wrapper);
- String a = map.get("num").toString();
- if(a != null){
- resultMap.put("money",Double.parseDouble(a));
- }else {
- resultMap.put("money",0.0);
- }
- wrapper.clear();
- wrapper.lambda()
- .between(OutPark::getCreateTime, DateUtil.beginOfDay(new Date()),DateUtil.endOfDay(new Date()))
- .eq(OutPark::getStatus,1)
- .in(OutPark::getParkId,parkIdList);
- int count = outParkService.count(wrapper);
- resultMap.put("count",count);
- return R.ok(resultMap);
- }else {
- return R.failed(null,"璇ョ敤鎴锋湭绠＄悊鍋滆溅鍦�");
+ if(parkIds != null){
+ String[] split = parkIds.split(",");
+ long[] array = Arrays.stream(split).mapToLong(Long::parseLong).toArray();
+ List<Long> parkIdList = new ArrayList<>();
+ for (long i : array) {
+ parkIdList.add(i);
}
+ QueryWrapper<OutPark> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .between(OutPark::getCreateTime, DateUtil.beginOfDay(new Date()),DateUtil.endOfDay(new Date()))
+ .eq(OutPark::getStatus,1)
+ .in(OutPark::getParkId,parkIdList);
+ wrapper.select("IFNULL(ROUND(SUM(price)),0) as num");
+ Map<String, Object> map = outParkService.getMap(wrapper);
+ String a = map.get("num").toString();
+ if(a != null){
+ resultMap.put("money",Double.parseDouble(a));
+ }else {
+ resultMap.put("money",0.0);
+ }
+ wrapper.clear();
+ wrapper.lambda()
+ .between(OutPark::getCreateTime, DateUtil.beginOfDay(new Date()),DateUtil.endOfDay(new Date()))
+ .eq(OutPark::getStatus,1)
+ .in(OutPark::getParkId,parkIdList);
+ long count = outParkService.count(wrapper);
+ resultMap.put("count",count);
+ return R.ok(resultMap);
}else {
- return R.failed(null,"鏈煡璇㈠埌璇ョ敤鎴�");
+ return R.failed(null,"璇ョ敤鎴锋湭绠＄悊鍋滆溅鍦�");
}
}
@@ -243,9 +237,9 @@
public Object isJS(String carNo ,Integer parkId) {
List<EnterPark> byCarNo = enterParkService.findByCarNo(carNo, parkId);
if(byCarNo.size() > 0){
- return R.ok(byCarNo.get(0));
+ return R.ok(byCarNo.get(0),"true");
}else {
- return R.failed();
+ return R.ok(null,"false");
}
}
--
Gitblit v1.9.1