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 |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/boying/controller/ParkController.java b/src/main/java/com/boying/controller/ParkController.java
index fa9516c..469c0ea 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,10 +44,11 @@
     private final UserService userService;
     private final RedisJsonUtil redisJsonUtil;
     private final EnterParkService enterParkService;
+    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());
@@ -144,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 {
@@ -155,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