From 2153f13a71245fb5b1bb46743ad6f9f08bd61753 Mon Sep 17 00:00:00 2001 From: yangsb Date: Thu, 25 Apr 2024 14:46:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9C=BA=E5=8F=B0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/enums/ErrorCodeConstants.java | 3 ++- .../system/convert/machine/MachineConvert.java | 8 +++++--- .../service/machine/MachineServiceImpl.java | 15 ++++----------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java index 6d95b54e5..174513c75 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java @@ -191,7 +191,8 @@ public interface ErrorCodeConstants { ErrorCode DEFAULT_TEMPLATE_COUNT = new ErrorCode(1_002_029_002, "默认模板数量异常"); ErrorCode DEFAULT_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_029_003, "该类型机台默认模板不存在"); ErrorCode DEFAULT_TEMPLATE_NOT_DELETED = new ErrorCode(1_002_029_004, "不能删除默认模板"); - ErrorCode NOT_TEMPLATE_AUTH = new ErrorCode(1_002_029_005, "该组织无此机台权限"); + ErrorCode NOT_TEMPLATE_AUTH = new ErrorCode(1_002_029_005, "该组织无此机台模板权限"); + ErrorCode NOT_MACHINE_AUTH = new ErrorCode(1_002_029_005, "该组织无此机台权限"); // ========== 标签模板 1-002-300-000 ========== ErrorCode LABEL_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_300_000, "标签模板不存在"); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineConvert.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineConvert.java index 1ef712a6d..8d2f31e15 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineConvert.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineConvert.java @@ -6,6 +6,8 @@ import com.cf.imes.module.system.controller.admin.machine.vo.CuttingSaveReqVO; import com.cf.imes.module.system.dal.dataobject.machine.MachineDO; import com.cf.imes.module.system.dal.dataobject.machine.MachineLimitDO; +import java.util.Objects; + /** * @author Beal */ @@ -31,9 +33,9 @@ public class MachineConvert { .name(machineDO.getName()) .machineType(machineDO.getMachineType()) .labelId(machineDO.getLabelId()) - .showAutoNotePrinter(machineLimitDO.getShowAutoNotePrinter()) - .showDualWorkstation(machineLimitDO.getShowDualWorkstation()) - .showPriorFacing(machineLimitDO.getShowPriorFacing()) + .showAutoNotePrinter(Objects.isNull(machineLimitDO)? Boolean.FALSE: machineLimitDO.getShowAutoNotePrinter()) + .showDualWorkstation(Objects.isNull(machineLimitDO)? Boolean.FALSE: machineLimitDO.getShowDualWorkstation()) + .showPriorFacing(Objects.isNull(machineLimitDO)? Boolean.FALSE: machineLimitDO.getShowPriorFacing()) .build(); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java index 0a2fe5344..e963d912a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java @@ -43,8 +43,7 @@ import javax.annotation.Resource; import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.cf.imes.module.system.enums.ErrorCodeConstants.MACHINE_NOT_EXISTS; -import static com.cf.imes.module.system.enums.ErrorCodeConstants.NOT_TEMPLATE_AUTH; +import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; /** * 机台 Service 实现类 @@ -85,18 +84,15 @@ public class MachineServiceImpl implements MachineService { .eq(MachineTemplateLimitDO::getMachineId, createReqVO.getTemplateId()) .eq(MachineTemplateLimitDO::getOrganId, loginUser.getOrganId()) ); - if (Objects.isNull(organMachineTemplateDO)) { - throw exception(NOT_TEMPLATE_AUTH); - } // 插入 MachineDO machineDO = MachineConvert.convert(createReqVO); machineMapper.insert(machineDO); MachineLimitDO machineLimitDO = MachineLimitDO.builder() .organId(loginUser.getOrganId()) .machineId(machineDO.getId()) - .showPriorFacing(organMachineTemplateDO.getShowPriorFacing()) - .showAutoNotePrinter(organMachineTemplateDO.getShowAutoNotePrinter()) - .showDualWorkstation(organMachineTemplateDO.getShowDualWorkstation()) + .showPriorFacing(Objects.isNull(organMachineTemplateDO)? Boolean.FALSE: organMachineTemplateDO.getShowPriorFacing()) + .showAutoNotePrinter(Objects.isNull(organMachineTemplateDO)? Boolean.FALSE: organMachineTemplateDO.getShowAutoNotePrinter()) + .showDualWorkstation(Objects.isNull(organMachineTemplateDO)? Boolean.FALSE: organMachineTemplateDO.getShowDualWorkstation()) .build(); machineLimitMapper.insert(machineLimitDO); @@ -145,9 +141,6 @@ public class MachineServiceImpl implements MachineService { .eq(MachineLimitDO::getMachineId, id) .eq(MachineLimitDO::getOrganId, loginUser.getOrganId()) ); - if (Objects.isNull(machineLimitDO)) { - throw exception(NOT_TEMPLATE_AUTH); - } CuttingRespVO respVO = MachineConvert.convert(machineDO, machineLimitDO); return respVO; }