From 4b416df9c6ae07e96e99fca9b04f5573e5332b46 Mon Sep 17 00:00:00 2001 From: qinyulong Date: Tue, 6 Jan 2026 13:21:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BB=AA=E6=9B=B2=E7=BA=BF?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=A0=B9=E6=8D=AE=E8=AE=BE=E5=A4=87=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E6=89=B9=E9=87=8F=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/device/pojo/entity/PackCycleEntity.java | 2 +- .../device/pojo/entity/RecorderCompareEntity.java | 2 +- .../device/controller/RecorderCompareController.java | 11 ++++++++++- .../desk/device/service/IRecorderCompareService.java | 8 ++++++++ .../service/impl/RecorderCompareServiceImpl.java | 8 ++++++++ 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/PackCycleEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/PackCycleEntity.java index b27b980f..6f72d6e3 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/PackCycleEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/PackCycleEntity.java @@ -72,7 +72,7 @@ public class PackCycleEntity extends BaseEntity { /** * 周期单位 */ - @Schema(description = "周期单位") + @Schema(description = "周期单位（0:年、1:月、2:日、3:时、4:分、5:秒）") private Long cpcUnit; public String getCpcUnitTitle() { diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RecorderCompareEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RecorderCompareEntity.java index 205b7859..5e1e4ce2 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RecorderCompareEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RecorderCompareEntity.java @@ -44,7 +44,7 @@ public class RecorderCompareEntity extends BaseEntity { /** * 是否显示曲线图 */ - @Schema(description = "是否显示曲线图") + @Schema(description = "是否显示曲线图(0：否，1：是)") private String showGraph; /** * 曲线X间隔 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 e885174c..103cc964 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 @@ -115,7 +115,16 @@ public class RecorderCompareController extends BladeController { return R.status(recorderCompareService.deleteLogic(Func.toLongList(ids))); } - + /** + * 根据设备编号批量新增 + */ + @PostMapping("/submit-list") + @ApiOperationSupport(order = 8) + @Operation(summary = "根据设备编号批量新增", description = "传入modelPrototype集合和设备编号") + public R submitList(@Valid @RequestBody List recorderCompareEntities, + @Parameter(description = "设备编号", required = true) @RequestParam String code) { + return R.status(recorderCompareService.submitList(recorderCompareEntities, code)); + } /** * 导出数据 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRecorderCompareService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRecorderCompareService.java index 31189d82..6a0ec229 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRecorderCompareService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRecorderCompareService.java @@ -59,4 +59,12 @@ public interface IRecorderCompareService extends BaseService exportRecorderCompare(Wrapper queryWrapper); + /** + * 根据设备编号批量新增 + * + * @param recorderCompareEntities + * @param code + * @return + */ + Boolean submitList(List recorderCompareEntities, String code); } 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 b3bbbe2b..f8b359f9 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 @@ -51,4 +51,12 @@ public class RecorderCompareServiceImpl extends BaseServiceImpl recorderCompareEntities, String code) { + recorderCompareEntities.forEach(recorderCompareEntity -> { + recorderCompareEntity.setCode(code); + }); + return this.saveBatch(recorderCompareEntities); + } + }