From 80cacfd0dcee0174f2a8d9ae322a2fcf857cef63 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 04 十二月 2024 15:31:35 +0800
Subject: [PATCH] fix ： 新增修改出场接口
---
src/main/java/com/boying/controller/ParkController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/boying/controller/ParkController.java b/src/main/java/com/boying/controller/ParkController.java
index fa312ac..469c0ea 100644
--- a/src/main/java/com/boying/controller/ParkController.java
+++ b/src/main/java/com/boying/controller/ParkController.java
@@ -1,7 +1,6 @@
package com.boying.controller;
-import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -18,7 +17,6 @@
import com.boying.util.IpUtil;
import com.boying.util.RedisJsonUtil;
import lombok.RequiredArgsConstructor;
-import org.apache.catalina.security.SecurityUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.web.bind.annotation.GetMapping;
@@ -26,7 +24,6 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.time.LocalDateTime;
@@ -50,8 +47,8 @@
private final EditParkNumLogService editParkNumLogService;
@PostMapping("/findPage")
- public Object findPage(Page page) {
- Page page1 = parkService.page(page, new QueryWrapper<Park>().lambda().orderByDesc(Park::getId));
+ public Object findPage(Page page,Park park) {
+ Page page1 = parkService.page(page, new QueryWrapper<Park>().lambda().eq(park.getId()!=null,Park::getId,park.getId()).orderByDesc(Park::getId));
List<Park> records = page1.getRecords();
for (Park record : records) {
String num = redisTemplate.opsForValue().get("car_park_" + record.getId());
@@ -74,18 +71,15 @@
redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS);
redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
}
- try {
- redisJsonUtil.set("park-"+park.getId(), park);
- } catch (IOException e) {
- e.printStackTrace();
- }
+ String jsonValue = JSON.toJSONString(park);
+ redisTemplate.opsForValue().set("park-"+park.getId(), jsonValue);
return R.ok("淇濆瓨鎴愬姛");
}
@PostMapping("/delete")
public Object delete(Long id) {
parkService.removeById(id);
- redisJsonUtil.del("park-"+id);
+ redisTemplate.delete("park-"+id);
return R.ok("鍒犻櫎鎴愬姛");
}
@@ -157,6 +151,11 @@
@PostMapping("/editParkCarNum")
public Object editParkCarNum(HttpServletRequest request, Park park) {
Park byId = parkService.getById(park.getId());
+ int num = byId.getNum();
+ String old = redisTemplate.opsForValue().get("car_park_" + byId.getId());
+ if(old==null){
+ old="0";
+ }
if(byId == null){
return R.failed("鏈煡璇㈠埌璇ュ仠杞﹀満");
}else {
@@ -168,12 +167,13 @@
redisTemplate.opsForValue().set("park-"+park.getId(), jsonValue);
String ipAddr = IpUtil.getIpAddr(request);
- int num = byId.getNum();
int newNum = park.getNum();
EditParkNumLog numLog = new EditParkNumLog();
numLog.setIp(ipAddr);
numLog.setNum(num);
+ numLog.setUseNum(Integer.parseInt(old));
numLog.setNewNum(newNum);
+ numLog.setNewUseNum(park.getCarNum());
numLog.setParkName(byId.getName());
numLog.setCreateTime(LocalDateTime.now());
editParkNumLogService.save(numLog);
--
Gitblit v1.9.1