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 12:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

标签操作移除旧的type校验

Browse Source
This commit is contained in:
gaoqr
2026-08-11 11:56:12 +08:00
parent d455954fa0
commit dc3814c3e0
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java
+1 -12
View File
@@ -71,7 +71,6 @@ public class LabelServiceImpl implements LabelService {
public Long createLabel(LabelSaveReqVO createReqVO) { public Long createLabel(LabelSaveReqVO createReqVO) {
Long organId = createReqVO.getOrganId() == null ? getUserOrganId() : createReqVO.getOrganId(); Long organId = createReqVO.getOrganId() == null ? getUserOrganId() : createReqVO.getOrganId();
LabelTypeDO labelType = resolveLabelType(createReqVO.getLabelTypeId(), createReqVO.getType(), organId); LabelTypeDO labelType = resolveLabelType(createReqVO.getLabelTypeId(), createReqVO.getType(), organId);
validateCustomType(labelType);
// 插入 // 插入
LabelDO label = BeanUtils.toBean(createReqVO, LabelDO.class); LabelDO label = BeanUtils.toBean(createReqVO, LabelDO.class);
@@ -90,11 +89,9 @@ public class LabelServiceImpl implements LabelService {
// 校验存在 // 校验存在
LabelDO labelDO = validateLabelExists(updateReqVO.getId()); LabelDO labelDO = validateLabelExists(updateReqVO.getId());
LabelTypeDO oldType = resolveLabelType(labelDO.getLabelTypeId(), labelDO.getType(), labelDO.getOrganId()); resolveLabelType(labelDO.getLabelTypeId(), labelDO.getType(), labelDO.getOrganId());
validateCustomType(oldType);
LabelTypeDO newType = resolveLabelType(updateReqVO.getLabelTypeId(), updateReqVO.getType(), labelDO.getOrganId()); LabelTypeDO newType = resolveLabelType(updateReqVO.getLabelTypeId(), updateReqVO.getType(), labelDO.getOrganId());
validateCustomType(newType);
// 更新 // 更新
LabelDO updateObj = BeanUtils.toBean(updateReqVO, LabelDO.class); LabelDO updateObj = BeanUtils.toBean(updateReqVO, LabelDO.class);
@@ -113,7 +110,6 @@ public class LabelServiceImpl implements LabelService {
public void deleteLabel(Long id) { public void deleteLabel(Long id) {
// 校验存在 // 校验存在
LabelDO labelDO = validateLabelExists(id); LabelDO labelDO = validateLabelExists(id);
validateCustomType(resolveLabelType(labelDO.getLabelTypeId(), labelDO.getType(), labelDO.getOrganId()));
List<MachineDO> machineDOS = machineMapper.selectList(new LambdaQueryWrapperX<MachineDO>() List<MachineDO> machineDOS = machineMapper.selectList(new LambdaQueryWrapperX<MachineDO>()
.select(MachineDO::getId) .select(MachineDO::getId)
@@ -208,13 +204,6 @@ public class LabelServiceImpl implements LabelService {
return type == null ? null : type.trim(); return type == null ? null : type.trim();
} }
/** 标签接口只能操作自定义类型，系统默认类型由字段管理维护。 */
private void validateCustomType(LabelTypeDO type) {
if (type == null || "SYSTEM".equals(type.getSource())) {
throw new ServiceException(LABEL_SYSTEM_TYPE_NOT_OPERABLE);
}
}
private LabelTypeDO resolveLabelType(Long labelTypeId, String type, Long organId) { private LabelTypeDO resolveLabelType(Long labelTypeId, String type, Long organId) {
if (labelTypeId != null) { if (labelTypeId != null) {
LabelTypeDO labelType = labelTypeMapper.selectById(labelTypeId); LabelTypeDO labelType = labelTypeMapper.selectById(labelTypeId);