From 1bd78d24f66b82b641fe7ac2092bf523ced1716e Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Fri, 14 Mar 2025 11:18:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE-=E5=B0=81?= =?UTF-8?q?=E8=BE=B9=E6=9D=A1=E5=AF=B9=E5=BA=94=E9=85=8D=E7=BD=AE=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=AD=A3=E7=A1=AE=E6=80=A7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/enums/ErrorCodeConstants.java | 4 ++ .../service/impl/SealedgeServiceHandler.java | 43 ++++++++++++++++++- 2 files changed, 45 insertions(+), 2 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 a96d45d5c..ec30a9025 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 @@ -383,6 +383,10 @@ public class ErrorCodeConstants { public static final ErrorCode THIS_CONFIG_DATA_ERROR = new ErrorCode(1_002_040_020, "当前系统配置的数据有误，请重新尝试排序"); public static final ErrorCode PROCESS_CONFIG_USED_ALREADY = new ErrorCode(1_002_040_021, "当前加工分线配置在加工方案组中已使用，无法删除"); public static final ErrorCode OPTIMIZATION_CONFIG_USED_ALREADY = new ErrorCode(1_002_040_022, "当前数据处理配置在加工方案组中已使用，无法删除"); + public static final ErrorCode SEALEDGE_CONFIG_NOT_EXISTS = new ErrorCode(1_002_040_023, "第 {} 条配置中,有字段值为空，请添加数据"); + 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, "当前封边条配置有误，请重新检查后新增"); 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 12438e3d0..fd13b3f7e 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 @@ -2,7 +2,11 @@ package com.cf.imes.module.system.service.systemconfig.factory.service.impl; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.cf.imes.framework.common.exception.ServiceException; 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; @@ -12,6 +16,7 @@ import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigSealedg import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigSealedgeMapper; import com.cf.imes.module.system.service.systemconfig.factory.service.AbstractSystemConfigServiceHandler; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -19,7 +24,7 @@ import java.time.LocalDateTime; import java.util.List; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.cf.imes.module.system.enums.ErrorCodeConstants.SYSTEM_CONFIG_NOT_EXISTS; +import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; /** @@ -49,7 +54,41 @@ public class SealedgeServiceHandler extends AbstractSystemConfigServiceHandler { @Override public void checkValid(String setting) { - // todo checkValid + + try { + + JSONArray jsonArray = JSON.parseArray(setting); + + for (int i = 0; i < jsonArray.size(); i++) { + + JSONObject jsonObject = jsonArray.getJSONObject(i); + + String widthMin = jsonObject.getString("widthMin"); + + String widthMax = jsonObject.getString("widthMax"); + + String widthValue = jsonObject.getString("widthValue"); + + if(StringUtils.isEmpty(widthMin) || StringUtils.isEmpty(widthMax) || StringUtils.isEmpty(widthValue) ){ + throw exception(SEALEDGE_CONFIG_NOT_EXISTS,(i+1)); + } + + if(Integer.parseInt(widthMin) > Integer.parseInt(widthValue) ){ + throw exception(SEALEDGE_CONFIG_MIN_VALUE_DATA_ERROR,(i+1)); + } + + if(Integer.parseInt(widthMax) < Integer.parseInt(widthValue) ){ + throw exception(SEALEDGE_CONFIG_MAX_VALUE_DATA_ERROR,(i+1)); + } + + } + } + catch (ServiceException e){ + throw e; + }catch (Exception e){ + log.error("封边条配置有误："+e.getMessage()); + throw new ServiceException(SEALEDGE_CONFIG_DATA_ERROR); + } }