From c0dfe36b59c742afa6b95789546003bd4e6d8c45 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Fri, 19 Dec 2025 16:21:56 +0800 Subject: [PATCH] cn.idev.excel --- .../common/excel/utils/ExcelUtil.java | 50 ++++++++++--------- .../DeviceRepairRecordsController.java | 6 +++ .../domain/vo/DeviceFenceAccessRecordVo.java | 2 +- .../domain/vo/DeviceRepairRecordsVo.java | 14 ++---- .../service/IDeviceRepairRecordsService.java | 7 +-- .../impl/DeviceRepairRecordsServiceImpl.java | 3 ++ 6 files changed, 46 insertions(+), 36 deletions(-) diff --git a/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/utils/ExcelUtil.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/utils/ExcelUtil.java index 5fd28e1..8ff3171 100644 --- a/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/utils/ExcelUtil.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/utils/ExcelUtil.java @@ -74,6 +74,7 @@ public class ExcelUtil { return listener.getExcelResult(); } + /** * 导出excel * @@ -92,6 +93,7 @@ public class ExcelUtil { } } + /** * 导出excel * @@ -174,6 +176,7 @@ public class ExcelUtil { public static void exportExcel(List list, String sheetName, Class clazz, OutputStream os, List options) { exportExcel(list, sheetName, clazz, false, os, options); } + /** * 导出excel @@ -187,13 +190,13 @@ public class ExcelUtil { public static void exportExcel(List list, String sheetName, Class clazz, boolean merge, OutputStream os, List options) { ExcelWriterSheetBuilder builder = FastExcel.write(os, clazz) - .autoCloseStream(false) - // 自动适配 - .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) - // 大数值自动转换 防止失真 - .registerConverter(new ExcelBigNumberConvert()) - .registerWriteHandler(new DataWriteHandler(clazz)) - .sheet(sheetName); + .autoCloseStream(false) + // 自动适配 + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + // 大数值自动转换 防止失真 + .registerConverter(new ExcelBigNumberConvert()) + .registerWriteHandler(new DataWriteHandler(clazz)) + .sheet(sheetName); if (merge) { // 合并处理器 builder.registerWriteHandler(new CellMergeStrategy(list, true)); @@ -203,6 +206,7 @@ public class ExcelUtil { builder.doWrite(list); } + /** * 单表多数据模板导出 模板格式为 {.属性} * @@ -238,12 +242,12 @@ public class ExcelUtil { public static void exportTemplate(List data, String templatePath, OutputStream os) { ClassPathResource templateResource = new ClassPathResource(templatePath); ExcelWriter excelWriter = FastExcel.write(os) - .withTemplate(templateResource.getStream()) - .autoCloseStream(false) - // 大数值自动转换 防止失真 - .registerConverter(new ExcelBigNumberConvert()) - .registerWriteHandler(new DataWriteHandler(data.get(0).getClass())) - .build(); + .withTemplate(templateResource.getStream()) + .autoCloseStream(false) + // 大数值自动转换 防止失真 + .registerConverter(new ExcelBigNumberConvert()) + .registerWriteHandler(new DataWriteHandler(data.get(0).getClass())) + .build(); WriteSheet writeSheet = FastExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); // 单表多数据导出 模板格式为 {.属性} @@ -311,11 +315,11 @@ public class ExcelUtil { public static void exportTemplateMultiList(Map data, String templatePath, OutputStream os) { ClassPathResource templateResource = new ClassPathResource(templatePath); ExcelWriter excelWriter = FastExcel.write(os) - .withTemplate(templateResource.getStream()) - .autoCloseStream(false) - // 大数值自动转换 防止失真 - .registerConverter(new ExcelBigNumberConvert()) - .build(); + .withTemplate(templateResource.getStream()) + .autoCloseStream(false) + // 大数值自动转换 防止失真 + .registerConverter(new ExcelBigNumberConvert()) + .build(); WriteSheet writeSheet = FastExcel.writerSheet().build(); for (Map.Entry map : data.entrySet()) { // 设置列表后续还有数据 @@ -342,11 +346,11 @@ public class ExcelUtil { public static void exportTemplateMultiSheet(List> data, String templatePath, OutputStream os) { ClassPathResource templateResource = new ClassPathResource(templatePath); ExcelWriter excelWriter = FastExcel.write(os) - .withTemplate(templateResource.getStream()) - .autoCloseStream(false) - // 大数值自动转换 防止失真 - .registerConverter(new ExcelBigNumberConvert()) - .build(); + .withTemplate(templateResource.getStream()) + .autoCloseStream(false) + // 大数值自动转换 防止失真 + .registerConverter(new ExcelBigNumberConvert()) + .build(); for (int i = 0; i < data.size(); i++) { WriteSheet writeSheet = FastExcel.writerSheet(i).build(); for (Map.Entry map : data.get(i).entrySet()) { diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceRepairRecordsController.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceRepairRecordsController.java index 03219d6..e0e3623 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceRepairRecordsController.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceRepairRecordsController.java @@ -41,6 +41,7 @@ public class DeviceRepairRecordsController extends BaseController { private final IDeviceRepairRecordsService deviceRepairRecordsService; + /** * 查询设备维修记录列表 */ @@ -52,6 +53,7 @@ public class DeviceRepairRecordsController extends BaseController { return deviceRepairRecordsService.queryPageList(criteria, page); } + /** * 导出设备维修记录列表 */ @@ -63,6 +65,7 @@ public class DeviceRepairRecordsController extends BaseController { ExcelUtil.exportExcel(list, "设备维修记录", DeviceRepairRecordsVo.class, response); } + /** * 获取设备维修记录详细信息 * @@ -75,6 +78,7 @@ public class DeviceRepairRecordsController extends BaseController { return R.ok(deviceRepairRecordsService.queryById(recordId)); } + /** * 新增设备维修记录 */ @@ -86,6 +90,7 @@ public class DeviceRepairRecordsController extends BaseController { return toAjax(deviceRepairRecordsService.insertByBo(bo)); } + /** * 修改设备维修记录 */ @@ -109,4 +114,5 @@ public class DeviceRepairRecordsController extends BaseController { @PathVariable Long[] recordIds) { return toAjax(deviceRepairRecordsService.deleteWithValidByIds(List.of(recordIds), true)); } + } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceFenceAccessRecordVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceFenceAccessRecordVo.java index 8c23b45..1dba180 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceFenceAccessRecordVo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceFenceAccessRecordVo.java @@ -108,7 +108,7 @@ public class DeviceFenceAccessRecordVo implements Serializable { /** * 记录创建时间 */ - @ExcelProperty(value = "记录创建时间") + // @ExcelProperty(value = "记录创建时间") private Date createTime; } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java index 3a92f93..f8731fe 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java @@ -1,15 +1,11 @@ package com.fuyuanshen.equipment.domain.vo; -import java.util.Date; - -import com.alibaba.excel.annotation.write.style.ColumnWidth; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.write.style.ColumnWidth; import com.fasterxml.jackson.annotation.JsonFormat; import com.fuyuanshen.common.tenant.core.TenantEntity; import com.fuyuanshen.equipment.domain.DeviceRepairRecords; -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; -import cn.idev.excel.annotation.ExcelProperty; -import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; -import com.fuyuanshen.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -56,8 +52,8 @@ public class DeviceRepairRecordsVo extends TenantEntity implements Serializable */ @ExcelProperty(value = "维修时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ColumnWidth(20) - private String repairTime; + @ColumnWidth(value = 20) + private Date repairTime; /** * 损坏部位 diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceRepairRecordsService.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceRepairRecordsService.java index cd8b88f..b26fa1e 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceRepairRecordsService.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceRepairRecordsService.java @@ -32,8 +32,8 @@ public interface IDeviceRepairRecordsService extends IService queryPageList(DeviceRepairRecordsQueryCriteria criteria, Page page); @@ -41,7 +41,7 @@ public interface IDeviceRepairRecordsService extends IService queryList(DeviceRepairRecordsQueryCriteria criteria); @@ -70,4 +70,5 @@ public interface IDeviceRepairRecordsService extends IService ids, Boolean isValid); + } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceRepairRecordsServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceRepairRecordsServiceImpl.java index ecc7007..4398f0f 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceRepairRecordsServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceRepairRecordsServiceImpl.java @@ -52,6 +52,7 @@ public class DeviceRepairRecordsServiceImpl extends ServiceImpl(deviceRepairRecordsIPage.getRecords(), deviceRepairRecordsIPage.getTotal()); } + /** * 查询符合条件的设备维修记录列表 *