From ec5781782aae3bdebdd02ed03cd65d4c0881f089 Mon Sep 17 00:00:00 2001 From: qinyulong Date: Tue, 6 Jan 2026 11:01:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BB=AA=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E3=80=81=E8=AE=B0=E5=BD=95=E4=BB=AA=E6=9B=B2=E7=BA=BF=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/excel/RecorderCompareExcel.java | 25 +++---------------- .../device/pojo/excel/RecorderTypeExcel.java | 19 -------------- .../controller/RecorderCompareController.java | 2 +- .../controller/RecorderTypeController.java | 2 +- .../impl/RecorderCompareServiceImpl.java | 6 ++--- 5 files changed, 8 insertions(+), 46 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RecorderCompareExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RecorderCompareExcel.java index 0de7e035..e6286bfd 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RecorderCompareExcel.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RecorderCompareExcel.java @@ -29,25 +29,6 @@ public class RecorderCompareExcel implements Serializable { @Serial private static final long serialVersionUID = 1L; - - /** - * 流水号 - */ - @ColumnWidth(20) - @ExcelProperty("流水号") - private BigDecimal id; - /** - * - */ - @ColumnWidth(20) - @ExcelProperty("") - private String tenantId; - /** - * 删除标记;1:删除，0:正常 - */ - @ColumnWidth(20) - @ExcelProperty("删除标记;1:删除，0:正常") - private Long isDeleted; /** * 设备编号 */ @@ -81,8 +62,8 @@ public class RecorderCompareExcel implements Serializable { /** * 曲线Y比例尺 */ - @ColumnWidth(20) - @ExcelProperty("曲线Y比例尺") - private BigDecimal crcY; +// @ColumnWidth(20) +// @ExcelProperty("曲线Y比例尺") +// private BigDecimal crcY; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RecorderTypeExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RecorderTypeExcel.java index 5d068166..ddf7c3d6 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RecorderTypeExcel.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RecorderTypeExcel.java @@ -29,25 +29,6 @@ public class RecorderTypeExcel implements Serializable { @Serial private static final long serialVersionUID = 1L; - - /** - * 流水号 - */ - @ColumnWidth(20) - @ExcelProperty("流水号") - private BigDecimal id; - /** - * - */ - @ColumnWidth(20) - @ExcelProperty("") - private String tenantId; - /** - * 删除标记;1:删除，0:正常 - */ - @ColumnWidth(20) - @ExcelProperty("删除标记;1:删除，0:正常") - private Long isDeleted; /** * 编码 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderCompareController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderCompareController.java index 2dd9127c..e885174c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderCompareController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderCompareController.java @@ -119,7 +119,7 @@ public class RecorderCompareController extends BladeController { /** * 导出数据 */ - @IsAdmin +// @IsAdmin @GetMapping("/export-recorderCompare") @ApiOperationSupport(order = 9) @Operation(summary = "导出数据", description = "传入recorderCompare") diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderTypeController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderTypeController.java index 343d7026..d05c45b5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderTypeController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderTypeController.java @@ -118,7 +118,7 @@ public class RecorderTypeController extends BladeController { /** * 导出数据 */ - @IsAdmin +// @IsAdmin @GetMapping("/export-recorderType") @ApiOperationSupport(order = 9) @Operation(summary = "导出数据", description = "传入recorderType") diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderCompareServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderCompareServiceImpl.java index c79d2c98..b3bbbe2b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderCompareServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderCompareServiceImpl.java @@ -45,9 +45,9 @@ public class RecorderCompareServiceImpl extends BaseServiceImpl exportRecorderCompare(Wrapper queryWrapper) { List recorderCompareList = baseMapper.exportRecorderCompare(queryWrapper); - //recorderCompareList.forEach(recorderCompare -> { - // recorderCompare.setTypeName(DictCache.getValue(DictEnum.YES_NO, RecorderCompare.getType())); - //}); + recorderCompareList.forEach(recorderCompare -> { + recorderCompare.setShowGraph("1".equalsIgnoreCase(recorderCompare.getShowGraph()) ? "是" : "否"); + }); return recorderCompareList; }