1、新增维修记录

2、新增保养记录
3、新增港口码头主数据
4、新增铁路车站主数据
5、新增空港机场主数据
6、测试版nacos配置
7、测试版Harbor配置
8、其他配置修改
This commit is contained in:
2026-07-10 22:08:46 +08:00
parent f1e6599892
commit d9df98b5b1
85 changed files with 11436 additions and 40 deletions

View File

@@ -0,0 +1,117 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.system.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import java.io.Serial;
import java.math.BigDecimal;
/**
* 空港机场主数据实体类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("blade_airport_master")
@Schema(description = "空港机场主数据")
public class AirportMaster extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 编码
*/
@Schema(description = "编码")
private String code;
/**
* IATA编码
*/
@Schema(description = "IATA编码")
private String iataCode;
/**
* ICAO代码
*/
@Schema(description = "ICAO代码")
private String icaoCode;
/**
* 机场标准名称
*/
@Schema(description = "机场标准名称")
private String name;
/**
* 机场简称
*/
@Schema(description = "机场简称")
private String shortName;
/**
* 所属省份编码
*/
@Schema(description = "所属省份编码")
private String provinceCode;
/**
* 所属省份
*/
@Schema(description = "所属省份")
private String provinceName;
/**
* 所属城市编码
*/
@Schema(description = "所属城市编码")
private String cityCode;
/**
* 所属城市
*/
@Schema(description = "所属城市")
private String cityName;
/**
* 经度
*/
@Schema(description = "经度")
private BigDecimal longitude;
/**
* 纬度
*/
@Schema(description = "纬度")
private BigDecimal latitude;
/**
* 数据来源
*/
@Schema(description = "数据来源")
private String dataSource;
/**
* 备注
*/
@Schema(description = "备注")
private String remark;
}

View File

@@ -0,0 +1,112 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.system.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import java.io.Serial;
import java.math.BigDecimal;
/**
* 港口码头主数据实体类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("blade_port_terminal")
@Schema(description = "港口码头主数据")
public class PortTerminal extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 编码
*/
@Schema(description = "编码")
private String code;
/**
* 港口/码头名称
*/
@Schema(description = "港口/码头名称")
private String name;
/**
* 类型:港口、码头
*/
@Schema(description = "类型")
private String category;
/**
* 上级港口ID
*/
@Schema(description = "上级港口ID")
private Long parentId;
/**
* 上级港口编码
*/
@Schema(description = "上级港口编码")
private String parentCode;
/**
* 上级港口名称
*/
@Schema(description = "上级港口名称")
private String parentName;
/**
* 国家
*/
@Schema(description = "国家")
private String country;
/**
* 城市
*/
@Schema(description = "城市")
private String city;
/**
* 经度
*/
@Schema(description = "经度")
private BigDecimal longitude;
/**
* 纬度
*/
@Schema(description = "纬度")
private BigDecimal latitude;
/**
* 数据来源
*/
@Schema(description = "数据来源")
private String dataSource;
/**
* 备注
*/
@Schema(description = "备注")
private String remark;
}

View File

@@ -0,0 +1,117 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.system.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import java.io.Serial;
import java.math.BigDecimal;
/**
* 铁路车站主数据实体类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("blade_railway_station")
@Schema(description = "铁路车站主数据")
public class RailwayStation extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 编码
*/
@Schema(description = "编码")
private String code;
/**
* TMIS国标编码
*/
@Schema(description = "TMIS国标编码")
private String tmisCode;
/**
* 电报码
*/
@Schema(description = "电报码")
private String telegraphCode;
/**
* 车站名称
*/
@Schema(description = "车站名称")
private String name;
/**
* 所属铁路线路
*/
@Schema(description = "所属铁路线路")
private String railwayLine;
/**
* 所属省份编码
*/
@Schema(description = "所属省份编码")
private String provinceCode;
/**
* 所属省份
*/
@Schema(description = "所属省份")
private String provinceName;
/**
* 所属城市编码
*/
@Schema(description = "所属城市编码")
private String cityCode;
/**
* 所属城市
*/
@Schema(description = "所属城市")
private String cityName;
/**
* 经度
*/
@Schema(description = "经度")
private BigDecimal longitude;
/**
* 纬度
*/
@Schema(description = "纬度")
private BigDecimal latitude;
/**
* 数据来源
*/
@Schema(description = "数据来源")
private String dataSource;
/**
* 备注
*/
@Schema(description = "备注")
private String remark;
}

View File

@@ -0,0 +1,55 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.system.pojo.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.system.pojo.entity.AirportMaster;
import java.io.Serial;
/**
* 空港机场主数据视图实体类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "空港机场主数据")
public class AirportMasterVO extends AirportMaster {
@Serial
private static final long serialVersionUID = 1L;
/**
* 导入错误信息
*/
@TableField(exist = false)
@Schema(description = "导入错误信息")
private String errorMessage;
}

View File

@@ -0,0 +1,55 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.system.pojo.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.system.pojo.entity.PortTerminal;
import java.io.Serial;
/**
* 港口码头主数据视图实体类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "港口码头主数据")
public class PortTerminalVO extends PortTerminal {
@Serial
private static final long serialVersionUID = 1L;
/**
* 导入错误信息
*/
@TableField(exist = false)
@Schema(description = "导入错误信息")
private String errorMessage;
}

View File

@@ -0,0 +1,55 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.system.pojo.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.system.pojo.entity.RailwayStation;
import java.io.Serial;
/**
* 铁路车站主数据视图实体类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "铁路车站主数据")
public class RailwayStationVO extends RailwayStation {
@Serial
private static final long serialVersionUID = 1L;
/**
* 导入错误信息
*/
@TableField(exist = false)
@Schema(description = "导入错误信息")
private String errorMessage;
}

View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-transport-api</artifactId>
<name>${project.artifactId}</name>
<packaging>jar</packaging>
</project>

View File

@@ -0,0 +1,128 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.transport.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
import java.io.Serial;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 车辆保养计划实体类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("blade_vehicle_maintenance_plan")
@Schema(description = "车辆保养计划")
public class MaintenancePlan extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 车船类型
*/
@Schema(description = "车船类型")
private String vehicleType;
/**
* 车牌号/船号
*/
@Schema(description = "车牌号/船号")
private String vehicleNo;
/**
* 保养人
*/
@Schema(description = "保养人")
private String maintainer;
/**
* 保养时间
*/
@Schema(description = "保养时间")
private LocalDateTime maintenanceTime;
/**
* 里程/航程数
*/
@Schema(description = "里程/航程数")
private BigDecimal mileage;
/**
* 里程单位
*/
@Schema(description = "里程单位")
private String mileageUnit;
/**
* 保养项目
*/
@Schema(description = "保养项目")
private String maintenanceItem;
/**
* 费用
*/
@Schema(description = "费用")
private BigDecimal cost;
/**
* 店名
*/
@Schema(description = "店名")
private String storeName;
/**
* 联系电话
*/
@Schema(description = "联系电话")
private String contactPhone;
/**
* 地址
*/
@Schema(description = "地址")
private String address;
/**
* 下次保养时间
*/
@Schema(description = "下次保养时间")
private LocalDateTime nextMaintenanceTime;
/**
* 下次保养里程/航程
*/
@Schema(description = "下次保养里程/航程")
private BigDecimal nextMaintenanceMileage;
/**
* 附件
*/
@Schema(description = "附件")
private String attachments;
/**
* 备注
*/
@Schema(description = "备注")
private String remark;
}

View File

@@ -0,0 +1,128 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.transport.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
import java.io.Serial;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 车辆维修记录实体类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("blade_vehicle_maintenance_record")
@Schema(description = "车辆维修记录")
public class MaintenanceRecord extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 车船类型
*/
@Schema(description = "车船类型")
private String vehicleType;
/**
* 车牌号/船号
*/
@Schema(description = "车牌号/船号")
private String vehicleNo;
/**
* 维修人
*/
@Schema(description = "维修人")
private String maintainer;
/**
* 维修时间
*/
@Schema(description = "维修时间")
private LocalDateTime maintenanceTime;
/**
* 维修位置
*/
@Schema(description = "维修位置")
private String location;
/**
* 更换零件
*/
@Schema(description = "更换零件")
private String replacedPart;
/**
* 费用
*/
@Schema(description = "费用")
private BigDecimal cost;
/**
* 维修单位
*/
@Schema(description = "维修单位")
private String company;
/**
* 联系方式
*/
@Schema(description = "联系方式")
private String contact;
/**
* 地址
*/
@Schema(description = "地址")
private String address;
/**
* 出厂时间
*/
@Schema(description = "出厂时间")
private LocalDateTime factoryTime;
/**
* 里程/航程数
*/
@Schema(description = "里程/航程数")
private BigDecimal mileage;
/**
* 里程单位
*/
@Schema(description = "里程单位")
private String mileageUnit;
/**
* 附件
*/
@Schema(description = "附件")
private String attachments;
/**
* 备注
*/
@Schema(description = "备注")
private String remark;
}

View File

@@ -0,0 +1,65 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.transport.pojo.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.transport.pojo.entity.MaintenancePlan;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
import java.time.LocalDateTime;
/**
* 车辆保养计划视图实体类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "车辆保养计划")
public class MaintenancePlanVO extends MaintenancePlan {
@Serial
private static final long serialVersionUID = 1L;
/**
* 创建开始时间
*/
@TableField(exist = false)
@Schema(description = "创建开始时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTimeStart;
/**
* 创建结束时间
*/
@TableField(exist = false)
@Schema(description = "创建结束时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTimeEnd;
}

View File

@@ -0,0 +1,65 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.transport.pojo.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.transport.pojo.entity.MaintenanceRecord;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
import java.time.LocalDateTime;
/**
* 车辆维修记录视图实体类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "车辆维修记录")
public class MaintenanceRecordVO extends MaintenanceRecord {
@Serial
private static final long serialVersionUID = 1L;
/**
* 创建开始时间
*/
@TableField(exist = false)
@Schema(description = "创建开始时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTimeStart;
/**
* 创建结束时间
*/
@TableField(exist = false)
@Schema(description = "创建结束时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTimeEnd;
}

View File

@@ -21,6 +21,7 @@
<module>blade-ratelimit-api</module>
<module>blade-scope-api</module>
<module>blade-system-api</module>
<module>blade-transport-api</module>
<module>blade-user-api</module>
<module>blade-record-api</module>
</modules>