记录仪类型、记录仪曲线设置导出

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;
 
 }

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;
     /**
      * 编码
      */

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")

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")

blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderCompareServiceImpl.java

@@ -45,9 +45,9 @@ public class RecorderCompareServiceImpl extends BaseServiceImpl<RecorderCompareM
     @Override
     public List<RecorderCompareExcel> exportRecorderCompare(Wrapper<RecorderCompareEntity> queryWrapper) {
         List<RecorderCompareExcel> 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;
     }