diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/CarInfoController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/CarInfoController.java new file mode 100644 index 000000000..2e8000e33 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/CarInfoController.java @@ -0,0 +1,123 @@ +package com.bsd.pjcloud.integrated.controller; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.integrated.entity.CarInfoEntity; +import com.bsd.pjcloud.integrated.service.CarInfoService; +import org.springframework.security.access.prepost.PreAuthorize; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * 车辆信息表 + * + * @author zjf + * @date 2025-07-10 12:22:57 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/carInfo" ) +@Tag(description = "carInfo" , name = "车辆信息表管理" ) +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class CarInfoController { + + private final CarInfoService carInfoService; + + /** + * 分页查询 + * @param page 分页对象 + * @param carInfo 车辆信息表 + * @return + */ + @Operation(summary = "分页查询" , description = "分页查询" ) + @GetMapping("/page" ) + @PreAuthorize("@pms.hasPermission('integrated_carInfo_view')" ) + public R getCarInfoPage(@ParameterObject Page page, @ParameterObject CarInfoEntity carInfo) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StrUtil.isNotBlank(carInfo.getCarNumber()),CarInfoEntity::getCarNumber,carInfo.getCarNumber()); + wrapper.like(StrUtil.isNotBlank(carInfo.getOwnerName()),CarInfoEntity::getOwnerName,carInfo.getOwnerName()); + wrapper.eq(StrUtil.isNotBlank(carInfo.getOwnerPhone()),CarInfoEntity::getOwnerPhone,carInfo.getOwnerPhone()); + return R.ok(carInfoService.page(page, wrapper)); + } + + + /** + * 通过id查询车辆信息表 + * @param id id + * @return R + */ + @Operation(summary = "通过id查询" , description = "通过id查询" ) + @GetMapping("/{id}" ) + @PreAuthorize("@pms.hasPermission('integrated_carInfo_view')" ) + public R getById(@PathVariable("id" ) Long id) { + return R.ok(carInfoService.getById(id)); + } + + /** + * 新增车辆信息表 + * @param carInfo 车辆信息表 + * @return R + */ + @Operation(summary = "新增车辆信息表" , description = "新增车辆信息表" ) + @SysLog("新增车辆信息表" ) + @PostMapping + @PreAuthorize("@pms.hasPermission('integrated_carInfo_add')" ) + public R save(@RequestBody CarInfoEntity carInfo) { + return R.ok(carInfoService.save(carInfo)); + } + + /** + * 修改车辆信息表 + * @param carInfo 车辆信息表 + * @return R + */ + @Operation(summary = "修改车辆信息表" , description = "修改车辆信息表" ) + @SysLog("修改车辆信息表" ) + @PutMapping + @PreAuthorize("@pms.hasPermission('integrated_carInfo_edit')" ) + public R updateById(@RequestBody CarInfoEntity carInfo) { + return R.ok(carInfoService.updateById(carInfo)); + } + + /** + * 通过id删除车辆信息表 + * @param ids id列表 + * @return R + */ + @Operation(summary = "通过id删除车辆信息表" , description = "通过id删除车辆信息表" ) + @SysLog("通过id删除车辆信息表" ) + @DeleteMapping + @PreAuthorize("@pms.hasPermission('integrated_carInfo_del')" ) + public R removeById(@RequestBody Long[] ids) { + return R.ok(carInfoService.removeBatchByIds(CollUtil.toList(ids))); + } + + + /** + * 导出excel 表格 + * @param carInfo 查询条件 + * @param ids 导出指定ID + * @return excel 文件流 + */ + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('integrated_carInfo_export')" ) + public List export(CarInfoEntity carInfo,Long[] ids) { + return carInfoService.list(Wrappers.lambdaQuery(carInfo).in(ArrayUtil.isNotEmpty(ids), CarInfoEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/CarPassRecordController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/CarPassRecordController.java new file mode 100644 index 000000000..8aadb38c6 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/CarPassRecordController.java @@ -0,0 +1,121 @@ +package com.bsd.pjcloud.integrated.controller; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.integrated.entity.CarPassRecordEntity; +import com.bsd.pjcloud.integrated.service.CarPassRecordService; +import org.springframework.security.access.prepost.PreAuthorize; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * 车辆通行记录 + * + * @author zjf + * @date 2025-07-10 13:26:17 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/carPassRecord" ) +@Tag(description = "carPassRecord" , name = "车辆通行记录管理" ) +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class CarPassRecordController { + + private final CarPassRecordService carPassRecordService; + + /** + * 分页查询 + * @param page 分页对象 + * @param carPassRecord 车辆通行记录 + * @return + */ + @Operation(summary = "分页查询" , description = "分页查询" ) + @GetMapping("/page" ) + @PreAuthorize("@pms.hasPermission('integrated_carPassRecord_view')" ) + public R getCarPassRecordPage(@ParameterObject Page page, @ParameterObject CarPassRecordEntity carPassRecord) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(StrUtil.isNotBlank(carPassRecord.getCarNumber()),CarPassRecordEntity::getCarNumber,carPassRecord.getCarNumber()); + return R.ok(carPassRecordService.page(page, wrapper)); + } + + + /** + * 通过id查询车辆通行记录 + * @param id id + * @return R + */ + @Operation(summary = "通过id查询" , description = "通过id查询" ) + @GetMapping("/{id}" ) + @PreAuthorize("@pms.hasPermission('integrated_carPassRecord_view')" ) + public R getById(@PathVariable("id" ) Long id) { + return R.ok(carPassRecordService.getById(id)); + } + + /** + * 新增车辆通行记录 + * @param carPassRecord 车辆通行记录 + * @return R + */ + @Operation(summary = "新增车辆通行记录" , description = "新增车辆通行记录" ) + @SysLog("新增车辆通行记录" ) + @PostMapping + @PreAuthorize("@pms.hasPermission('integrated_carPassRecord_add')" ) + public R save(@RequestBody CarPassRecordEntity carPassRecord) { + return R.ok(carPassRecordService.save(carPassRecord)); + } + + /** + * 修改车辆通行记录 + * @param carPassRecord 车辆通行记录 + * @return R + */ + @Operation(summary = "修改车辆通行记录" , description = "修改车辆通行记录" ) + @SysLog("修改车辆通行记录" ) + @PutMapping + @PreAuthorize("@pms.hasPermission('integrated_carPassRecord_edit')" ) + public R updateById(@RequestBody CarPassRecordEntity carPassRecord) { + return R.ok(carPassRecordService.updateById(carPassRecord)); + } + + /** + * 通过id删除车辆通行记录 + * @param ids id列表 + * @return R + */ + @Operation(summary = "通过id删除车辆通行记录" , description = "通过id删除车辆通行记录" ) + @SysLog("通过id删除车辆通行记录" ) + @DeleteMapping + @PreAuthorize("@pms.hasPermission('integrated_carPassRecord_del')" ) + public R removeById(@RequestBody Long[] ids) { + return R.ok(carPassRecordService.removeBatchByIds(CollUtil.toList(ids))); + } + + + /** + * 导出excel 表格 + * @param carPassRecord 查询条件 + * @param ids 导出指定ID + * @return excel 文件流 + */ + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('integrated_carPassRecord_export')" ) + public List export(CarPassRecordEntity carPassRecord,Long[] ids) { + return carPassRecordService.list(Wrappers.lambdaQuery(carPassRecord).in(ArrayUtil.isNotEmpty(ids), CarPassRecordEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/CarInfoEntity.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/CarInfoEntity.java new file mode 100644 index 000000000..a8912dcb6 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/CarInfoEntity.java @@ -0,0 +1,139 @@ +package com.bsd.pjcloud.integrated.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDateTime; + +/** + * 车辆信息表 + * + * @author zjf + * @date 2025-07-10 12:22:57 + */ +@Data +@TenantTable +@TableName("car_info") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "车辆信息表") +public class CarInfoEntity extends Model { + + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="id") + private Long id; + + /** + * 车牌号 + */ + @Schema(description="车牌号") + private String carNumber; + + /** + * 车主姓名 + */ + @Schema(description="车主姓名") + private String ownerName; + + /** + * 车主手机号码 + */ + @Schema(description="车主手机号码") + private String ownerPhone; + + /** + * 审核状态 + */ + @Schema(description="审核状态") + private String checkStatus; + + /** + * 部门id + */ + @Schema(description="部门id") + private Long deptId; + + /** + * 是否是临时车 + */ + @Schema(description="是否是临时车") + private String isTemp; + + /** + * 临时失效日期 + */ + @Schema(description="临时失效日期") + private LocalDateTime tempDate; + + /** + * 流程id + */ + @Schema(description="流程id") + private String processInstanceId; + + /** + * 审核原因 + */ + @Schema(description="审核原因") + private String checkReason; + + /** + * 用户id + */ + @Schema(description="用户id") + private Long userId; + + /** + * 车辆状态 + */ + @Schema(description="车辆状态") + private String carStatus; + + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建者") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新者") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新时间") + private LocalDateTime updateTime; + + /** + * 是否删除 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description="是否删除") + private String delFlag; + + /** + * 租户编号 + */ + @Schema(description="租户编号") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/CarPassRecordEntity.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/CarPassRecordEntity.java new file mode 100644 index 000000000..b55ccbc08 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/CarPassRecordEntity.java @@ -0,0 +1,115 @@ +package com.bsd.pjcloud.integrated.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDateTime; + +/** + * 车辆通行记录 + * + * @author zjf + * @date 2025-07-10 13:26:17 + */ +@Data +@TenantTable +@TableName("car_pass_record") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "车辆通行记录") +public class CarPassRecordEntity extends Model { + + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="id") + private Long id; + + /** + * 车牌号 + */ + @Schema(description="车牌号") + private String carNumber; + + /** + * 通行时间 + */ + @Schema(description="通行时间") + private LocalDateTime passTime; + + /** + * 通行地点 + */ + @Schema(description="通行地点") + private String location; + + /** + * 到访单位 + */ + @Schema(description="到访单位") + private Long deptId; + + /** + * 进出方向 + */ + @Schema(description="进出方向") + private String direction; + + /** + * 现场图片 + */ + @Schema(description="现场图片") + private String picUrl; + + /** + * 道闸id + */ + @Schema(description="道闸id") + private Long gateId; + + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建者") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新者") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="更新时间") + private LocalDateTime updateTime; + + /** + * 是否删除 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description="是否删除") + private String delFlag; + + /** + * 租户编号 + */ + @Schema(description="租户编号") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/CarInfoMapper.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/CarInfoMapper.java new file mode 100644 index 000000000..a77a01fbe --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/CarInfoMapper.java @@ -0,0 +1,11 @@ +package com.bsd.pjcloud.integrated.mapper; + +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.integrated.entity.CarInfoEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CarInfoMapper extends PjcloudBaseMapper { + + +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/CarPassRecordMapper.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/CarPassRecordMapper.java new file mode 100644 index 000000000..0a1deaa27 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/mapper/CarPassRecordMapper.java @@ -0,0 +1,11 @@ +package com.bsd.pjcloud.integrated.mapper; + +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.integrated.entity.CarPassRecordEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CarPassRecordMapper extends PjcloudBaseMapper { + + +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/CarInfoService.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/CarInfoService.java new file mode 100644 index 000000000..da04d59ec --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/CarInfoService.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.integrated.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.integrated.entity.CarInfoEntity; + +public interface CarInfoService extends IService { + +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/CarPassRecordService.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/CarPassRecordService.java new file mode 100644 index 000000000..68c8b7196 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/CarPassRecordService.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.integrated.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.integrated.entity.CarPassRecordEntity; + +public interface CarPassRecordService extends IService { + +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/CarInfoServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/CarInfoServiceImpl.java new file mode 100644 index 000000000..4111d0be7 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/CarInfoServiceImpl.java @@ -0,0 +1,16 @@ +package com.bsd.pjcloud.integrated.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.integrated.entity.CarInfoEntity; +import com.bsd.pjcloud.integrated.mapper.CarInfoMapper; +import com.bsd.pjcloud.integrated.service.CarInfoService; +import org.springframework.stereotype.Service; +/** + * 车辆信息表 + * + * @author zjf + * @date 2025-07-10 12:22:57 + */ +@Service +public class CarInfoServiceImpl extends ServiceImpl implements CarInfoService { +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/CarPassRecordServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/CarPassRecordServiceImpl.java new file mode 100644 index 000000000..3a511f1f5 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/CarPassRecordServiceImpl.java @@ -0,0 +1,16 @@ +package com.bsd.pjcloud.integrated.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.integrated.entity.CarPassRecordEntity; +import com.bsd.pjcloud.integrated.mapper.CarPassRecordMapper; +import com.bsd.pjcloud.integrated.service.CarPassRecordService; +import org.springframework.stereotype.Service; +/** + * 车辆通行记录 + * + * @author zjf + * @date 2025-07-10 13:26:17 + */ +@Service +public class CarPassRecordServiceImpl extends ServiceImpl implements CarPassRecordService { +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/CarInfoMapper.xml b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/CarInfoMapper.xml new file mode 100644 index 000000000..50c92bf3f --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/CarInfoMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/CarPassRecordMapper.xml b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/CarPassRecordMapper.xml new file mode 100644 index 000000000..05bbd88ff --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/CarPassRecordMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file