From 29bbd5144def5ebd50b4f5d63ae10f615c9300c1 Mon Sep 17 00:00:00 2001 From: b2894lxlx <517289602@qq.com> Date: Thu, 16 Jul 2026 11:47:51 +0800 Subject: [PATCH] fix bug --- .../transport/excel/MaintenancePlanExcel.java | 104 ++++++++++++++++++ .../excel/MaintenancePlanImporter.java | 49 +++++++++ .../excel/MaintenanceRecordExcel.java | 104 ++++++++++++++++++ .../excel/MaintenanceRecordImporter.java | 49 +++++++++ 4 files changed, 306 insertions(+) create mode 100644 blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanExcel.java create mode 100644 blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanImporter.java create mode 100644 blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordExcel.java create mode 100644 blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordImporter.java diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanExcel.java new file mode 100644 index 0000000..6144801 --- /dev/null +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanExcel.java @@ -0,0 +1,104 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.transport.excel; + +import cn.idev.excel.annotation.ExcelIgnore; +import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.write.style.ColumnWidth; +import cn.idev.excel.annotation.write.style.ContentRowHeight; +import cn.idev.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 车辆保养记录 Excel + * + * @author Chill + */ +@Data +@ColumnWidth(18) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class MaintenancePlanExcel implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @ExcelIgnore + private Long id; + + @ExcelProperty("车船类型") + private String vehicleType; + + @ExcelProperty("车牌号/船号") + private String vehicleNo; + + @ExcelProperty("保养人") + private String maintainer; + + @ExcelProperty("保养时间") + private LocalDateTime maintenanceTime; + + @ExcelProperty("里程/航程数") + private BigDecimal mileage; + + @ExcelProperty("里程单位") + private String mileageUnit; + + @ExcelProperty("保养项目") + private String maintenanceItem; + + @ExcelProperty("费用") + private BigDecimal cost; + + @ExcelProperty("店名") + private String storeName; + + @ExcelProperty("联系电话") + private String contactPhone; + + @ExcelProperty("地址") + private String address; + + @ExcelProperty("下次保养时间") + private LocalDateTime nextMaintenanceTime; + + @ExcelProperty("下次保养里程/航程") + private BigDecimal nextMaintenanceMileage; + + @ExcelProperty("附件") + private String attachments; + + @ExcelProperty("备注") + private String remark; + + @ExcelProperty("报错文案") + private String errorMessage; + +} diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanImporter.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanImporter.java new file mode 100644 index 0000000..c9f7a34 --- /dev/null +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenancePlanImporter.java @@ -0,0 +1,49 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.transport.excel; + +import lombok.RequiredArgsConstructor; +import org.springblade.core.excel.support.ExcelImporter; +import org.springblade.transport.service.IMaintenancePlanService; + +import java.util.List; + +/** + * 车辆保养记录导入类 + * + * @author Chill + */ +@RequiredArgsConstructor +public class MaintenancePlanImporter implements ExcelImporter { + + private final IMaintenancePlanService service; + + @Override + public void save(List data) { + service.importMaintenancePlan(data); + } + +} diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordExcel.java new file mode 100644 index 0000000..a02dcf5 --- /dev/null +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordExcel.java @@ -0,0 +1,104 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.transport.excel; + +import cn.idev.excel.annotation.ExcelIgnore; +import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.write.style.ColumnWidth; +import cn.idev.excel.annotation.write.style.ContentRowHeight; +import cn.idev.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 车辆维修记录 Excel + * + * @author Chill + */ +@Data +@ColumnWidth(18) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class MaintenanceRecordExcel implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @ExcelIgnore + private Long id; + + @ExcelProperty("车船类型") + private String vehicleType; + + @ExcelProperty("车牌号/船号") + private String vehicleNo; + + @ExcelProperty("维修人") + private String maintainer; + + @ExcelProperty("维修时间") + private LocalDateTime maintenanceTime; + + @ExcelProperty("维修位置") + private String location; + + @ExcelProperty("更换零件") + private String replacedPart; + + @ExcelProperty("费用") + private BigDecimal cost; + + @ExcelProperty("维修单位") + private String company; + + @ExcelProperty("联系方式") + private String contact; + + @ExcelProperty("地址") + private String address; + + @ExcelProperty("出厂时间") + private LocalDateTime factoryTime; + + @ExcelProperty("里程/航程数") + private BigDecimal mileage; + + @ExcelProperty("里程单位") + private String mileageUnit; + + @ExcelProperty("附件") + private String attachments; + + @ExcelProperty("备注") + private String remark; + + @ExcelProperty("报错文案") + private String errorMessage; + +} diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordImporter.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordImporter.java new file mode 100644 index 0000000..a78e1e9 --- /dev/null +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/MaintenanceRecordImporter.java @@ -0,0 +1,49 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.transport.excel; + +import lombok.RequiredArgsConstructor; +import org.springblade.core.excel.support.ExcelImporter; +import org.springblade.transport.service.IMaintenanceRecordService; + +import java.util.List; + +/** + * 车辆维修记录导入类 + * + * @author Chill + */ +@RequiredArgsConstructor +public class MaintenanceRecordImporter implements ExcelImporter { + + private final IMaintenanceRecordService service; + + @Override + public void save(List data) { + service.importMaintenanceRecord(data); + } + +}