diff --git a/gather-app/src/main/java/com/ruoyi/database/controller/BaseCustomerInfoController.java b/gather-app/src/main/java/com/ruoyi/database/controller/BaseCustomerInfoController.java index c5b49b8..3ddaa61 100644 --- a/gather-app/src/main/java/com/ruoyi/database/controller/BaseCustomerInfoController.java +++ b/gather-app/src/main/java/com/ruoyi/database/controller/BaseCustomerInfoController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; @RequestMapping("/BaseCustomerInfo") -@Api(tags = "02-基础管理-客户管理") +@Api(tags = "客户管理") @RestController @RequiredArgsConstructor public class BaseCustomerInfoController extends BaseController { @@ -24,7 +24,7 @@ public class BaseCustomerInfoController extends BaseController { private final BaseCustomerInfoService baseCustomerInfoService; @GetMapping - @ApiOperation("查询客户管理") + @ApiOperation("基础管理-查询客户管理") public TableDataInfo list(BaseCustomerInfo baseCustomerInfo) { startPage(); QueryWrapper queryWrapper = new QueryWrapper<>(baseCustomerInfo); @@ -34,21 +34,21 @@ public class BaseCustomerInfoController extends BaseController { } @PostMapping - @ApiOperation("新增客户管理") + @ApiOperation("基础管理-新增客户管理") @Log(title = "客户管理表", businessType = BusinessType.INSERT) public AjaxResult insert(@RequestBody BaseCustomerInfo baseCustomerInfo) { return toAjax(baseCustomerInfoService.save(baseCustomerInfo)); } @PutMapping - @ApiOperation("修改客户管理") + @ApiOperation("基础管理-修改客户管理") @Log(title = "客户管理表", businessType = BusinessType.UPDATE) public AjaxResult update(@RequestBody BaseCustomerInfo baseCustomerInfo) { return toAjax(baseCustomerInfoService.updateById(baseCustomerInfo)); } @DeleteMapping - @ApiOperation("删除客户管理") + @ApiOperation("基础管理-删除客户管理") @Log(title = "客户管理表", businessType = BusinessType.DELETE) public AjaxResult delete(@RequestParam("idList") List idList) { return toAjax(baseCustomerInfoService.removeByIds(idList)); diff --git a/gather-app/src/main/java/com/ruoyi/database/controller/BaseParkingLotInfoController.java b/gather-app/src/main/java/com/ruoyi/database/controller/BaseParkingLotInfoController.java index 5f62776..691482f 100644 --- a/gather-app/src/main/java/com/ruoyi/database/controller/BaseParkingLotInfoController.java +++ b/gather-app/src/main/java/com/ruoyi/database/controller/BaseParkingLotInfoController.java @@ -7,7 +7,9 @@ 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.BaseParkingLotInfo; +import com.ruoyi.database.domain.ParkingNearInfo; import com.ruoyi.database.service.BaseParkingLotInfoService; +import com.ruoyi.database.service.ParkingNearInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -16,15 +18,16 @@ import org.springframework.web.bind.annotation.*; import java.util.List; @RequestMapping("/BaseParkingLotInfo") -@Api(tags = "01-基础管理-停车场管理") +@Api(tags = "停车场管理") @RestController @RequiredArgsConstructor public class BaseParkingLotInfoController extends BaseController { private final BaseParkingLotInfoService baseParkingLotInfoService; + private final ParkingNearInfoService parkingNearInfoService; @GetMapping - @ApiOperation("查询停车场管理") + @ApiOperation("基础管理-查询停车场管理") public TableDataInfo list(BaseParkingLotInfo baseParkingLotInfo) { startPage(); QueryWrapper queryWrapper = new QueryWrapper<>(baseParkingLotInfo); @@ -34,23 +37,34 @@ public class BaseParkingLotInfoController extends BaseController { } @PostMapping - @ApiOperation("新增停车场管理") + @ApiOperation("基础管理-新增停车场管理") @Log(title = "停车场管理表", businessType = BusinessType.INSERT) public AjaxResult insert(@RequestBody BaseParkingLotInfo baseParkingLotInfo) { return toAjax(baseParkingLotInfoService.save(baseParkingLotInfo)); } @PutMapping - @ApiOperation("修改停车场管理") + @ApiOperation("基础管理-修改停车场管理") @Log(title = "停车场管理表", businessType = BusinessType.UPDATE) public AjaxResult update(@RequestBody BaseParkingLotInfo baseParkingLotInfo) { return toAjax(baseParkingLotInfoService.updateById(baseParkingLotInfo)); } @DeleteMapping - @ApiOperation("删除停车场管理") + @ApiOperation("基础管理-删除停车场管理") @Log(title = "停车场管理表", businessType = BusinessType.DELETE) public AjaxResult delete(@RequestParam("idList") List idList) { return toAjax(baseParkingLotInfoService.removeByIds(idList)); } + + + @GetMapping("/ParkingNear") + @ApiOperation("查询附近常客隆超市或停车场") + public TableDataInfo list(ParkingNearInfo parkingNearInfo) { + startPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(parkingNearInfo); + List list = parkingNearInfoService.list(queryWrapper); + long size = parkingNearInfoService.count(queryWrapper); + return getDataTableEnhance(list,size); + } } diff --git a/gather-app/src/main/java/com/ruoyi/database/controller/ParkingLotOrderInfoController.java b/gather-app/src/main/java/com/ruoyi/database/controller/ParkingLotOrderInfoController.java new file mode 100644 index 0000000..b9d0059 --- /dev/null +++ b/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 list(ParkingLotOrderInfo parkingLotOrderInfo) { + startPage(); + QueryWrapper queryWrapper = new QueryWrapper<>(parkingLotOrderInfo); + List 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 idList) { + return toAjax(parkingLotOrderInfoService.removeByIds(idList)); + } +} diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/CustomerPlateNoInfo.java b/gather-app/src/main/java/com/ruoyi/database/domain/CustomerPlateNoInfo.java new file mode 100644 index 0000000..3de74d4 --- /dev/null +++ b/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; + + +} diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/ParkingLotOrderInfo.java b/gather-app/src/main/java/com/ruoyi/database/domain/ParkingLotOrderInfo.java new file mode 100644 index 0000000..0fe5240 --- /dev/null +++ b/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; + + +} diff --git a/gather-app/src/main/java/com/ruoyi/database/mapper/CustomerPlateNoInfoMapper.java b/gather-app/src/main/java/com/ruoyi/database/mapper/CustomerPlateNoInfoMapper.java new file mode 100644 index 0000000..4dd2025 --- /dev/null +++ b/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 { + +} diff --git a/gather-app/src/main/java/com/ruoyi/database/mapper/ParkingLotOrderInfoMapper.java b/gather-app/src/main/java/com/ruoyi/database/mapper/ParkingLotOrderInfoMapper.java new file mode 100644 index 0000000..fda8929 --- /dev/null +++ b/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 { + +} diff --git a/gather-app/src/main/java/com/ruoyi/database/service/CustomerPlateNoInfoService.java b/gather-app/src/main/java/com/ruoyi/database/service/CustomerPlateNoInfoService.java new file mode 100644 index 0000000..fa6a4e4 --- /dev/null +++ b/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 { + +} diff --git a/gather-app/src/main/java/com/ruoyi/database/service/ParkingLotOrderInfoService.java b/gather-app/src/main/java/com/ruoyi/database/service/ParkingLotOrderInfoService.java new file mode 100644 index 0000000..0439797 --- /dev/null +++ b/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 { + +} diff --git a/gather-app/src/main/java/com/ruoyi/database/service/impl/CustomerPlateNoInfoServiceImpl.java b/gather-app/src/main/java/com/ruoyi/database/service/impl/CustomerPlateNoInfoServiceImpl.java new file mode 100644 index 0000000..2866d23 --- /dev/null +++ b/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 implements CustomerPlateNoInfoService { + +} diff --git a/gather-app/src/main/java/com/ruoyi/database/service/impl/ParkingLotOrderInfoServiceImpl.java b/gather-app/src/main/java/com/ruoyi/database/service/impl/ParkingLotOrderInfoServiceImpl.java new file mode 100644 index 0000000..cfd1369 --- /dev/null +++ b/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 implements ParkingLotOrderInfoService { + +}