From e3b43164abf6918339d4b9d7319081e5444b03f2 Mon Sep 17 00:00:00 2001 From: lishuai Date: Wed, 5 Mar 2025 17:45:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E9=87=8D=E5=A4=8D=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=202025=E5=B9=B43=E6=9C=885=E6=97=A517:17:03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CalcTargetConfigServiceImpl.java | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcTargetConfigServiceImpl.java b/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcTargetConfigServiceImpl.java index acee038..b1e7d0b 100644 --- a/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcTargetConfigServiceImpl.java +++ b/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcTargetConfigServiceImpl.java @@ -184,17 +184,30 @@ public class CalcTargetConfigServiceImpl */ private void generateDefaultInfo(CalcTargetConfigDTO targetConfig) { boolean flag = ObjectUtil.isEmpty(targetConfig.getId()); + if(flag){ + QueryWrapper eq = QueryWrapper.create().eq(CalcTargetConfigEntity::getTargetThingCode, targetConfig.getTargetThingCode()) + .eq(CalcTargetConfigEntity::getTargetAttrCode, targetConfig.getTargetAttrCode()) + .eq(CalcTargetConfigEntity::getTenantCode, UserContext.getRealTenantCode()); + CalcTargetConfigEntity calcTargetConfigEntity = mapper.selectOneByQuery(eq); + if(!Objects.isNull(calcTargetConfigEntity)){ + //calcSourceConfigService.findByTargetId(calcTargetConfigEntity.getId()); + throw new SysException(targetConfig.getTargetThingCode()+"-"+targetConfig.getTargetAttrCode()+"目标物配置已存在！不要重复配置"); + } + }else{ + QueryWrapper eq = QueryWrapper.create().eq(CalcTargetConfigEntity::getTargetThingCode, targetConfig.getTargetThingCode()) + .eq(CalcTargetConfigEntity::getId, targetConfig.getId()) + .eq(CalcTargetConfigEntity::getTargetAttrCode, targetConfig.getTargetAttrCode()) + .eq(CalcTargetConfigEntity::getTenantCode, UserContext.getRealTenantCode()); + CalcTargetConfigEntity calcTargetConfigEntity = mapper.selectOneByQuery(eq); + if(!Objects.isNull(calcTargetConfigEntity)){ + //calcSourceConfigService.findByTargetId(calcTargetConfigEntity.getId()); + throw new SysException(targetConfig.getTargetThingCode()+"-"+targetConfig.getTargetAttrCode()+"目标物配置已存在！不要重复配置"); + } + } // 目标物配置默认设置 targetConfig.setId(flag? IdGenerator.nextId() : targetConfig.getId()); targetConfig.setEnable(Optional.ofNullable(targetConfig.getEnable()).orElse(true)); - QueryWrapper eq = QueryWrapper.create().eq(CalcTargetConfigEntity::getTargetThingCode, targetConfig.getTargetThingCode()) - .eq(CalcTargetConfigEntity::getTargetAttrCode, targetConfig.getTargetAttrCode()) - .eq(CalcTargetConfigEntity::getTenantCode, UserContext.getRealTenantCode()); - CalcTargetConfigEntity calcTargetConfigEntity = mapper.selectOneByQuery(eq); - if(!Objects.isNull(calcTargetConfigEntity)){ - //calcSourceConfigService.findByTargetId(calcTargetConfigEntity.getId()); - throw new SysException(targetConfig.getTargetThingCode()+"-"+targetConfig.getTargetAttrCode()+"目标物配置已存在！不要重复配置"); - } + // 目标物公式描述生成、计算物配置默认信息设置 List sourceConfigs = targetConfig.getSourceConfigs();