From f9a85d68b1a08b03753d297f76bd4e87bb4d2b3e Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期四, 11 四月 2024 14:42:26 +0800
Subject: [PATCH] fix：手动抬杆接口更新
---
src/main/java/com/boying/controller/BarrierController.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/boying/controller/BarrierController.java b/src/main/java/com/boying/controller/BarrierController.java
index 473bb8f..8fb48d4 100644
--- a/src/main/java/com/boying/controller/BarrierController.java
+++ b/src/main/java/com/boying/controller/BarrierController.java
@@ -5,7 +5,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.boying.common.R;
import com.boying.entity.Barrier;
+import com.boying.entity.BarrierOpenLog;
import com.boying.entity.OutPark;
+import com.boying.service.BarrierOpenLogService;
import com.boying.service.BarrierService;
import com.boying.service.OutParkService;
import com.boying.service.ParkService;
@@ -19,6 +21,7 @@
import java.io.IOException;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
+import java.time.temporal.ChronoUnit;
import java.util.List;
@RestController
@@ -27,9 +30,10 @@
public class BarrierController {
private final BarrierService barrierService;
+ private final BarrierOpenLogService barrierOpenLogService;
private final OutParkService outParkService;
private final ParkService parkService;
- private StringRedisTemplate redisTemplate;
+ private final StringRedisTemplate redisTemplate;
@PostMapping("findPage")
@@ -40,9 +44,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>25000){
+ long between = ChronoUnit.SECONDS.between(barrier.getUpdateTime(), LocalDateTime.now());
+ if(between>121){
barrier.setStatus(1);
}
}
@@ -113,7 +116,7 @@
@PostMapping("openBarrier")
- public Object openBarrier(Long barrierId,Integer type) {
+ public Object openBarrier(Long barrierId,Integer type,String carNo,String remark) {
Barrier b= barrierService.getById(barrierId);
if (b==null) {
return R.failed("鏈壘鍒拌閬撻椄");
@@ -127,6 +130,12 @@
try {
String jsonValue = JSON.toJSONString(b);
redisTemplate.opsForValue().set("barrier-"+b.getCode(), jsonValue);
+ BarrierOpenLog barrierOpenLog = new BarrierOpenLog();
+ barrierOpenLog.setCarNo(carNo);
+ barrierOpenLog.setRemark(remark);
+ barrierOpenLog.setParkId(b.getParkId());
+ barrierOpenLog.setType(b.getType());
+ barrierOpenLogService.save(barrierOpenLog);
} catch (Exception e) {
e.printStackTrace();
}
@@ -148,6 +157,12 @@
try {
String jsonValue = JSON.toJSONString(b);
redisTemplate.opsForValue().set("barrier-"+b.getCode(), jsonValue);
+ BarrierOpenLog barrierOpenLog = new BarrierOpenLog();
+ barrierOpenLog.setCarNo(carNo);
+ barrierOpenLog.setRemark(remark);
+ barrierOpenLog.setParkId(b.getParkId());
+ barrierOpenLog.setType(b.getType());
+ barrierOpenLogService.save(barrierOpenLog);
} catch (Exception e) {
e.printStackTrace();
}
@@ -160,6 +175,12 @@
try {
String jsonValue = JSON.toJSONString(b);
redisTemplate.opsForValue().set("barrier-"+b.getCode(), jsonValue);
+ BarrierOpenLog barrierOpenLog = new BarrierOpenLog();
+ barrierOpenLog.setCarNo(carNo);
+ barrierOpenLog.setRemark(remark);
+ barrierOpenLog.setParkId(b.getParkId());
+ barrierOpenLog.setType(b.getType());
+ barrierOpenLogService.save(barrierOpenLog);
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.1