From 796963ea5cc81286aedde4f394b98e52b0b46e26 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 20 九月 2022 21:28:41 +0800
Subject: [PATCH] 增加日志
---
src/main/java/com/boying/controller/car/PlateServlet2.java | 17 ++++++++++++-----
src/main/java/com/boying/service/CostRuleService.java | 4 ++--
src/main/java/com/boying/controller/OutParkController.java | 11 ++++++++---
src/main/java/com/boying/controller/phone/FFPayController.java | 28 ++++++++++++++++++----------
4 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/boying/controller/OutParkController.java b/src/main/java/com/boying/controller/OutParkController.java
index b14b7b9..9dc9719 100644
--- a/src/main/java/com/boying/controller/OutParkController.java
+++ b/src/main/java/com/boying/controller/OutParkController.java
@@ -200,12 +200,14 @@
if(park != null){
num = park.getNum();
if(s !=null){
- if(Integer.parseInt(s) > num){
- return "null";
+ if(Integer.parseInt(s) >= num){
+ redisTemplate.opsForValue().set("park_up_" + parkId,"false",30, TimeUnit.DAYS);
+ return "false";
}
}else {
s= "0";
redisTemplate.opsForValue().set("car_park_" + parkId,s,30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
}
}
enterParkService.deleteByCarNo(carNo,parkId);
@@ -234,6 +236,7 @@
int i = Integer.parseInt(s);
i++;
redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
Barrier barrier = (Barrier) barrierService.findById(barrierId);
barrier.setType2(1);
@@ -266,7 +269,7 @@
}
String redis = redisTemplate.opsForValue().get("car_park_" + parkId);
long l = outPark.getCreateTime().getTime() - enterPark.getCreateTime().getTime();
- s+= "鍦哄唴鏃堕暱涓猴細"+l+"姣,鍚堣涓�: "+l/(1000*60)+"绉抃n";
+ s+= "鍦哄唴鏃堕暱涓猴細"+l+"姣,鍚堣涓�: "+l/(1000*60)+"鍒哱n";
outPark.setTime(l/(1000*60));
double money = 0;
try {
@@ -283,8 +286,10 @@
i--;
if(i<0){
redisTemplate.opsForValue().set("car_park_" + parkId,"0",30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
}else {
redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
}
Barrier barrier = (Barrier) barrierService.findById(barrierId);
diff --git a/src/main/java/com/boying/controller/car/PlateServlet2.java b/src/main/java/com/boying/controller/car/PlateServlet2.java
index aa197ed..8ebd595 100755
--- a/src/main/java/com/boying/controller/car/PlateServlet2.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet2.java
@@ -84,9 +84,12 @@
@PostMapping("/status")
public void heart(String serialno,HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException {
-
Barrier barrier = barrierService.findByCode(serialno);
-
+ Park park = (Park)parkService.findById(barrier.getParkId());
+ String redis = redisTemplate.opsForValue().get("park_up_" + park.getId());
+ if(StringUtil.isNullOrEmpty(redis) || redis.equals("false")){
+ return;
+ }
if(barrier!=null){
if(barrier.getType2()==1){
open(request,response);
@@ -115,7 +118,7 @@
@PostMapping("/PlateServlet")
protected void info(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String s= "";
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd-HH:mm:ss");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream(),"UTF-8"));
String str = "";
String lineStr = "";
@@ -242,12 +245,14 @@
if(park != null){
num = park.getNum();
if(s !=null){
- if(Integer.parseInt(s) > num){
+ if(Integer.parseInt(s) >= num){
+ redisTemplate.opsForValue().set("park_up_" + parkId,"false",30, TimeUnit.DAYS);
return;
}
}else {
s= "0";
redisTemplate.opsForValue().set("car_park_" + parkId,s,30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
}
}
enterParkService.deleteByCarNo(carNo,parkId);
@@ -292,7 +297,7 @@
EnterPark enterPark = enterParkService.findByCarNo(carNo).get(0);
if(enterPark==null){
- String s1 = "鏈彂鐜板叆鍦鸿溅杈嗭細"+carNo;
+ System.out.println(carNo+"鏈彂鐜板満鍐呰溅杈�");
}else{
outPark.setEnterTime(enterPark.getCreateTime());
}
@@ -313,8 +318,10 @@
i--;
if(i<0){
redisTemplate.opsForValue().set("car_park_" + parkId,"0",30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
}else {
redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
}
Barrier barrier = (Barrier) barrierService.findById(barrierId);
diff --git a/src/main/java/com/boying/controller/phone/FFPayController.java b/src/main/java/com/boying/controller/phone/FFPayController.java
index b0034e7..2b63c31 100644
--- a/src/main/java/com/boying/controller/phone/FFPayController.java
+++ b/src/main/java/com/boying/controller/phone/FFPayController.java
@@ -193,9 +193,10 @@
@PostMapping("result")
public String result(HttpServletRequest request,String payKey,String payerTypeCode,String payerNum,String payCode,Double amt,String status,String errorInfo,String sign,String signType) throws Exception{
System.out.println(payCode+"-------"+status);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH_mm_ss");
String s = "payCode===="+payCode+",\n";
try {
- s += "寮�濮嬭蛋鍥炶皟鎺ュ彛------>";
+ s += sdf.format(new Date())+"寮�濮嬭蛋鍥炶皟鎺ュ彛------>\n";
writeTxt(s);
updateOrderRecord(payCode,status);
}catch (Exception e){
@@ -207,7 +208,8 @@
//鏇存柊璁㈠崟璁板綍
public void updateOrderRecord(String payCode,String status){
- String s = "鏇存柊璁㈠崟璁板綍锛歱ayCode===="+payCode+",status==="+status+",\n";
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH_mm_ss");
+ String s = sdf.format(new Date())+"鏇存柊璁㈠崟璁板綍锛歱ayCode===="+payCode+",status==="+status+",\n";
Specification<OrderRecord> specification = new Specification<OrderRecord>() {
@Override
public Predicate toPredicate(Root<OrderRecord> root, CriteriaQuery<?> cq, CriteriaBuilder cb) {
@@ -215,12 +217,13 @@
list.add(cb.equal(root.get("payCode").as(String.class), payCode));
Predicate[] arr = new Predicate[list.size()];
cq.where(list.toArray(arr));
+ cq.orderBy(cb.desc(root.get("createTime")));
return null;
}
};
List<OrderRecord> all = orderRecordService.findAll(specification);
s += "鏌ヨ鍒拌鍗曡褰曚负锛�"+all.size()+"鏉★紝\n";
- if(all.size()==1){
+ if(all.size()>=1){
OrderRecord orderRecord = all.get(0);
s += "鏌ヨ鍒拌鍗曚负锛�"+orderRecord.getId()+"锛孿n";
if(status.equals("01")){
@@ -319,9 +322,9 @@
// }
public void updateOutPark(Long outParkId,String status){
- String s = "寮�濮嬩慨鏀瑰嚭鍦鸿〃-----銆�,\n";
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH_mm_ss");
+ String s = sdf.format(new Date())+"寮�濮嬩慨鏀瑰嚭鍦鸿〃-----銆媆n";
s+= "outparkId==="+outParkId+",status==="+status+",\n";
- writeTxt(s);
OutPark outPark = (OutPark) outParkService.findById(outParkId);
if(outPark!=null){
s += "鎵惧埌鍑哄満鏁版嵁锛�"+outPark.getId()+",\n";
@@ -332,9 +335,11 @@
outPark.setStatus(1);
outParkService.save(outPark);
}
+ }else {
+ s += "鏈壘鍒板嚭鍦烘暟鎹�-----銆�";
+ writeTxt(s);
}
- s += "鏈壘鍒板嚭鍦烘暟鎹�-----銆�";
- writeTxt(s);
+
}
//鍒犻櫎杩涘仠杞﹀満鐨勬暟鎹�
@@ -358,8 +363,9 @@
//鐢熸垚鐢靛瓙缂存鐮�
@PostMapping("park")
public Object park(Long id){
- String logs = "寮�濮嬬即璐规祦绋�------銆�";
- logs += "鍑哄満id涓猴細"+id+",\n";
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
+ String logs = sdf.format(new Date())+"寮�濮嬫壂鐮佺即璐�------銆媆n";
+ logs += "鍑哄満琛╥d涓猴細"+id+",\n";
OutPark outPark = (OutPark) outParkService.findById(id);
if(outPark.getPrice()==0){
updateOutPark(outPark.getId(),"03");
@@ -408,7 +414,8 @@
s.append("&payKey=df937eda27cb4a59a12347966678e232");//璐㈡斂缁欑殑
s.append("&payerName="+outPark.getCarNo());
s.append("&payerNum="+ outPark.getCode());//璁㈠崟鍙�
- s.append("&payerTypeCode=1304062100000001");////璐㈡斂缁欑殑
+ //s.append("&payerTypeCode=1304062100000001");////璐㈡斂缁欑殑
+ s.append("&payerTypeCode=072101");////璐㈡斂缁欑殑
s.append("&reserve1=");
s.append("&reserve2=");
s.append("&reserve3=");
@@ -459,6 +466,7 @@
//鎻掑叆鍋滆溅璁㈠崟璁板綍
public void addOrderRecord(OutPark outPark){
Park park = (Park) parkService.findById(outPark.getParkId());
+
OrderRecord orderRecord = new OrderRecord();
orderRecord.setAddress(park.getName());
orderRecord.setCarNo(outPark.getCarNo());
diff --git a/src/main/java/com/boying/service/CostRuleService.java b/src/main/java/com/boying/service/CostRuleService.java
index 352d51e..4a3816c 100644
--- a/src/main/java/com/boying/service/CostRuleService.java
+++ b/src/main/java/com/boying/service/CostRuleService.java
@@ -286,11 +286,11 @@
time = Long.valueOf(l / 30).intValue();
}
if(maxCost!=null){
- if(time*cost>maxCost){//澶т簬灏侀《浠锋牸
+ if(time*cost+1>maxCost){//澶т簬灏侀《浠锋牸
return maxCost;
}
}
- return time*cost;
+ return time*cost+1;
}
public static void main(String[] args) {
--
Gitblit v1.9.1