From 40ee19ff497599b6af52593dbdf5101886f6d7e9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 09 九月 2024 10:38:43 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/BaseResponse.java | 4
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/TParkingRecordVO.java | 23 +++++++
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java | 12 +++
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/TParkingRecordPageInfoVO.java | 31 ++++++++++
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/OfflineParkingResponse.java | 36 ++++++++++++
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/query/ParkingRecordQuery.java | 21 +++++++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java | 11 +++
7 files changed, 134 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/query/ParkingRecordQuery.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/query/ParkingRecordQuery.java
new file mode 100644
index 0000000..38121cc
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/query/ParkingRecordQuery.java
@@ -0,0 +1,21 @@
+package com.ruoyi.chargingPile.api.query;
+
+import com.ruoyi.common.core.query.TimeRangePageQuery;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "停车缴费订单Query")
+public class ParkingRecordQuery extends TimeRangePageQuery {
+
+ @ApiModelProperty(value = "站点id")
+ private Integer siteId;
+
+ @ApiModelProperty(value = "订单编号")
+ private String code;
+
+ @ApiModelProperty(value = "车牌号")
+ private String licensePlate;
+
+}
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/TParkingRecordPageInfoVO.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/TParkingRecordPageInfoVO.java
new file mode 100644
index 0000000..e27db5c
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/TParkingRecordPageInfoVO.java
@@ -0,0 +1,31 @@
+package com.ruoyi.chargingPile.api.vo;
+
+import com.ruoyi.common.core.web.page.PageInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "停车记录分页VO")
+public class TParkingRecordPageInfoVO implements Serializable {
+
+ @ApiModelProperty(value = "订单数")
+ private Integer orderCount;
+
+ @ApiModelProperty(value = "超时占位费")
+ private BigDecimal timeoutAmountSum;
+
+ @ApiModelProperty(value = "超时占用时长")
+ private Integer feeDurationSum;
+
+ @ApiModelProperty(value = "总占用时长")
+ private Integer parkingDurationSum;
+
+ @ApiModelProperty(value = "列表")
+ private PageInfo<TParkingRecordVO> parkingRecordVOS;
+
+
+}
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/TParkingRecordVO.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/TParkingRecordVO.java
new file mode 100644
index 0000000..623192c
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/TParkingRecordVO.java
@@ -0,0 +1,23 @@
+package com.ruoyi.chargingPile.api.vo;
+
+import com.ruoyi.chargingPile.api.model.TParkingRecord;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "停车记录VO")
+public class TParkingRecordVO extends TParkingRecord {
+
+ @ApiModelProperty(value = "停车费")
+ private BigDecimal parkingFee;
+
+ @ApiModelProperty(value = "收费时长")
+ private Integer feeDuration;
+
+ @ApiModelProperty(value = "站点名称")
+ private String siteName;
+
+}
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 ad1d1f3..b34c051 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
@@ -5,12 +5,16 @@
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.api.query.ParkingRecordQuery;
import com.ruoyi.chargingPile.api.vo.GetParkingRecord;
+import com.ruoyi.chargingPile.api.vo.TParkingRecordPageInfoVO;
+import com.ruoyi.chargingPile.api.vo.TParkingRecordVO;
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 com.ruoyi.common.core.web.page.PageInfo;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -49,6 +53,13 @@
return R.ok(page);
}
+ @ApiOperation(tags = {"后台-订单管理-停车记录"},value = "停车缴费订单列表")
+ @PostMapping(value = "/pageList")
+ public R<PageInfo<TParkingRecordPageInfoVO>> pageList(@RequestBody ParkingRecordQuery query) {
+
+ return R.ok();
+ }
+
@ApiOperation(tags = {"后台-订单管理-停车记录"},value = "详情")
@GetMapping(value = "/detail")
public R<TParkingRecord> detail(Long id) {
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java
index 75ec902..e37685a 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java
@@ -63,7 +63,11 @@
@PostMapping("/offlineParkingInOrder")
public BaseResponse offlineParkingInOrder(@RequestBody OfflineParkingOrder order){
parkingOrderService.offlineParkingInOrder(order);
- return BaseResponse.ok();
+ OfflineParkingResponse offlineParkingResponse = new OfflineParkingResponse();
+ offlineParkingResponse.setCode(0);
+ offlineParkingResponse.setTakeover(0);
+ offlineParkingResponse.setIsfree(false);
+ return offlineParkingResponse;
}
@@ -75,7 +79,11 @@
@PostMapping("/offlineParkingOutOrder")
public BaseResponse offlineParkingOutOrder(@RequestBody OfflineParkingOrder order){
parkingOrderService.offlineParkingOutOrder(order);
- return BaseResponse.ok();
+ OfflineParkingResponse offlineParkingResponse = new OfflineParkingResponse();
+ offlineParkingResponse.setCode(0);
+ offlineParkingResponse.setTakeover(0);
+ offlineParkingResponse.setIsfree(false);
+ return offlineParkingResponse;
}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/BaseResponse.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/BaseResponse.java
index 139b51a..8f63c73 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/BaseResponse.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/BaseResponse.java
@@ -9,7 +9,7 @@
@Data
public class BaseResponse<T> {
- private String code;
+ private Integer code;
private String msg;
@@ -23,7 +23,7 @@
public static <T> BaseResponse<T> ok(T data){
BaseResponse baseResponse = new BaseResponse();
- baseResponse.setCode("0");
+ baseResponse.setCode(0);
baseResponse.setData(data);
baseResponse.setMsg("成功");
return baseResponse;
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/OfflineParkingResponse.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/OfflineParkingResponse.java
new file mode 100644
index 0000000..9b016e6
--- /dev/null
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/OfflineParkingResponse.java
@@ -0,0 +1,36 @@
+package com.ruoyi.integration.barrierGate.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/9/6 15:10
+ */
+@Data
+public class OfflineParkingResponse extends BaseResponse{
+ /**
+ * 0、正常流程（opendoor、led、sound 无效）,1、流程接
+ * 管（opendoor、led、sound 生效）软件不再进行后续流
+ * 程
+ */
+ private Integer takeover;
+ /**
+ * 1、开闸，0、不开闸
+ */
+ private Integer opendoor;
+ /**
+ * 对于显示到 LED 上的每一行信息
+ */
+ private List<String> led;
+ /**
+ * 语音播报内容
+ */
+ private String sound;
+ /**
+ * 是否免费（不接管的情况下）
+ */
+ private Boolean isfree;
+
+}
--
Gitblit v1.7.1