From 0dbcef10ee43cdab704ecf5e81fec50e884569e5 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期三, 16 十月 2024 15:14:18 +0800
Subject: [PATCH] fix:更新手机号入场
---
src/main/java/com/boying/controller/ParkController.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/boying/controller/ParkController.java b/src/main/java/com/boying/controller/ParkController.java
index 0a9ec02..d0568d0 100644
--- a/src/main/java/com/boying/controller/ParkController.java
+++ b/src/main/java/com/boying/controller/ParkController.java
@@ -1,16 +1,20 @@
package com.boying.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.boying.common.R;
+import com.boying.entity.EditParkNumLog;
import com.boying.entity.EnterPark;
import com.boying.entity.Park;
import com.boying.entity.User;
+import com.boying.service.EditParkNumLogService;
import com.boying.service.EnterParkService;
import com.boying.service.ParkService;
import com.boying.service.UserService;
+import com.boying.util.IpUtil;
import com.boying.util.RedisJsonUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +24,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -38,6 +44,7 @@
private final UserService userService;
private final RedisJsonUtil redisJsonUtil;
private final EnterParkService enterParkService;
+ private final EditParkNumLogService editParkNumLogService;
@PostMapping("/findPage")
public Object findPage(Page page) {
@@ -64,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("鍒犻櫎鎴愬姛");
}
@@ -145,8 +149,13 @@
}
}
@PostMapping("/editParkCarNum")
- public Object editParkCarNum(Park park) {
+ 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 {
@@ -154,11 +163,28 @@
redisTemplate.opsForValue().set("car_park_" + byId.getId(),park.getCarNum()+"",30, TimeUnit.DAYS);
redisTemplate.opsForValue().set("park_up_" + byId.getId(),"true",30, TimeUnit.DAYS);
parkService.updateById(byId);
+ String jsonValue = JSON.toJSONString(park);
+ redisTemplate.opsForValue().set("park-"+park.getId(), jsonValue);
+
+ String ipAddr = IpUtil.getIpAddr(request);
+ 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);
+
return R.ok(null,"淇敼鎴愬姛");
}
}
+
+
@PostMapping("/getParkCar")
public Object getParkCar(Page page, Integer parkId,String carNo) {
QueryWrapper<EnterPark> enterParkQueryWrapper = new QueryWrapper<>();
--
Gitblit v1.9.1