From 3e82acd23558909b320bf571667edde901dfd421 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Tue, 3 Sep 2024 17:39:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E5=8F=B0Bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mysql/machine/MachineMapper.java | 4 +- .../MachineTemplateMapper.java | 4 +- .../service/machine/MachineServiceImpl.java | 8 +-- .../machine/MachineTemplateServiceImpl.java | 64 +++++++++++++------ .../mapper/process/MachineMapper.xml | 12 ++++ .../mapper/process/MachineTemplateMapper.xml | 17 +++++ 6 files changed, 82 insertions(+), 27 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machine/MachineMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machine/MachineMapper.java index b72e38005..bda6c58ce 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machine/MachineMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machine/MachineMapper.java @@ -6,6 +6,7 @@ import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.module.system.controller.admin.machine.vo.MachinePageReqVO; import com.cf.imes.module.system.dal.dataobject.machine.MachineDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.Collection; import java.util.List; @@ -51,7 +52,7 @@ public interface MachineMapper extends BaseMapperX { - default MachineDO selectMachine(String name,Integer machineType,Long organId) { + default MachineDO selectMachineName(String name,Integer machineType,Long organId) { return selectOne(new LambdaQueryWrapperX() .eq(MachineDO::getOrganId,organId) .eq(MachineDO::getDeleted,false) @@ -60,6 +61,7 @@ public interface MachineMapper extends BaseMapperX { } + MachineDO selectMachine(@Param("name") String name, @Param("machineType") Integer machineType, @Param("machineId") Long machineId, @Param("organId") Long organId); default List selectMachineList(Integer machineType,Long organId) { diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java index 6a15fdb05..ef1488ef1 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java @@ -64,11 +64,13 @@ public interface MachineTemplateMapper extends BaseMapperX { - default MachineTemplateDO selectMachineTemplate(String name,Integer machineType) { + default MachineTemplateDO selectMachineTemplateName(String name,Integer machineType) { return selectOne(new LambdaQueryWrapperX() .eq(MachineTemplateDO::getDeleted,false) .eq(MachineTemplateDO::getMachineType,machineType) .eq(MachineTemplateDO::getName,name)); } + MachineTemplateDO selectMachineTemplate(@Param("name") String name,@Param("machineType") Integer machineType,@Param("id") Long id); + } 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 40ec28d79..f0bd853e3 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 @@ -97,7 +97,7 @@ public class MachineServiceImpl implements MachineService { assert loginUser != null; // 校验机台名称是否重复 - MachineDO machine = machineMapper.selectMachine(createReqVO.getName(),createReqVO.getMachineType(), getUserOrganId()); + MachineDO machine = machineMapper.selectMachineName(createReqVO.getName(),createReqVO.getMachineType(), getUserOrganId()); if(machine != null){ throw exception(MACHINE_NAME_ERROR); } @@ -215,7 +215,7 @@ public class MachineServiceImpl implements MachineService { @Transactional(rollbackFor = Exception.class) public void updateCutting(CuttingSaveReqVO updateReqVO) { // 校验存在和判断机台名称是否重复 - validateExists(updateReqVO.getId(),updateReqVO.getName(),updateReqVO.getMachineType()); + validateExists(updateReqVO.getId(),updateReqVO.getName(),updateReqVO.getMachineType(),updateReqVO.getId()); // 更新 MachineDO updateObj = MachineConvert.convert(updateReqVO); //MachineDO updateObj = BeanUtils.toBean(updateReqVO, MachineDO.class); @@ -441,12 +441,12 @@ public class MachineServiceImpl implements MachineService { // 校验机台是否存在和机台名称是否重复 - private void validateExists(Long id,String name,Integer machineType) { + private void validateExists(Long id,String name,Integer machineType,Long machineId) { MachineDO machineDO = machineMapper.selectById(id); if (machineDO == null) { throw exception(MACHINE_NOT_EXISTS); } - MachineDO machine = machineMapper.selectMachine(name, machineType, getUserOrganId()); + MachineDO machine = machineMapper.selectMachine(name, machineType,machineId, getUserOrganId()); if(machine != null){ throw exception(MACHINE_NAME_ERROR); 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 af1b1c902..cd9b73284 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 @@ -122,13 +122,9 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { throw exception(THE_CURRENT_BRAND); } - MachineTemplateDO machineTemplateDO = machineTemplateMapper.selectById(reqVO.getId()); + // 校验机台模板是否存在和名称是否重复 + validateMachineTemplateExists(reqVO.getName(),reqVO.getMachineType(),reqVO.getId()); - if(machineTemplateDO == null){ - throw exception(MACHINE_TEMPLATE_NOT_EXISTS); - } - - validateMachineTemplate(reqVO.getName(),reqVO.getMachineType()); MachineTemplateDO templateDO = MachineTemplateConvert.convert(reqVO); @@ -506,14 +502,19 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { Integer autoLabelModel = advancedConfigsRef.get("autoLabelModel").asInt(); MachineTemplateDO labelingMachineTemplateDO = machineTemplateMapper.selectById(autoLabelModel); - MachineTemplateDO labelingMachineDO = MachineTemplateDO.builder() - .machineType(labelingMachineTemplateDO.getMachineType()) - .brandId(labelingMachineTemplateDO.getBrandId()) - .setting(labelingMachineTemplateDO.getSetting()) - .name("开料" + templateDO.getName() + "-贴标机") - .build(); + if(labelingMachineTemplateDO != null) { + + MachineTemplateDO labelingMachineDO = MachineTemplateDO.builder() + .machineType(labelingMachineTemplateDO.getMachineType()) + .brandId(labelingMachineTemplateDO.getBrandId()) + .setting(labelingMachineTemplateDO.getSetting()) + .name("开料" + templateDO.getName() + "-贴标机") + .build(); + + machineTemplateMapper.insert(labelingMachineDO); + + } - machineTemplateMapper.insert(labelingMachineDO); } } @@ -529,22 +530,43 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { Integer drillModel = cuttingModuleRef.get("drillModel").asInt(); MachineTemplateDO drillMachineTemplateDO = machineTemplateMapper.selectById(drillModel); - MachineTemplateDO drillMachineDO = MachineTemplateDO.builder() - .machineType(drillMachineTemplateDO.getMachineType()) - .brandId(drillMachineTemplateDO.getBrandId()) - .setting(drillMachineTemplateDO.getSetting()) - .name("开料" + templateDO.getName() + "钻孔机") - .build(); + if(drillMachineTemplateDO != null) { - machineTemplateMapper.insert(drillMachineDO); + MachineTemplateDO drillMachineDO = MachineTemplateDO.builder() + .machineType(drillMachineTemplateDO.getMachineType()) + .brandId(drillMachineTemplateDO.getBrandId()) + .setting(drillMachineTemplateDO.getSetting()) + .name("开料" + templateDO.getName() + "钻孔机") + .build(); + + machineTemplateMapper.insert(drillMachineDO); + + } } } + private void validateMachineTemplateExists(String name,Integer machineType,Long machineId) { + + MachineTemplateDO machineTemplateDO = machineTemplateMapper.selectById(machineId); + + if(machineTemplateDO == null){ + throw exception(MACHINE_TEMPLATE_NOT_EXISTS); + } + + MachineTemplateDO machineTemplate = machineTemplateMapper.selectMachineTemplate(name, machineType,machineId); + + if(machineTemplate != null){ + throw exception(MACHINETEMPLATE_NAME_ERROR); + } + + } + + private void validateMachineTemplate(String name,Integer machineType) { - MachineTemplateDO machineTemplateDO = machineTemplateMapper.selectMachineTemplate(name, machineType); + MachineTemplateDO machineTemplateDO = machineTemplateMapper.selectMachineTemplateName(name, machineType); if(machineTemplateDO != null){ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineMapper.xml index bf03307e3..c34712671 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineMapper.xml @@ -3,5 +3,17 @@ + \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml index 71ede804e..34cabbbb2 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml @@ -132,5 +132,22 @@ GROUP BY organId + + + \ No newline at end of file