From 52648b80eed49800e543c0e8e9eef2955787bd6c Mon Sep 17 00:00:00 2001 From: qinyulong Date: Tue, 6 Jan 2026 14:06:25 +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=E5=85=A5=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/request/RecorderCompareSave.java | 24 +++++++++++++++++++ .../controller/RecorderCompareController.java | 6 ++--- .../service/IRecorderCompareService.java | 7 +++--- .../impl/RecorderCompareServiceImpl.java | 9 +++---- 4 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/request/RecorderCompareSave.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/request/RecorderCompareSave.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/request/RecorderCompareSave.java new file mode 100644 index 00000000..6d168d42 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/request/RecorderCompareSave.java @@ -0,0 +1,24 @@ +package org.springblade.desk.device.pojo.request; + +import lombok.Data; +import org.springblade.desk.device.pojo.entity.RecorderCompareEntity; + +import java.util.List; + +/** + * 记录仪曲线配置批量新增 - 保存请求参数 + * + * @author qyl + */ +@Data +public class RecorderCompareSave { + /** + * 化验含量 + */ + private String code; + + /** + * 化验含量明细 + */ + private List recorderCompareEntities; +} 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 103cc964..439c12cd 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 @@ -17,6 +17,7 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.device.pojo.excel.RecorderCompareExcel; +import org.springblade.desk.device.pojo.request.RecorderCompareSave; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -121,9 +122,8 @@ public class RecorderCompareController extends BladeController { @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)); + public R submitList(@Valid @RequestBody RecorderCompareSave recorderCompareSave) { + return R.status(recorderCompareService.submitList(recorderCompareSave)); } /** * 导出数据 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 6a0ec229..b63dd327 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 @@ -28,7 +28,7 @@ package org.springblade.desk.device.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.springblade.desk.device.pojo.entity.RecorderCompareEntity; import org.springblade.desk.device.pojo.excel.RecorderCompareExcel; -import org.springblade.desk.device.pojo.vo.RecorderCompareVO; +import org.springblade.desk.device.pojo.request.RecorderCompareSave; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; @@ -62,9 +62,8 @@ public interface IRecorderCompareService extends BaseService recorderCompareEntities, String code); + Boolean submitList(RecorderCompareSave recorderCompareSave); } 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 f8b359f9..593e9af8 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springblade.desk.device.pojo.entity.RackSetEntity; import org.springblade.desk.device.pojo.entity.RecorderCompareEntity; import org.springblade.desk.device.pojo.excel.RecorderCompareExcel; +import org.springblade.desk.device.pojo.request.RecorderCompareSave; import org.springblade.desk.device.pojo.vo.RecorderCompareVO; import org.springblade.desk.device.mapper.RecorderCompareMapper; import org.springblade.desk.device.service.IRecorderCompareService; @@ -52,11 +53,11 @@ public class RecorderCompareServiceImpl extends BaseServiceImpl recorderCompareEntities, String code) { - recorderCompareEntities.forEach(recorderCompareEntity -> { - recorderCompareEntity.setCode(code); + public Boolean submitList(RecorderCompareSave recorderCompareSave) { + recorderCompareSave.getRecorderCompareEntities().forEach(recorderCompareEntity -> { + recorderCompareEntity.setCode(recorderCompareSave.getCode()); }); - return this.saveBatch(recorderCompareEntities); + return this.saveBatch(recorderCompareSave.getRecorderCompareEntities()); } }