From 11205e61c63d239d50b7ce060ccbf9307f336b8d Mon Sep 17 00:00:00 2001 From: qinyulong Date: Tue, 27 Jan 2026 14:15:57 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=AE=B0=E5=BD=95=E4=BB=AA=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E6=97=B6=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=94=AF=E4=B8=80=E6=80=A7=202.=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=BB=AA=E6=9B=B2=E7=BA=BF=E8=AE=BE=E7=BD=AE=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE[=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E6=9B=B2?= =?UTF-8?q?=E7=BA=BF=E5=9B=BE]=E6=9F=A5=E8=AF=A2=E4=B8=8D=E7=94=9F?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RecorderCompareController.java | 1 + .../controller/RecorderTypeController.java | 25 +++++++++++++++++++ .../impl/RecorderCompareServiceImpl.java | 3 ++- 3 files changed, 28 insertions(+), 1 deletion(-) 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 fbb0f70c..627b6e32 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 @@ -70,6 +70,7 @@ public class RecorderCompareController extends BladeController { @Parameter(name = "code", description = "设备编码", in = ParameterIn.QUERY, schema = @Schema(type = "string")), @Parameter(name = "name", description = "参数名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")), @Parameter(name = "showName", description = "参数显示名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "showGraph", description = "是否显示曲线图", in = ParameterIn.QUERY, schema = @Schema(type = "string")), @Parameter(name = "crcX", description = "曲线X间隔", in = ParameterIn.QUERY, schema = @Schema(type = "Integer")), }) public R> page(@Parameter(hidden = true) RecorderCompareEntity recorderCompare, Query query) { 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 d05c45b5..9c313f63 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 @@ -1,5 +1,7 @@ package org.springblade.desk.device.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.Schema; @@ -16,6 +18,7 @@ import org.springblade.core.mp.support.Condition; 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.entity.FeiBaSetEntity; import org.springblade.desk.device.pojo.excel.RecorderTypeExcel; import org.springblade.desk.device.wrapper.RecorderCompareWrapper; import org.springframework.web.bind.annotation.*; @@ -32,6 +35,7 @@ import org.springblade.core.tool.constant.BladeConstant; import java.util.Map; import java.util.List; +import java.util.Objects; import jakarta.servlet.http.HttpServletResponse; @@ -81,6 +85,13 @@ public class RecorderTypeController extends BladeController { @ApiOperationSupport(order = 4) @Operation(summary = "新增", description = "传入recorderType") public R save(@Valid @RequestBody RecorderTypeEntity recorderType) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() + .eq(Objects.nonNull(recorderType.getCrtCode()), RecorderTypeEntity::getCrtCode, recorderType.getCrtCode()) + .eq(RecorderTypeEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + RecorderTypeEntity one = recorderTypeService.getOne(wrapper); + if (null != one && !Objects.equals(one.getId(), recorderType.getId())) { + return R.fail("记录仪编码重复"); + } return R.status(recorderTypeService.save(recorderType)); } @@ -91,6 +102,13 @@ public class RecorderTypeController extends BladeController { @ApiOperationSupport(order = 5) @Operation(summary = "修改", description = "传入recorderType") public R update(@Valid @RequestBody RecorderTypeEntity recorderType) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() + .eq(Objects.nonNull(recorderType.getCrtCode()), RecorderTypeEntity::getCrtCode, recorderType.getCrtCode()) + .eq(RecorderTypeEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + RecorderTypeEntity one = recorderTypeService.getOne(wrapper); + if (null != one && !Objects.equals(one.getId(), recorderType.getId())) { + return R.fail("记录仪编码重复"); + } return R.status(recorderTypeService.updateById(recorderType)); } @@ -101,6 +119,13 @@ public class RecorderTypeController extends BladeController { @ApiOperationSupport(order = 6) @Operation(summary = "新增或修改", description = "传入recorderType") public R submit(@Valid @RequestBody RecorderTypeEntity recorderType) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() + .eq(Objects.nonNull(recorderType.getCrtCode()), RecorderTypeEntity::getCrtCode, recorderType.getCrtCode()) + .eq(RecorderTypeEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + RecorderTypeEntity one = recorderTypeService.getOne(wrapper); + if (null != one && !Objects.equals(one.getId(), recorderType.getId())) { + return R.fail("记录仪编码重复"); + } return R.status(recorderTypeService.saveOrUpdate(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 7bc4fef1..c817ea9e 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 @@ -37,7 +37,8 @@ public class RecorderCompareServiceImpl extends BaseServiceImpl