From 5d7c58dfa04648e5831a66a87597ccb5581a7f16 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期四, 30 三月 2023 15:13:03 +0800
Subject: [PATCH] 默认变更列表
---
src/main/java/com/boying/service/impl/BarrierServiceImpl.java | 15 ++++++---------
src/main/java/com/boying/controller/car/PlateServlet3.java | 3 +++
src/main/java/com/boying/controller/WhiteListController.java | 2 +-
src/main/java/com/boying/controller/phone/YCPayController.java | 16 +++++++++++++---
4 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/boying/controller/WhiteListController.java b/src/main/java/com/boying/controller/WhiteListController.java
index f158db6..e4d27a3 100644
--- a/src/main/java/com/boying/controller/WhiteListController.java
+++ b/src/main/java/com/boying/controller/WhiteListController.java
@@ -45,7 +45,7 @@
.eq(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo);
Page<WhiteList> page1 = whiteListService.page(page, wrapper);
for (WhiteList record : page1.getRecords()) {
- if(record.getParkIds() != null){
+ if(StringUtils.isNotBlank(record.getParkIds())){
String s = "";
String parkIds = record.getParkIds();
String[] split = parkIds.split(",");
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index 8e6023b..5115a1e 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -558,6 +558,7 @@
public void outLedShow(String ledId,String carNo,Double price,String timeStamp,Integer parkId,HttpServletRequest request, HttpServletResponse response,int type) throws ServletException, IOException {
String redisnum = redisTemplate.opsForValue().get("car_park_" + parkId);
+ Park park = parkService.getById(parkId);
LedBean ledBean = new LedBean();
ledBean.setcolor1(0);
ledBean.setcolor2(0);
@@ -580,6 +581,7 @@
if(type == 0){
//寮�闂�
open(request,response,data1);
+ redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS);
int i = Integer.parseInt(redisnum);
i--;
if(i<0){
@@ -619,6 +621,7 @@
if(type == 0){
//寮�闂�
open(request,response,data1);
+ redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS);
int i = Integer.parseInt(redisnum);
i--;
if(i<0){
diff --git a/src/main/java/com/boying/controller/phone/YCPayController.java b/src/main/java/com/boying/controller/phone/YCPayController.java
index 8d18b3b..53481b7 100644
--- a/src/main/java/com/boying/controller/phone/YCPayController.java
+++ b/src/main/java/com/boying/controller/phone/YCPayController.java
@@ -6,6 +6,7 @@
import com.boying.common.SystemConfigProperties;
import com.boying.entity.*;
import com.boying.service.*;
+import com.boying.util.DateUtilOther;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -44,7 +45,13 @@
*/
@GetMapping("/getByQueryId")
public Object getByQueryId(Long queryId){
+ if(queryId == null){
+ return R.failed("鍙傛暟涓虹┖");
+ }
OutPark byId = outParkService.getById(queryId);
+ if(byId.getTime() > 0){
+ byId.setTimeStr(DateUtilOther.millisToDayHrMinSec(new Double(byId.getTime()).longValue()));
+ }
return R.ok(byId,"璇锋眰鎴愬姛");
}
@@ -80,7 +87,10 @@
}
}
if(outPark.getStatus() == 0){
- return R.ok("璺宠浆閭偍鏀粯", "https://hbfs.govpay.ccb.com/online/fssm?fee=130000000001&PyfScnCgycd=01&pyfTpcd=3&BNo="+outPark.getPayCode());
+// return R.ok("璺宠浆閭偍鏀粯", "https://hbfs.govpay.ccb.com/online/fssm?fee=130000000001&PyfScnCgycd=01&pyfTpcd=3&BNo="+outPark.getPayCode());
+ // return R.ok("璺宠浆閭偍鏀粯", "http://wxtest.smeia.cn/h5/?appid=CUP11234601101¶ms={\"payMode\":\"B\",\"payItemNo\":\"41301106100124\",\"userNo\":"+id+"}");
+ return R.ok("璺宠浆閭偍鏀粯", "http://wxtest.smeia.cn/h5/static/router.html?rurl=router&router=psbc&appid=CUP16522400671¶ms={\"payMode\":\"B\",\"payItemNo\":\"41301106100124\",\"userNo\":"+id+"}");
+
}else if(outPark.getStatus() == 1){
return R.failed("宸茬即璐�");
}else {
@@ -102,7 +112,7 @@
//淇敼璁㈠崟鐘舵�� 0鎴愬姛
if(success==0){
updateOrderRecord(queryId,"03");
- return R.ok(null,"璇锋眰鎴愬姛");
+ return R.ok(null,"鍥炶皟鎴愬姛");
}else {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
String logs = sdf.format(new Date())+" 鍑哄満id涓猴細"+queryId+",缂磋垂澶辫触------銆媆n";
@@ -110,7 +120,7 @@
writeTxt(logs);
}
}
- return R.ok(byId,"璇锋眰鎴愬姛");
+ return R.ok(byId,"鍥炶皟鎴愬姛");
}
/**
diff --git a/src/main/java/com/boying/service/impl/BarrierServiceImpl.java b/src/main/java/com/boying/service/impl/BarrierServiceImpl.java
index 26419ed..20542d9 100644
--- a/src/main/java/com/boying/service/impl/BarrierServiceImpl.java
+++ b/src/main/java/com/boying/service/impl/BarrierServiceImpl.java
@@ -21,6 +21,7 @@
import java.time.ZoneId;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* @author kdq
@@ -62,16 +63,12 @@
return true;
}else {
//鍒ゆ柇鍋滆溅鍦烘槸鍚︽湁浜嗚溅浣�
- String num = redisTemplate.opsForValue().get("car_park_" + enterPark.getParkId());
- if(num == null){
- num = "0";
- }
- Park byId = parkMapper.selectById(enterPark.getParkId());
- int i = byId.getNum() - Integer.parseInt(num);
- if(i<=0){
- return false;
- }else {
+ String s = redisTemplate.opsForValue().get("park_change_in_" + enterPark.getParkId());
+ if("true".equals(s)){
+ redisTemplate.opsForValue().set("park_change_in_"+enterPark.getParkId(),"false",1, TimeUnit.DAYS);
return true;
+ }else {
+ return false;
}
}
--
Gitblit v1.9.1