Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

处理机台模板权限

Browse Source
This commit is contained in:
yangsb
2024-04-25 14:46:33 +08:00
parent fa5e72328c
commit 2153f13a71
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
+2 -1
View File
@@ -191,7 +191,8 @@ public interface ErrorCodeConstants {
ErrorCode DEFAULT_TEMPLATE_COUNT = new ErrorCode(1_002_029_002, "默认模板数量异常"); 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_EXISTS = new ErrorCode(1_002_029_003, "该类型机台默认模板不存在");
ErrorCode DEFAULT_TEMPLATE_NOT_DELETED = new ErrorCode(1_002_029_004, "不能删除默认模板"); 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 ========== // ========== 标签模板 1-002-300-000 ==========
ErrorCode LABEL_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_300_000, "标签模板不存在"); ErrorCode LABEL_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_300_000, "标签模板不存在");
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineConvert.java
+5 -3
View File
@@ -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.MachineDO;
import com.cf.imes.module.system.dal.dataobject.machine.MachineLimitDO; import com.cf.imes.module.system.dal.dataobject.machine.MachineLimitDO;
import java.util.Objects;
/** /**
* @author Beal * @author Beal
*/ */
@@ -31,9 +33,9 @@ public class MachineConvert {
.name(machineDO.getName()) .name(machineDO.getName())
.machineType(machineDO.getMachineType()) .machineType(machineDO.getMachineType())
.labelId(machineDO.getLabelId()) .labelId(machineDO.getLabelId())
.showAutoNotePrinter(machineLimitDO.getShowAutoNotePrinter()) .showAutoNotePrinter(Objects.isNull(machineLimitDO)? Boolean.FALSE: machineLimitDO.getShowAutoNotePrinter())
.showDualWorkstation(machineLimitDO.getShowDualWorkstation()) .showDualWorkstation(Objects.isNull(machineLimitDO)? Boolean.FALSE: machineLimitDO.getShowDualWorkstation())
.showPriorFacing(machineLimitDO.getShowPriorFacing()) .showPriorFacing(Objects.isNull(machineLimitDO)? Boolean.FALSE: machineLimitDO.getShowPriorFacing())
.build(); .build();
} }
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
+4 -11
View File
@@ -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.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR;
import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; 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.*;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.NOT_TEMPLATE_AUTH;
/** /**
* 机台 Service 实现类 * 机台 Service 实现类
@@ -85,18 +84,15 @@ public class MachineServiceImpl implements MachineService {
.eq(MachineTemplateLimitDO::getMachineId, createReqVO.getTemplateId()) .eq(MachineTemplateLimitDO::getMachineId, createReqVO.getTemplateId())
.eq(MachineTemplateLimitDO::getOrganId, loginUser.getOrganId()) .eq(MachineTemplateLimitDO::getOrganId, loginUser.getOrganId())
); );
if (Objects.isNull(organMachineTemplateDO)) {
throw exception(NOT_TEMPLATE_AUTH);
}
// 插入 // 插入
MachineDO machineDO = MachineConvert.convert(createReqVO); MachineDO machineDO = MachineConvert.convert(createReqVO);
machineMapper.insert(machineDO); machineMapper.insert(machineDO);
MachineLimitDO machineLimitDO = MachineLimitDO.builder() MachineLimitDO machineLimitDO = MachineLimitDO.builder()
.organId(loginUser.getOrganId()) .organId(loginUser.getOrganId())
.machineId(machineDO.getId()) .machineId(machineDO.getId())
.showPriorFacing(organMachineTemplateDO.getShowPriorFacing()) .showPriorFacing(Objects.isNull(organMachineTemplateDO)? Boolean.FALSE: organMachineTemplateDO.getShowPriorFacing())
.showAutoNotePrinter(organMachineTemplateDO.getShowAutoNotePrinter()) .showAutoNotePrinter(Objects.isNull(organMachineTemplateDO)? Boolean.FALSE: organMachineTemplateDO.getShowAutoNotePrinter())
.showDualWorkstation(organMachineTemplateDO.getShowDualWorkstation()) .showDualWorkstation(Objects.isNull(organMachineTemplateDO)? Boolean.FALSE: organMachineTemplateDO.getShowDualWorkstation())
.build(); .build();
machineLimitMapper.insert(machineLimitDO); machineLimitMapper.insert(machineLimitDO);
@@ -145,9 +141,6 @@ public class MachineServiceImpl implements MachineService {
.eq(MachineLimitDO::getMachineId, id) .eq(MachineLimitDO::getMachineId, id)
.eq(MachineLimitDO::getOrganId, loginUser.getOrganId()) .eq(MachineLimitDO::getOrganId, loginUser.getOrganId())
); );
if (Objects.isNull(machineLimitDO)) {
throw exception(NOT_TEMPLATE_AUTH);
}
CuttingRespVO respVO = MachineConvert.convert(machineDO, machineLimitDO); CuttingRespVO respVO = MachineConvert.convert(machineDO, machineLimitDO);
return respVO; return respVO;
} }