From f6125b320b78b36c439e85d926cb2b11cd71fc6c Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期六, 31 八月 2024 17:45:52 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
index dbe9c26..433728e 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
@@ -1,8 +1,18 @@
package com.ruoyi.chargingPile.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.chargingPile.api.model.TParkingLot;
+import com.ruoyi.chargingPile.api.model.TParkingRecord;
+import com.ruoyi.chargingPile.dto.ParkingRecordPageQuery;
+import com.ruoyi.chargingPile.service.TParkingLotService;
+import com.ruoyi.chargingPile.service.TParkingRecordService;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -15,6 +25,39 @@
@RestController
@RequestMapping("/t-parking-record")
public class TParkingRecordController {
+ @Resource
+ private TParkingRecordService parkingRecordService;
+ @Resource
+ private TParkingLotService parkingLotService;
+
+ @ApiOperation(tags = {"后台-订单管理-停车记录"},value = "列表")
+ @PostMapping(value = "/page")
+ public R<Page<TParkingRecord>> page(@RequestBody ParkingRecordPageQuery query) {
+ Page<TParkingRecord> page = parkingRecordService.lambdaQuery().ge(query.getStart() != null, TParkingRecord::getCreateTime, query.getStart())
+ .le(query.getEnd() != null, TParkingRecord::getCreateTime, query.getEnd())
+ .like(query.getLicensePlate() != null, TParkingRecord::getLicensePlate, query.getLicensePlate())
+ .eq(query.getStatus() != null, TParkingRecord::getStatus, query.getStatus())
+ .eq(query.getOutParkingType() != null, TParkingRecord::getOutParkingType, query.getOutParkingType())
+ .page(Page.of(query.getPageCurr(), query.getPageSize()));
+
+ for (TParkingRecord record : page.getRecords()) {
+ record.setName(parkingLotService.getById(record.getParkingLotId()).getName());
+ record.setUid(record.getId().toString());
+ }
+ return R.ok(page);
+ }
+
+ @ApiOperation(tags = {"后台-订单管理-停车记录"},value = "出场")
+ @GetMapping(value = "/out")
+ public R out(Long id) {
+ TParkingRecord byId = parkingRecordService.getById(id);
+ byId.setStatus(2);
+ parkingRecordService.updateById(byId);
+ return R.ok();
+
+ }
+
+
}
--
Gitblit v1.7.1