From 1362ee20dc8b7576bd2521436d779a46c47b3964 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 3 Sep 2025 14:31:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=8C=E7=BA=A7=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../advance/enums/AdvanceResponseEnum.java | 9 ++++++++ .../impl/AssessCapacitorParamServiceImpl.java | 19 ++++++++++++++++ .../impl/AssessDicCableTypeServiceImpl.java | 16 ++++++++++++++ ...AssessDicHarmonicCharacterServiceImpl.java | 22 +++++++++++++++++-- .../impl/AssessDicShockLoadServiceImpl.java | 16 ++++++++++++++ .../impl/AssessDicTransformerServiceImpl.java | 16 ++++++++++++++ .../impl/AssessLoadParamServiceImpl.java | 18 +++++++++++++++ .../impl/AssessShockLoadParamServiceImpl.java | 18 +++++++++++++++ .../AssessTransformerParamServiceImpl.java | 18 +++++++++++++++ .../assess/impl/AssessUserServiceImpl.java | 21 +++++++++++++++--- .../impl/AssessWindLoadParamServiceImpl.java | 1 - 11 files changed, 168 insertions(+), 6 deletions(-) diff --git a/pqs-advance/advance-api/src/main/java/com/njcn/advance/enums/AdvanceResponseEnum.java b/pqs-advance/advance-api/src/main/java/com/njcn/advance/enums/AdvanceResponseEnum.java index 1e415cdee..28ffe3a37 100644 --- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/enums/AdvanceResponseEnum.java +++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/enums/AdvanceResponseEnum.java @@ -80,6 +80,15 @@ public enum AdvanceResponseEnum { EVENT_TIME_ERROR("A0102","暂降事件时间格式有误，请检查"), INVALID_FILE_TYPE("A0102","请选择CSV文件"), + HARMONICCHARACTER_NAME_REPETITION("A0103","谐波源特性名称重复"), + CABLETYPE_NAME_REPETITION("A0103","线路线缆名称重复"), + TRANSFORMER_NAME_REPETITION("A0103","变压器类型名称重复"), + SHOCKLOAD_NAME_REPETITION("A0103","冲击负荷类型名称重复"), + ASSESSUSER_NAME_REPETITION("A0103","评估用户名称重复"), + CAPACITOR_NAME_REPETITION("A0103","电容器组名称重复"), + LOAD_NAME_REPETITION("A0103","用户负荷名称重复"), + INPACTLOADTYPE_NAME_REPETITION("A0103","冲击负荷类型重复"), + TRANS_NAME_REPETITION("A0103","变压器名称重复"), ; private final String code; diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessCapacitorParamServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessCapacitorParamServiceImpl.java index 19ae0dfad..c719c992e 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessCapacitorParamServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessCapacitorParamServiceImpl.java @@ -3,11 +3,15 @@ package com.njcn.advance.service.assess.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.njcn.advance.enums.AdvanceResponseEnum; import com.njcn.advance.mapper.assess.AssessCapacitorParamMapper; import com.njcn.advance.pojo.param.assess.AssessCapacitorParamQuery; import com.njcn.advance.pojo.po.assess.AssessCapacitorParam; +import com.njcn.advance.pojo.po.assess.AssessDicCableType; +import com.njcn.advance.pojo.po.assess.AssessUser; import com.njcn.advance.service.assess.IAssessCapacitorParamService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.exception.BusinessException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,6 +45,13 @@ public class AssessCapacitorParamServiceImpl extends ServiceImpl() + .eq(AssessCapacitorParam::getAssessId, param.getAssessId()) + .eq(AssessCapacitorParam::getCapacitorName, param.getCapacitorName()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.CAPACITOR_NAME_REPETITION); + } BeanUtil.copyProperties(param,entity); return this.save(entity); } @@ -50,6 +61,14 @@ public class AssessCapacitorParamServiceImpl extends ServiceImpl() + .eq(AssessCapacitorParam::getAssessId, updateQuery.getAssessId()) + .ne(AssessCapacitorParam::getCapacitorId, updateQuery.getCapacitorId()) + .eq(AssessCapacitorParam::getCapacitorName, updateQuery.getCapacitorName()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.CAPACITOR_NAME_REPETITION); + } AssessCapacitorParam pojo = new AssessCapacitorParam(); BeanUtil.copyProperties(updateQuery,pojo); this.updateById(pojo); diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessDicCableTypeServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessDicCableTypeServiceImpl.java index 3c0b9d168..730daa150 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessDicCableTypeServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessDicCableTypeServiceImpl.java @@ -3,11 +3,14 @@ package com.njcn.advance.service.assess.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.njcn.advance.enums.AdvanceResponseEnum; import com.njcn.advance.mapper.assess.AssessDicCableTypeMapper; import com.njcn.advance.pojo.param.assess.AssessDicCableTypeQuery; import com.njcn.advance.pojo.po.assess.AssessDicCableType; +import com.njcn.advance.pojo.po.assess.AssessDicHarmonicCharacter; import com.njcn.advance.service.assess.IAssessDicCableTypeService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.exception.BusinessException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,6 +44,12 @@ public class AssessDicCableTypeServiceImpl extends ServiceImpl() + .eq(AssessDicCableType::getLinetypeName, param.getLinetypeName()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.CABLETYPE_NAME_REPETITION); + } BeanUtil.copyProperties(param,entity); return this.save(entity); } @@ -50,6 +59,13 @@ public class AssessDicCableTypeServiceImpl extends ServiceImpl() + .ne(AssessDicCableType::getLinetypeId, updateQuery.getLinetypeId()) + .eq(AssessDicCableType::getLinetypeName, updateQuery.getLinetypeName()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.CABLETYPE_NAME_REPETITION); + } BeanUtil.copyProperties(updateQuery,entity); this.updateById(entity); } diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessDicHarmonicCharacterServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessDicHarmonicCharacterServiceImpl.java index e2df648ff..a3fa46a40 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessDicHarmonicCharacterServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessDicHarmonicCharacterServiceImpl.java @@ -1,17 +1,22 @@ package com.njcn.advance.service.assess.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.njcn.advance.enums.AdvanceResponseEnum; import com.njcn.advance.mapper.assess.AssessDicHarmonicCharacterMapper; import com.njcn.advance.pojo.param.assess.AssessDicHarmonicCharacterQuery; import com.njcn.advance.pojo.po.assess.AssessDicHarmonicCharacter; import com.njcn.advance.service.assess.IAssessDicHarmonicCharacterService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.pms.enums.PmsDeviceResponseEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.stream.Collectors; /** *

@@ -35,14 +40,27 @@ public class AssessDicHarmonicCharacterServiceImpl extends ServiceImpl() + .eq(AssessDicHarmonicCharacter::getHarmName, param.getHarmName()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.HARMONICCHARACTER_NAME_REPETITION); + } + BeanUtil.copyProperties(param, entity); return this.save(entity); } @Override public boolean update(AssessDicHarmonicCharacterQuery.UpdateAssessDicHarmonicCharacterQuery param) { AssessDicHarmonicCharacter entity = new AssessDicHarmonicCharacter(); - BeanUtil.copyProperties(param,entity); + int count = this.count(new LambdaQueryWrapper() + .ne(AssessDicHarmonicCharacter::getHarmId, param.getHarmId()) + .eq(AssessDicHarmonicCharacter::getHarmName, param.getHarmName()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.HARMONICCHARACTER_NAME_REPETITION); + } + BeanUtil.copyProperties(param, entity); return this.updateById(entity); } } \ No newline at end of file diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessDicShockLoadServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessDicShockLoadServiceImpl.java index 510be8c33..6a888fc3c 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessDicShockLoadServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessDicShockLoadServiceImpl.java @@ -3,11 +3,14 @@ package com.njcn.advance.service.assess.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.njcn.advance.enums.AdvanceResponseEnum; import com.njcn.advance.mapper.assess.AssessDicShockLoadMapper; import com.njcn.advance.pojo.param.assess.AssessDicShockLoadQuery; import com.njcn.advance.pojo.po.assess.AssessDicShockLoad; +import com.njcn.advance.pojo.po.assess.AssessDicTransformer; import com.njcn.advance.service.assess.IAssessDicShockLoadService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.exception.BusinessException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -34,6 +37,12 @@ public class AssessDicShockLoadServiceImpl extends ServiceImpl() + .eq(AssessDicShockLoad::getInpactloadtypeName, param.getInpactloadtypeName()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.SHOCKLOAD_NAME_REPETITION); + } BeanUtil.copyProperties(param,entity); return this.save(entity); } @@ -43,6 +52,13 @@ public class AssessDicShockLoadServiceImpl extends ServiceImpl() + .ne(AssessDicShockLoad::getInpactloadtypeId, updateQuery.getInpactloadtypeId()) + .eq(AssessDicShockLoad::getInpactloadtypeName, updateQuery.getInpactloadtypeName()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.SHOCKLOAD_NAME_REPETITION); + } BeanUtil.copyProperties(updateQuery,entity); this.updateById(entity); } diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessDicTransformerServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessDicTransformerServiceImpl.java index 804417b09..f3cd81164 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessDicTransformerServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessDicTransformerServiceImpl.java @@ -3,11 +3,14 @@ package com.njcn.advance.service.assess.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.njcn.advance.enums.AdvanceResponseEnum; import com.njcn.advance.mapper.assess.AssessDicTransformerMapper; import com.njcn.advance.pojo.param.assess.AssessDicTransformerQuery; +import com.njcn.advance.pojo.po.assess.AssessDicCableType; import com.njcn.advance.pojo.po.assess.AssessDicTransformer; import com.njcn.advance.service.assess.IAssessDicTransformerService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.exception.BusinessException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -35,6 +38,12 @@ public class AssessDicTransformerServiceImpl extends ServiceImpl() + .eq(AssessDicTransformer::getTranstypeName, param.getTranstypeName()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.TRANSFORMER_NAME_REPETITION); + } BeanUtil.copyProperties(param,entity); return this.save(entity); } @@ -44,6 +53,13 @@ public class AssessDicTransformerServiceImpl extends ServiceImpl() + .ne(AssessDicTransformer::getTranstypeId, updateQuery.getTranstypeId()) + .eq(AssessDicTransformer::getTranstypeName, updateQuery.getTranstypeName()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.TRANSFORMER_NAME_REPETITION); + } BeanUtil.copyProperties(updateQuery,entity); this.updateById(entity); } diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessLoadParamServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessLoadParamServiceImpl.java index ebb5a92da..a8a45db85 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessLoadParamServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessLoadParamServiceImpl.java @@ -3,11 +3,14 @@ package com.njcn.advance.service.assess.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.advance.enums.AdvanceResponseEnum; import com.njcn.advance.mapper.assess.AssessLoadParamMapper; import com.njcn.advance.mapper.assess.AssessUserMapper; import com.njcn.advance.pojo.param.assess.AssessLoadParamQuery; +import com.njcn.advance.pojo.po.assess.AssessCapacitorParam; import com.njcn.advance.pojo.po.assess.AssessLoadParam; import com.njcn.advance.service.assess.IAssessLoadParamService; +import com.njcn.common.pojo.exception.BusinessException; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -46,6 +49,13 @@ public class AssessLoadParamServiceImpl extends ServiceImpl() + .eq(AssessLoadParam::getAssessId, assessLoadParam.getAssessId()) + .eq(AssessLoadParam::getLoadName, assessLoadParam.getLoadName()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.LOAD_NAME_REPETITION); + } this.save(pojo); return true; } @@ -53,6 +63,14 @@ public class AssessLoadParamServiceImpl extends ServiceImpl() + .eq(AssessLoadParam::getAssessId, updateQuery.getAssessId()) + .ne(AssessLoadParam::getLoadId, updateQuery.getLoadId()) + .eq(AssessLoadParam::getLoadName, updateQuery.getLoadName()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.LOAD_NAME_REPETITION); + } BeanUtils.copyProperties(updateQuery,pojo); this.updateById(pojo); return true; diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessShockLoadParamServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessShockLoadParamServiceImpl.java index 389bb3aca..2cc9500ca 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessShockLoadParamServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessShockLoadParamServiceImpl.java @@ -3,11 +3,14 @@ package com.njcn.advance.service.assess.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.njcn.advance.enums.AdvanceResponseEnum; import com.njcn.advance.mapper.assess.AssessShockLoadParamMapper; import com.njcn.advance.pojo.param.assess.AssessShockLoadParamQuery; +import com.njcn.advance.pojo.po.assess.AssessLoadParam; import com.njcn.advance.pojo.po.assess.AssessShockLoadParam; import com.njcn.advance.service.assess.IAssessShockLoadParamService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.exception.BusinessException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,6 +50,13 @@ public class AssessShockLoadParamServiceImpl extends ServiceImpl() + .eq(AssessShockLoadParam::getAssessId, param.getAssessId()) + .eq(AssessShockLoadParam::getInpactloadtypeId, param.getInpactloadtypeId()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.INPACTLOADTYPE_NAME_REPETITION); + } BeanUtil.copyProperties(param,entity); return this.save(entity); } @@ -55,6 +65,14 @@ public class AssessShockLoadParamServiceImpl extends ServiceImpl() + .eq(AssessShockLoadParam::getAssessId, updateQuery.getAssessId()) + .ne(AssessShockLoadParam::getInpactloadId,updateQuery.getInpactloadId()) + .eq(AssessShockLoadParam::getInpactloadtypeId, updateQuery.getInpactloadtypeId()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.INPACTLOADTYPE_NAME_REPETITION); + } if (entity != null) { BeanUtil.copyProperties(updateQuery,entity); this.updateById(entity); diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessTransformerParamServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessTransformerParamServiceImpl.java index 585849ee5..5fd29aed0 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessTransformerParamServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessTransformerParamServiceImpl.java @@ -3,11 +3,14 @@ package com.njcn.advance.service.assess.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.njcn.advance.enums.AdvanceResponseEnum; import com.njcn.advance.mapper.assess.AssessTransformerParamMapper; import com.njcn.advance.pojo.param.assess.AssessTransformerParamQuery; +import com.njcn.advance.pojo.po.assess.AssessShockLoadParam; import com.njcn.advance.pojo.po.assess.AssessTransformerParam; import com.njcn.advance.service.assess.IAssessTransformerParamService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.exception.BusinessException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,6 +44,13 @@ public class AssessTransformerParamServiceImpl extends ServiceImpl() + .eq(AssessTransformerParam::getAssessId, param.getAssessId()) + .eq(AssessTransformerParam::getTransName, param.getTransName()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.TRANS_NAME_REPETITION); + } BeanUtil.copyProperties(param,entity); return this.save(entity); } @@ -49,6 +59,14 @@ public class AssessTransformerParamServiceImpl extends ServiceImpl() + .eq(AssessTransformerParam::getAssessId, updateQuery.getAssessId()) + .ne(AssessTransformerParam::getTransId,updateQuery.getTransId()) + .eq(AssessTransformerParam::getTransName, updateQuery.getTransName()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.TRANS_NAME_REPETITION); + } if (entity != null) { BeanUtil.copyProperties(updateQuery,entity); this.updateById(entity); diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessUserServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessUserServiceImpl.java index a10403f60..481042d85 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessUserServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessUserServiceImpl.java @@ -8,10 +8,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.advance.enums.AdvanceResponseEnum; import com.njcn.advance.mapper.assess.AssessUserMapper; import com.njcn.advance.pojo.param.assess.AssessUserQuery; +import com.njcn.advance.pojo.po.assess.AssessDicShockLoad; import com.njcn.advance.pojo.po.assess.AssessUser; import com.njcn.advance.service.assess.IAssessUserService; +import com.njcn.common.pojo.exception.BusinessException; import com.njcn.user.api.DeptFeignClient; import com.njcn.web.factory.PageFactory; import lombok.RequiredArgsConstructor; @@ -38,7 +41,7 @@ public class AssessUserServiceImpl extends ServiceImpl wrapper = Wrappers.lambdaQuery() .in(AssessUser::getDeptId,deptFeignClient.getDepSonIdtByDeptId(assessUserQuery.getDeptId()).getData()) .eq(StrUtil.isNotBlank(assessUserQuery.getDeptName()), AssessUser::getDeptName, assessUserQuery.getDeptName()) - .in(CollUtil.isNotEmpty(assessUserQuery.getBusScaleList()),AssessUser::getBusId,assessUserQuery.getBusScaleList()) + .in(CollUtil.isNotEmpty(assessUserQuery.getBusScaleList()),AssessUser::getBusScale,assessUserQuery.getBusScaleList()) .in(CollUtil.isNotEmpty(assessUserQuery.getPowerstationScaleList()),AssessUser::getPowerstationScale,assessUserQuery.getPowerstationScaleList()) .like(StrUtil.isNotBlank(assessUserQuery.getAssessName()), AssessUser::getAssessName, assessUserQuery.getAssessName()) .eq(StrUtil.isNotBlank(assessUserQuery.getIsWindfarm()), AssessUser::getIsWindfarm, assessUserQuery.getIsWindfarm()) @@ -58,6 +61,12 @@ public class AssessUserServiceImpl extends ServiceImpl() + .eq(AssessUser::getAssessName, assessUserQuery.getAssessName()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.ASSESSUSER_NAME_REPETITION); + } this.save(assessUser); return assessUser.getAssessId(); } @@ -66,7 +75,13 @@ public class AssessUserServiceImpl extends ServiceImpl() + .ne(AssessUser::getAssessId, updateAssessUserQuery.getAssessId()) + .eq(AssessUser::getAssessName, updateAssessUserQuery.getAssessName()) + ); + if (count > 0) { + throw new BusinessException(AdvanceResponseEnum.ASSESSUSER_NAME_REPETITION); + } + return this.updateById(assessUser); } } diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessWindLoadParamServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessWindLoadParamServiceImpl.java index 72bd68619..37b2b9d82 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessWindLoadParamServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessWindLoadParamServiceImpl.java @@ -1,6 +1,5 @@ package com.njcn.advance.service.assess.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.njcn.advance.mapper.assess.AssessWindLoadParamMapper; import com.njcn.advance.pojo.param.assess.AssessWindLoadParamQuery;