From 266e11c202e934f25397bf7ef5d8efface6c3ac1 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Wed, 16 Oct 2024 14:52:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E7=AE=A1=E7=90=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=85=A5=E5=8F=82=E6=A3=80=E6=9F=A5=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/machine/vo/CuttingSaveReqVO.java | 2 ++ .../machine/vo/CuttingTemplateSaveReqVO.java | 5 ++-- .../admin/machine/vo/MachineOrgAuthReq.java | 8 ++++++ .../machine/MachineTemplateServiceImpl.java | 28 ++++++++++++++++--- 4 files changed, 37 insertions(+), 6 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java index 209d9506f..22e9d9b4d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java @@ -32,6 +32,7 @@ public class CuttingSaveReqVO { private Integer machineType; @Schema(description = "标签id") + @NotNull(message = "标签id不能空") private Long labelId; // // 新的机台逻辑需要删除 @@ -40,6 +41,7 @@ public class CuttingSaveReqVO { // private Long templateId; @Schema(description = "品牌ID", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "品牌ID不能为空") private Long brandId; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingTemplateSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingTemplateSaveReqVO.java index 84221b682..da55d19c5 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingTemplateSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingTemplateSaveReqVO.java @@ -31,10 +31,11 @@ public class CuttingTemplateSaveReqVO { @Schema(description = "当前品牌ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotNull(message = "当前品牌ID不能为空") private Long nowBrandId; - @Schema(description = "引用的品牌ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @Schema(description = "引用的品牌ID", example = "2") private Long brandId; @@ -54,7 +55,7 @@ public class CuttingTemplateSaveReqVO { // private String model; - @Schema(description = "机台的型号-机台ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @Schema(description = "机台的型号-机台ID", example = "2") private Long machineId; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineOrgAuthReq.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineOrgAuthReq.java index bda650983..ea41595a9 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineOrgAuthReq.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineOrgAuthReq.java @@ -3,6 +3,8 @@ package com.cf.imes.module.system.controller.admin.machine.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.NotNull; + /** * @author Beal */ @@ -10,26 +12,32 @@ import lombok.Data; public class MachineOrgAuthReq { @Schema(description = "组织id", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "组织id不能为空") private Long organId; @Schema(description = "开料机授权数量") + @NotNull(message = "开料机授权数量不能为空") private Integer cutLimit; @Schema(description = "钻孔机授权数量") + @NotNull(message = "钻孔机授权数量不能为空") private Integer drillLimit; @Schema(description = "贴标机授权数量") + @NotNull(message = "贴标机授权数量不能为空") private Integer labelLimit; @Schema(description = "裁板锯授权数量") + @NotNull(message = "裁板锯授权数量不能为空") private Integer sawLimit; @Schema(description = "封边机授权数量") + @NotNull(message = "封边机授权数量不能为空") private Integer sealedgeLimit; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java index 607e70544..b7d7c0fc2 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.cf.imes.module.system.service.machine; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import co.elastic.clients.elasticsearch.ElasticsearchClient; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cf.imes.framework.common.enums.CommonStatusEnum; @@ -148,7 +149,11 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { // MachineBrandDO machineBrandDO = machineBrandMapper.selectById(reqVO.getId()); - List machineTemplateDOS = machineTemplateMapper.selectByBrand(reqVO.getId()); + Long brandId = reqVO.getId(); + // 校验品牌是否存在 + validateBrandExistes(brandId); + + List machineTemplateDOS = machineTemplateMapper.selectByBrand(brandId); if (!machineTemplateDOS.isEmpty()) { // throw exception(MACHINE_TEMPLATE_NOT_EXISTS); @@ -160,7 +165,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { } - machineBrandMapper.deleteById(reqVO.getId()); + machineBrandMapper.deleteById(brandId); return Boolean.TRUE; } @@ -281,8 +286,8 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { public void updateMachineTemplateBrand(MachineTemplateBrandReqVO reqVO) { // MachineBrandDO machineBrandDO = machineBrandMapper.selectBrand(reqVO.getBrand(), reqVO.getMachineType()); - - MachineBrandDO machineBrandDO = machineBrandMapper.selectById(reqVO.getId()); + // 校验机台品牌是否存在 + MachineBrandDO machineBrandDO = validateBrandExistes(reqVO.getId()); machineBrandDO.setBrand(reqVO.getBrand()); @@ -291,6 +296,21 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { } + + /** + * 校验机台品牌是否存在 + * + * @param id + */ + private MachineBrandDO validateBrandExistes(Long id) { + MachineBrandDO machineBrandDO = machineBrandMapper.selectById(id); + if (ObjectUtil.isNull(machineBrandDO)) { + throw exception(THE_CURRENT_BRAND); + } + return machineBrandDO; + } + + @Override public TemplateAutoResp getTemplateAuth(Long organId) {