From 2a061460022dcdc2e9433c85ed4a752e621a14f3 Mon Sep 17 00:00:00 2001 From: kongdeqiang <123456> Date: 星期四, 26 九月 2024 17:13:24 +0800 Subject: [PATCH] fix : 新增修改车数日志 --- src/main/java/com/boying/entity/EditParkNumLog.java | 8 ++++++++ src/main/java/com/boying/controller/ParkController.java | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/boying/controller/ParkController.java b/src/main/java/com/boying/controller/ParkController.java index fa9516c..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) { @@ -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); diff --git a/src/main/java/com/boying/entity/EditParkNumLog.java b/src/main/java/com/boying/entity/EditParkNumLog.java index 8fc3a89..0882d7c 100644 --- a/src/main/java/com/boying/entity/EditParkNumLog.java +++ b/src/main/java/com/boying/entity/EditParkNumLog.java @@ -36,10 +36,18 @@ @Column(columnDefinition = "int comment '鍘熻溅浣嶆暟'") private int num; + @ApiModelProperty(value = "浣跨敤杞︿綅鏁�") + @Column(columnDefinition = "int comment '浣跨敤杞︿綅鏁�'") + private int useNum; + @ApiModelProperty(value = "鏂拌溅浣嶆暟") @Column(columnDefinition = "int comment '鏂拌溅浣嶆暟'") private int newNum; + @ApiModelProperty(value = "鏂颁娇鐢ㄨ溅浣嶆暟") + @Column(columnDefinition = "int comment '鏂颁娇鐢ㄨ溅浣嶆暟'") + private int newUseNum; + @ApiModelProperty(value = "鍋滆溅鍦哄悕绉�") @Column(columnDefinition = "varchar(100) comment '鍋滆溅鍦哄悕绉�'") private String parkName; -- Gitblit v1.9.1