From 7bc78d8f70a4d11e46f8bd640228804a3dd0dc68 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 22 四月 2024 10:52:29 +0800
Subject: [PATCH] Merge branch 'master2'
---
src/main/java/com/boying/controller/OutParkController.java | 76 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/boying/controller/OutParkController.java b/src/main/java/com/boying/controller/OutParkController.java
index 3d3556d..45ada89 100644
--- a/src/main/java/com/boying/controller/OutParkController.java
+++ b/src/main/java/com/boying/controller/OutParkController.java
@@ -9,6 +9,8 @@
import com.boying.entity.*;
import com.boying.service.*;
import com.boying.util.DateUtilOther;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -36,6 +38,7 @@
@RestController
@RequestMapping("ffzf/outpark")
@RequiredArgsConstructor
+@Tag(description = "ffzf/outpark" , name = "鍑哄満琛ㄦ帴鍙�" )
public class OutParkController {
@@ -54,6 +57,7 @@
private StringRedisTemplate redisTemplate;
@PostMapping("/findPage")
+ @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
public Object findPage(Page page, String carNo,Long parkId,String payCode,String date) throws ParseException {
List<OutPark> list = outParkService.getList(page.getCurrent(), page.getSize(), carNo,parkId,payCode, date);
System.out.println(list);
@@ -75,12 +79,17 @@
}
//getById
@PostMapping("/getById")
+ @Operation(summary = "鏍规嵁id鏌ヨ" , description = "鏍规嵁id鏌ヨ" )
public Object getById(Long id) {
return R.ok(outParkService.getById(id));
}
//閬撻椄code
@PostMapping("/findByBarrierCode")
+ @Operation(summary = "鏍规嵁閬撻椄code鏌ヨ鍑哄満锛堝凡搴熷純锛�" , description = "鏍规嵁閬撻椄code鏌ヨ鍑哄満锛堝凡搴熷純锛�" )
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,7 +118,11 @@
//閬撻椄code
@PostMapping("/findByBarrierCode2")
+ @Operation(summary = "鏍规嵁閬撻椄code鏌ヨ鍑哄満" , description = "鏍规嵁閬撻椄code鏌ヨ鍑哄満" )
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()
@@ -137,12 +150,14 @@
}
@PostMapping("/delete")
+ @Operation(summary = "鍒犻櫎鍑哄満" , description = "鍒犻櫎鍑哄満" )
public Object delete(Long id) {
outParkService.removeById(id);
return R.ok("鍒犻櫎鎴愬姛");
}
@PostMapping("enterPark2")
+ @Operation(summary = "鏂板鍏ュ満锛堝簾寮冿級" , description = "鏂板鍏ュ満锛堝簾寮冿級" )
public Object enterPark(String carNo,Integer barrierId,Integer parkId,String code2) {
Barrier barrier1 = findBarrier(code2);
barrierId = barrier1.getId();
@@ -183,6 +198,7 @@
}
@PostMapping("outPark2")
+ @Operation(summary = "鏂板鍑哄満锛堝簾寮冿級" , description = "鏂板鍑哄満锛堝簾寮冿級" )
public Object outPark(String carNo,Integer barrierId,Integer parkId,String code2) {
String s = "寮�濮嬫墽琛屽嚭鍦烘帴鍙�------>\n";
Barrier barrier1 = findBarrier(code2);
@@ -248,6 +264,7 @@
}
@GetMapping("/statisticParkOrder/count")
+ @Operation(summary = "缁熻鐢ㄦ埛绠＄悊鐨勫仠杞﹀満璁㈠崟鏁伴噺" , description = "缁熻鐢ㄦ埛绠＄悊鐨勫仠杞﹀満璁㈠崟鏁伴噺" )
public R statisticParkOrder(String parkIds) {
Map<String,Object> resultMap = new HashMap<>();
if(StringUtils.isNotBlank(parkIds)){
@@ -284,6 +301,7 @@
}
@GetMapping("/isJS")
+ @Operation(summary = "鍍靛案杞︽煡璇�" , description = "鍍靛案杞︽煡璇�" )
public Object isJS(String carNo ,Integer parkId) {
List<EnterPark> byCarNo = enterParkService.findByCarNo(carNo, parkId);
if(byCarNo.size() > 0){
@@ -294,6 +312,7 @@
}
@GetMapping("/getByCarAndPark")
+ @Operation(summary = "鏍规嵁杞︾墝鍜屽仠杞﹀満鑾峰彇鏈�鏂板嚭鍦�" , description = "鏍规嵁杞︾墝鍜屽仠杞﹀満鑾峰彇鏈�鏂板嚭鍦�" )
public Object getByCarAndPark(String carNo ,Integer parkId) {
QueryWrapper<OutPark> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -313,7 +332,36 @@
return R.failed(null,"鏈壘鍒版暟鎹�");
}
}
+ //鎵爜淇敼鍑哄満锛堟ā绯婅溅鐗岋級
+ @GetMapping("/editOutPark")
+ public Object editOutPark(Integer outParkId,Integer enterParkId,Integer type) {
+ double money = 0.0;
+ OutPark outPark = outParkService.getById(outParkId);
+ EnterPark enterPark = enterParkService.getById(enterParkId);
+ if(type == 0){ //鍏ュ満姝ｇ‘锛屾浛鎹㈠嚭鍦猴紝鏇存柊鍑哄満璁板綍
+ outPark.setCarNo(enterPark.getCarNo());
+ }else { //鍑哄満姝ｇ‘锛屾浛鎹㈠叆鍦猴紝鏇存柊鍑哄満璁板綍
+ enterPark.setCarNo(outPark.getCarNo());
+ }
+ outPark.setEnterTime(enterPark.getCreateTime());
+ try {
+ long l = outPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli() - enterPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+ outPark.setTime(l/(1000*60));
+ money = costRuleService.getMoney(outPark.getParkId(), outPark.getEnterTime(), outPark.getCreateTime(), 1);
+ //鍏ュ満璁板綍淇濆瓨涓�涓�
+ enterPark.setPrice(money);
+ enterPark.setIsPay(0);
+ enterParkService.updateById(enterPark);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ outPark.setPrice(money);
+ outParkService.saveOrUpdate(outPark);
+ return R.ok(outPark,"鏇存柊鎴愬姛");
+ }
+
@GetMapping("/editEnterPark")
+ @Operation(summary = "淇敼鍏ュ満淇℃伅" , description = "淇敼鍏ュ満淇℃伅" )
public Object editEnterPark(String carNo ,Integer parkId,String time) {
QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -326,10 +374,34 @@
enterPark.setParkId(parkId);
enterPark.setBarrierId(list.get(0).getId());
enterPark.setStatus(0);
+ enterPark.setIsAdd(1);
enterPark.setIsPay(0);
- enterPark.setImgId(null);
enterParkService.saveOrUpdate(enterPark);
- return R.ok("淇敼鎴愬姛");
+
+ OutPark outPark = null;
+ QueryWrapper<OutPark> wrapper1 = new QueryWrapper<>();
+ wrapper1.lambda()
+ .eq(OutPark::getParkId,parkId)
+ .eq(OutPark::getCarNo,carNo)
+ .ge(OutPark::getCreateTime,enterPark.getCreateTime())
+ .ne(OutPark::getStatus,1);
+ List<OutPark> list1 = outParkService.list(wrapper1);
+ if(list1 !=null&&list1.size()>0){
+ outPark = list1.get(0);
+ outPark.setEnterTime(enterPark.getCreateTime());
+ long l = outPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli() - enterPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+ outPark.setTime(l/(1000*60));
+ try {
+ outPark.setPrice(costRuleService.getMoney(parkId, outPark.getEnterTime(), outPark.getCreateTime(), 1));
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ outParkService.saveOrUpdate(outPark);
+ return R.ok(null,"淇敼鍑哄満璁板綍鎴愬姛");
+ }else {
+ return R.ok(null,"鏂板鍏ュ満璁板綍鎴愬姛");
+ }
+
}
--
Gitblit v1.9.1