From b1006a91f87263d97882f81a28051382b5c33ba3 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Fri, 28 Mar 2025 17:19:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=B3=BB=E7=BB=9F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE-=E9=85=8D=E7=BD=AE=E9=A1=B9=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/enums/ErrorCodeConstants.java | 1 + .../impl/AdvancedScreenServiceHandler.java | 67 ------------------- .../impl/DataProcessServiceHandler.java | 11 ++- .../impl/IntellectBranchingService.java | 10 ++- .../impl/ProcessSchemeServiceHandler.java | 9 +++ .../impl/ProcessScreeningServiceHandler.java | 11 ++- .../service/impl/SealedgeServiceHandler.java | 2 +- 7 files changed, 40 insertions(+), 71 deletions(-) delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/AdvancedScreenServiceHandler.java 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 255ace390..db90ab669 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 @@ -389,6 +389,7 @@ public class ErrorCodeConstants { public static final ErrorCode SEALEDGE_CONFIG_MIN_VALUE_DATA_ERROR = new ErrorCode(1_002_040_024, "第 {} 条配置中，宽最小值大于宽取值，请修改数据"); public static final ErrorCode SEALEDGE_CONFIG_MAX_VALUE_DATA_ERROR = new ErrorCode(1_002_040_025, "第 {} 条配置中，宽最大值小于宽取值，请修改数据"); public static final ErrorCode SEALEDGE_CONFIG_DATA_ERROR = new ErrorCode(1_002_040_026, "当前封边条配置有误，请重新检查后新增"); + public static final ErrorCode THIS_CONFIG_NAME_IS_EXISTS = new ErrorCode(1_002_040_027, "当前配置的名称已存在，请重新命名"); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/AdvancedScreenServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/AdvancedScreenServiceHandler.java deleted file mode 100644 index 4ebe6a0f4..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/AdvancedScreenServiceHandler.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.cf.imes.module.system.service.systemconfig.factory.service.impl; - - -import com.cf.imes.module.system.controller.admin.systemconfig.vo.*; -import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigDO; -import com.cf.imes.module.system.service.systemconfig.factory.service.AbstractSystemConfigServiceHandler; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author 高级筛选服务处理 - */ - -@Service("advancedScreenServiceHandler") -@Slf4j -public class AdvancedScreenServiceHandler extends AbstractSystemConfigServiceHandler { - - - @Override - public List selectList(ConfigPageReqVO pageReqVO) { - - return null; - } - - @Override - public void checkValid(String setting) { - // todo checkValid - } - - @Override - public void beforeSaveConfig(ConfigSaveReqVO reqVO) { - // todo beforeSaveConfig - } - - @Override - public void afterSaveConfig(SystemConfigDO systemConfigDO, ConfigSaveReqVO reqVO) { - // todo afterSaveConfig - } - - @Override - public void deleteConfig(ConfigDeleteReqVO reqVO) { - // todo deleteConfig - } - - @Override - public void updateConfigStatus(ConfigUpdateStatusReqVO reqVO) { - - } - - @Override - public void updateConfigSort(List reqVO) { - - } - - @Override - public SystemConfigDO getSystemConfig(Long id) { - - return null; - } - - @Override - public void modifySystemConfig(ConfigSaveReqVO reqVO) { - - } -} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DataProcessServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DataProcessServiceHandler.java index eb29eda37..87d59c350 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DataProcessServiceHandler.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DataProcessServiceHandler.java @@ -4,6 +4,7 @@ package com.cf.imes.module.system.service.systemconfig.factory.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.cf.imes.framework.common.util.Assert.AssertUtils; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.organ.core.context.OrganContextHolder; @@ -24,6 +25,7 @@ import java.util.List; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.cf.imes.framework.common.util.json.JsonUtils.parseArray; +import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; /** @@ -61,7 +63,14 @@ public class DataProcessServiceHandler extends AbstractSystemConfigServiceHandle @Override public void beforeSaveConfig(ConfigSaveReqVO reqVO) { - // todo beforeSaveConfig + + List systemConfigDataDOS = systemConfigDataMapper.selectList(new LambdaQueryWrapperX() + .eq(SystemConfigDataDO::getOrganId,getUserOrganId()) + .eq(SystemConfigDataDO::getName, reqVO.getName()) + .neIfPresent(SystemConfigDataDO::getId,reqVO.getId())); + + AssertUtils.empty(systemConfigDataDOS,THIS_CONFIG_NAME_IS_EXISTS); + } @Override diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/IntellectBranchingService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/IntellectBranchingService.java index 2007683a8..2c6abd16e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/IntellectBranchingService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/IntellectBranchingService.java @@ -4,6 +4,7 @@ package com.cf.imes.module.system.service.systemconfig.factory.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.cf.imes.framework.common.enums.CommonStatusEnum; +import com.cf.imes.framework.common.util.Assert.AssertUtils; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.organ.core.context.OrganContextHolder; @@ -20,7 +21,9 @@ import java.util.ArrayList; import java.util.List; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; import static com.cf.imes.module.system.enums.ErrorCodeConstants.SYSTEM_CONFIG_NOT_EXISTS; +import static com.cf.imes.module.system.enums.ErrorCodeConstants.THIS_CONFIG_NAME_IS_EXISTS; /** @@ -55,7 +58,12 @@ public class IntellectBranchingService extends AbstractSystemConfigServiceHandle @Override public void beforeSaveConfig(ConfigSaveReqVO reqVO) { - // todo beforeSaveConfig + List systemConfigFilterDOS = systemConfigFilterMapper.selectList(new LambdaQueryWrapperX() + .eq(SystemConfigFilterDO::getOrganId,getUserOrganId()) + .eq(SystemConfigFilterDO::getName, reqVO.getName()) + .neIfPresent(SystemConfigFilterDO::getId,reqVO.getId())); + + AssertUtils.empty(systemConfigFilterDOS,THIS_CONFIG_NAME_IS_EXISTS); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/ProcessSchemeServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/ProcessSchemeServiceHandler.java index c43dded90..2f59b10d2 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/ProcessSchemeServiceHandler.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/ProcessSchemeServiceHandler.java @@ -5,6 +5,7 @@ import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.cf.imes.framework.common.enums.CommonStatusEnum; +import com.cf.imes.framework.common.util.Assert.AssertUtils; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.organ.core.context.OrganContextHolder; @@ -27,6 +28,7 @@ import java.util.concurrent.atomic.AtomicLong; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.cf.imes.framework.common.util.json.JsonUtils.parseArray; import static com.cf.imes.framework.common.util.json.JsonUtils.toJsonString; +import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; /** @@ -89,6 +91,13 @@ public class ProcessSchemeServiceHandler extends AbstractSystemConfigServiceHand @Override public void beforeSaveConfig(ConfigSaveReqVO reqVO) { + List systemConfigSchemeDOS = systemConfigSchemeMapper.selectList(new LambdaQueryWrapperX() + .eq(SystemConfigSchemeDO::getOrganId,getUserOrganId()) + .eq(SystemConfigSchemeDO::getName, reqVO.getName()) + .neIfPresent(SystemConfigSchemeDO::getId,reqVO.getId())); + + AssertUtils.empty(systemConfigSchemeDOS,THIS_CONFIG_NAME_IS_EXISTS); + List processSchemeConfigs = parseArray(reqVO.getSetting(), ProcessSchemeConfig.class); AtomicLong sort = new AtomicLong(System.currentTimeMillis()); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/ProcessScreeningServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/ProcessScreeningServiceHandler.java index 0dc3cd9c2..8611e31cc 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/ProcessScreeningServiceHandler.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/ProcessScreeningServiceHandler.java @@ -4,6 +4,7 @@ package com.cf.imes.module.system.service.systemconfig.factory.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.cf.imes.framework.common.util.Assert.AssertUtils; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.organ.core.context.OrganContextHolder; @@ -24,6 +25,7 @@ import java.util.List; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.cf.imes.framework.common.util.json.JsonUtils.parseArray; +import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; /** @@ -61,7 +63,14 @@ public class ProcessScreeningServiceHandler extends AbstractSystemConfigServiceH @Override public void beforeSaveConfig(ConfigSaveReqVO reqVO) { - // todo beforeSaveConfig + + List systemConfigProcessDOS = systemConfigProcessMapper.selectList(new LambdaQueryWrapperX() + .eq(SystemConfigProcessDO::getOrganId,getUserOrganId()) + .eq(SystemConfigProcessDO::getName, reqVO.getName()) + .neIfPresent(SystemConfigProcessDO::getId,reqVO.getId())); + + AssertUtils.empty(systemConfigProcessDOS,THIS_CONFIG_NAME_IS_EXISTS); + } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/SealedgeServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/SealedgeServiceHandler.java index fd13b3f7e..504c8b023 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/SealedgeServiceHandler.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/SealedgeServiceHandler.java @@ -28,7 +28,7 @@ import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; /** - * @author 多种颜色排单 + * @author 封边条对应 */ @Service("sealedgeServiceHandler") @Slf4j