From 18087f533cd48ddb9f972c0848ffe920ec58ee8e Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 26 九月 2022 16:01:14 +0800
Subject: [PATCH] 修改打包和app
---
src/main/java/com/boying/controller/BarrierController.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/boying/controller/BarrierController.java b/src/main/java/com/boying/controller/BarrierController.java
index fd8ea6b..4324835 100644
--- a/src/main/java/com/boying/controller/BarrierController.java
+++ b/src/main/java/com/boying/controller/BarrierController.java
@@ -7,19 +7,19 @@
import com.boying.common.util.DateUtil;
import com.boying.common.util.HttpUtil;
import com.boying.common.util.StringUtil;
-import com.boying.entity.Barrier;
-import com.boying.entity.EnterPark;
-import com.boying.entity.Park;
-import com.boying.entity.User;
+import com.boying.entity.*;
import com.boying.service.BarrierService;
import com.boying.service.EnterParkService;
+import com.boying.service.OutParkService;
import com.boying.service.ParkService;
+import io.netty.util.internal.ObjectUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -40,6 +40,8 @@
private BarrierService barrierService;
@Autowired
private SystemConfigProperties systemConfigProperties;
+ @Autowired
+ private OutParkService outParkService;
@PostMapping("findPage")
public Object findPage(int page,int pageSize,String parkId) {
@@ -125,4 +127,37 @@
barrierService.save(b);
return success("璇锋眰鎴愬姛");
}
+
+ @PostMapping("openBarrier")
+ public Object openBarrier(Long barrierId,Integer type) {
+ Barrier b= (Barrier) barrierService.findById(barrierId);
+ if (b==null) {
+ return error("鏈壘鍒拌閬撻椄");
+ }else {
+ if(b.getType() == 1){
+ //鍏ュ彛闂革紝鐩存帴寮�鍚�
+ b.setType2(1);
+ barrierService.save(b);
+ return success("璇锋眰鎴愬姛");
+ }else {
+ //鍑哄彛闂革紝鍒ゆ柇鐘舵��
+ if(type == null || type == 0){
+ //鍙栨秷璁¤垂
+ OutPark outPark = outParkService.findByCarNoAndBarrierId(b.getCarNo(), b.getId());
+ if(outPark != null){
+ outPark.setPrice(0);
+ outParkService.save(outPark);
+ }
+ b.setType2(1);
+ barrierService.save(b);
+ return success("璇锋眰鎴愬姛");
+ }else {
+ //璁¤垂
+ b.setType2(1);
+ barrierService.save(b);
+ return success("璇锋眰鎴愬姛");
+ }
+ }
+ }
+ }
}
--
Gitblit v1.9.1