Merge remote-tracking branch 'origin/master'

gather-app/src/main/java/com/ruoyi/database/controller/ParkingLotOrderInfoController.java

@@ -0,0 +1,56 @@
+package com.ruoyi.database.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.database.domain.ParkingLotOrderInfo;
+import com.ruoyi.database.service.ParkingLotOrderInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RequestMapping("/ParkingLotOrderInfo")
+@Api(tags = "订单管理")
+@RestController
+@RequiredArgsConstructor
+public class ParkingLotOrderInfoController extends BaseController {
+
+    private final ParkingLotOrderInfoService parkingLotOrderInfoService;
+
+    @GetMapping
+    @ApiOperation("查询订单管理")
+    public TableDataInfo<ParkingLotOrderInfo> list(ParkingLotOrderInfo parkingLotOrderInfo) {
+        startPage();
+        QueryWrapper<ParkingLotOrderInfo> queryWrapper = new QueryWrapper<>(parkingLotOrderInfo);
+        List<ParkingLotOrderInfo> list = parkingLotOrderInfoService.list(queryWrapper);
+        long size = parkingLotOrderInfoService.count(queryWrapper);
+        return getDataTableEnhance(list,size);
+    }
+
+    @PostMapping
+    @ApiOperation("新增订单管理")
+    @Log(title = "订单管理表", businessType = BusinessType.INSERT)
+    public AjaxResult insert(@RequestBody ParkingLotOrderInfo parkingLotOrderInfo) {
+        return toAjax(parkingLotOrderInfoService.save(parkingLotOrderInfo));
+    }
+
+    @PutMapping
+    @ApiOperation("修改订单管理")
+    @Log(title = "订单管理表", businessType = BusinessType.UPDATE)
+    public AjaxResult update(@RequestBody ParkingLotOrderInfo parkingLotOrderInfo) {
+        return toAjax(parkingLotOrderInfoService.updateById(parkingLotOrderInfo));
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除订单管理")
+    @Log(title = "订单管理表", businessType = BusinessType.DELETE)
+    public AjaxResult delete(@RequestParam("idList") List<Long> idList) {
+        return toAjax(parkingLotOrderInfoService.removeByIds(idList));
+    }
+}

gather-app/src/main/java/com/ruoyi/database/domain/CustomerPlateNoInfo.java

@@ -0,0 +1,87 @@
+package com.ruoyi.database.domain;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 客户车牌绑定表(CustomerPlateNoInfo)实体类
+ *
+ * @author makejava
+ * @since 2025-11-20 08:57:43
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName(value = "customer_plate_no_info")
+@ApiModel(value = "CustomerPlateNoInfo", description = "客户车牌绑定表")
+public class CustomerPlateNoInfo {
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @Excel(name = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 创建者
+     */
+    @ApiModelProperty("创建者")
+    @Excel(name = "创建者")
+    private Integer createBy;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @Excel(name = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 更新者
+     */
+    @ApiModelProperty("更新者")
+    @Excel(name = "更新者")
+    private Integer updateBy;
+
+    /**
+     * 车牌号
+     */
+    @ApiModelProperty("车牌号")
+    @Excel(name = "车牌号")
+    private String plateNo;
+
+    /**
+     * 手机号
+     */
+    @ApiModelProperty("手机号")
+    @Excel(name = "手机号")
+    private String phone;
+
+    /**
+     * 车牌类型
+     */
+    @ApiModelProperty("车牌类型")
+    @Excel(name = "车牌类型")
+    private Integer plateType;
+
+
+}

gather-app/src/main/java/com/ruoyi/database/domain/ParkingLotOrderInfo.java

@@ -0,0 +1,120 @@
+package com.ruoyi.database.domain;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 停车场订单表(ParkingLotOrderInfo)实体类
+ *
+ * @author makejava
+ * @since 2025-11-20 09:27:12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName(value = "parking_lot_order_info")
+@ApiModel(value = "ParkingLotOrderInfo", description = "停车场订单表")
+public class ParkingLotOrderInfo {
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @Excel(name = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 创建者
+     */
+    @ApiModelProperty("创建者")
+    @Excel(name = "创建者")
+    private Integer createBy;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @Excel(name = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 更新者
+     */
+    @ApiModelProperty("更新者")
+    @Excel(name = "更新者")
+    private Integer updateBy;
+
+    /**
+     * 车牌号
+     */
+    @ApiModelProperty("车牌号")
+    @Excel(name = "车牌号")
+    private String plateNo;
+
+    /**
+     * 手机号
+     */
+    @ApiModelProperty("手机号")
+    @Excel(name = "手机号")
+    private String phone;
+
+    /**
+     * 停车场名称
+     */
+    @ApiModelProperty("停车场名称")
+    @Excel(name = "停车场名称")
+    private String name;
+
+    /**
+     * 停车场编码
+     */
+    @ApiModelProperty("停车场编码")
+    @Excel(name = "停车场编码")
+    private String code;
+
+    /**
+     * 入车时间
+     */
+    @ApiModelProperty("入车时间")
+    @Excel(name = "入车时间")
+    private Long entryTime;
+    @TableField(exist = false)
+    private String entryTimeCn;
+
+    /**
+     * 出车时间
+     */
+    @ApiModelProperty("出车时间")
+    @Excel(name = "出车时间")
+    private Long departTime;
+    @TableField(exist = false)
+    private String departTimeCn;
+
+    /**
+     * 停车时长
+     */
+    @ApiModelProperty("停车时长")
+    @Excel(name = "停车时长")
+    private String parkTime;
+
+
+}

gather-app/src/main/java/com/ruoyi/database/mapper/CustomerPlateNoInfoMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.database.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.database.domain.CustomerPlateNoInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客户车牌绑定表(CustomerPlateNoInfo) Mapper 接口
+ *
+ * @author makejava
+ * @since ${date}
+ */
+@Mapper
+public interface CustomerPlateNoInfoMapper extends BaseMapper<CustomerPlateNoInfo> {
+
+}

gather-app/src/main/java/com/ruoyi/database/mapper/ParkingLotOrderInfoMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.database.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.database.domain.ParkingLotOrderInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 停车场订单表(ParkingLotOrderInfo) Mapper 接口
+ *
+ * @author makejava
+ * @since ${date}
+ */
+@Mapper
+public interface ParkingLotOrderInfoMapper extends BaseMapper<ParkingLotOrderInfo> {
+
+}

gather-app/src/main/java/com/ruoyi/database/service/CustomerPlateNoInfoService.java

@@ -0,0 +1,14 @@
+package com.ruoyi.database.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.database.domain.CustomerPlateNoInfo;
+
+/**
+ * (客户车牌绑定表)Service
+ *
+ * @author makejava
+ * @since 2025-11-20 08:57:44
+ */
+public interface CustomerPlateNoInfoService extends IService<CustomerPlateNoInfo> {
+
+}

gather-app/src/main/java/com/ruoyi/database/service/ParkingLotOrderInfoService.java

@@ -0,0 +1,14 @@
+package com.ruoyi.database.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.database.domain.ParkingLotOrderInfo;
+
+/**
+ * (停车场订单表)Service
+ *
+ * @author makejava
+ * @since 2025-11-20 09:27:12
+ */
+public interface ParkingLotOrderInfoService extends IService<ParkingLotOrderInfo> {
+
+}

gather-app/src/main/java/com/ruoyi/database/service/impl/CustomerPlateNoInfoServiceImpl.java

@@ -0,0 +1,19 @@
+package com.ruoyi.database.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.database.domain.CustomerPlateNoInfo;
+import com.ruoyi.database.mapper.CustomerPlateNoInfoMapper;
+import com.ruoyi.database.service.CustomerPlateNoInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * (客户车牌绑定表)ServiceImpl
+ *
+ * @author makejava
+ * @since 2025-11-20 08:57:44
+ */
+@Service
+public class CustomerPlateNoInfoServiceImpl extends ServiceImpl<CustomerPlateNoInfoMapper, CustomerPlateNoInfo> implements CustomerPlateNoInfoService {
+
+}

gather-app/src/main/java/com/ruoyi/database/service/impl/ParkingLotOrderInfoServiceImpl.java

@@ -0,0 +1,19 @@
+package com.ruoyi.database.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.database.domain.ParkingLotOrderInfo;
+import com.ruoyi.database.mapper.ParkingLotOrderInfoMapper;
+import com.ruoyi.database.service.ParkingLotOrderInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * (停车场订单表)ServiceImpl
+ *
+ * @author makejava
+ * @since 2025-11-20 09:27:12
+ */
+@Service
+public class ParkingLotOrderInfoServiceImpl extends ServiceImpl<ParkingLotOrderInfoMapper, ParkingLotOrderInfo> implements ParkingLotOrderInfoService {
+
+}