From 005f6c2bdea7038cd319dc6dad980428dc897216 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期日, 07 四月 2024 17:36:29 +0800
Subject: [PATCH] fix：出场车辆新增判断是否支付过的接口
---
src/main/java/com/boying/controller/BarrierController.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/boying/controller/BarrierController.java b/src/main/java/com/boying/controller/BarrierController.java
index 478572e..84e5ce0 100644
--- a/src/main/java/com/boying/controller/BarrierController.java
+++ b/src/main/java/com/boying/controller/BarrierController.java
@@ -1,5 +1,6 @@
package com.boying.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.boying.common.R;
@@ -10,6 +11,7 @@
import com.boying.service.ParkService;
import com.boying.util.RedisJsonUtil;
import lombok.RequiredArgsConstructor;
+import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -17,6 +19,7 @@
import java.io.IOException;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
+import java.time.temporal.ChronoUnit;
import java.util.List;
@RestController
@@ -27,7 +30,8 @@
private final BarrierService barrierService;
private final OutParkService outParkService;
private final ParkService parkService;
- private final RedisJsonUtil redisJsonUtil;
+ private StringRedisTemplate redisTemplate;
+
@PostMapping("findPage")
public Object findPage(Page page, String parkId) {
@@ -37,9 +41,8 @@
Page page1 = barrierService.page(page, wrapper);
List<Barrier> records = page1.getRecords();
for(Barrier barrier:records){
- long l = System.currentTimeMillis() - barrier.getUpdateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli();
- System.out.println(l);
- if(l>10000){
+ long between = ChronoUnit.SECONDS.between(barrier.getUpdateTime(), LocalDateTime.now());
+ if(between>121){
barrier.setStatus(1);
}
}
@@ -52,8 +55,9 @@
barrier.setUpdateTime(LocalDateTime.now());
barrierService.saveOrUpdate(barrier);
try {
- redisJsonUtil.set("barrier-"+barrier.getCode(),barrier);
- } catch (IOException e) {
+ String jsonValue = JSON.toJSONString(barrier);
+ redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue);
+ } catch (Exception e) {
e.printStackTrace();
}
return R.ok("淇濆瓨鎴愬姛");
@@ -63,7 +67,7 @@
public Object delete(Integer id) {
Barrier byId = barrierService.getById(id);
barrierService.removeById(id);
- redisJsonUtil.del("barrier-"+byId.getCode());
+ redisTemplate.delete("barrier-"+byId.getCode());
return R.ok("鍒犻櫎鎴愬姛");
}
@@ -88,8 +92,9 @@
b.setUpdateTime(LocalDateTime.now());
barrierService.saveOrUpdate(b);
try {
- redisJsonUtil.set("barrier-"+b.getCode(),b);
- } catch (IOException e) {
+ String jsonValue = JSON.toJSONString(b);
+ redisTemplate.opsForValue().set("barrier-"+b.getCode(), jsonValue);
+ } catch (Exception e) {
e.printStackTrace();
}
return R.ok("璇锋眰鎴愬姛");
@@ -120,8 +125,9 @@
b.setUpdateTime(LocalDateTime.now());
barrierService.saveOrUpdate(b);
try {
- redisJsonUtil.set("barrier-"+b.getCode(),b);
- } catch (IOException e) {
+ String jsonValue = JSON.toJSONString(b);
+ redisTemplate.opsForValue().set("barrier-"+b.getCode(), jsonValue);
+ } catch (Exception e) {
e.printStackTrace();
}
return R.ok("璇锋眰鎴愬姛");
@@ -140,8 +146,9 @@
b.setUpdateTime(LocalDateTime.now());
barrierService.saveOrUpdate(b);
try {
- redisJsonUtil.set("barrier-"+b.getCode(),b);
- } catch (IOException e) {
+ String jsonValue = JSON.toJSONString(b);
+ redisTemplate.opsForValue().set("barrier-"+b.getCode(), jsonValue);
+ } catch (Exception e) {
e.printStackTrace();
}
return R.ok("璇锋眰鎴愬姛");
@@ -151,8 +158,9 @@
b.setUpdateTime(LocalDateTime.now());
barrierService.saveOrUpdate(b);
try {
- redisJsonUtil.set("barrier-"+b.getCode(),b);
- } catch (IOException e) {
+ String jsonValue = JSON.toJSONString(b);
+ redisTemplate.opsForValue().set("barrier-"+b.getCode(), jsonValue);
+ } catch (Exception e) {
e.printStackTrace();
}
return R.ok("璇锋眰鎴愬姛");
--
Gitblit v1.9.1