From 4b1a419c2345a744fe5ec7ed9007c2628d64c898 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Fri, 19 Dec 2025 17:44:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86/=E5=AE=A2?= =?UTF-8?q?=E6=88=B7-=E8=AF=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/sales/vo/LngScorePageVo.java | 2 +- .../xjrsoft/module/sales/vo/LngScoreVo.java | 14 +++++++++++ .../module/supplier/vo/LngScoreVo.java | 15 +++++++++++ .../impl/PlaceLngUnloadServiceImpl.java | 10 +++----- .../controller/CustomerScoreController.java | 13 +++++++++- .../impl/CustomerScoreServiceImpl.java | 25 ++++++++++++------- .../controller/SupplierScoreController.java | 14 ++++++++--- .../supplier/service/ISupplierService.java | 2 ++ .../impl/SupplierScoreServiceImpl.java | 23 ++++++++++++++--- .../service/impl/SupplierServiceImpl.java | 8 +++--- 10 files changed, 98 insertions(+), 28 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java index 24bbea3..2d1765c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java @@ -34,7 +34,7 @@ public class LngScorePageVo { * 评价体系主键 */ @ApiModelProperty("评价体系主键") - @Trans(type = TransType.API, id = "93d735dcb7364a0f8102188ec4d77ac7") + //@Trans(type = TransType.API, id = "93d735dcb7364a0f8102188ec4d77ac7") private String gsId; /** * 供应商/客户 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScoreVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScoreVo.java index 1bf6774..a12a298 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScoreVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScoreVo.java @@ -4,6 +4,8 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; import com.xjrsoft.module.supplier.vo.LngScoreDtlVo; import com.xjrsoft.module.system.vo.LngFileUploadVo; @@ -134,5 +136,17 @@ public class LngScoreVo { */ @ApiModelProperty("lngFileUpload子表") private List lngFileUploadList; + + @Trans(type = TransType.DIC, id = "1990668094164484097", transToFieldName = "cpClassName") + private String cpClassCode; + + private String cpClassName; + + /** + * 供应商/客户 + */ + @ApiModelProperty("供应商/客户名称") + private String cpName; + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScoreVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScoreVo.java index 18c4e70..2035e7d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScoreVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScoreVo.java @@ -4,6 +4,8 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; import com.xjrsoft.module.system.vo.LngFileUploadVo; import io.swagger.annotations.ApiModelProperty; @@ -136,5 +138,18 @@ public class LngScoreVo { */ @ApiModelProperty("lngFileUpload子表") private List lngFileUploadList; + + + + @Trans(type = TransType.DIC, id = "1990668094164484097", transToFieldName = "cpClassName") + private String cpClassCode; + + private String cpClassName; + + /** + * 供应商/客户 + */ + @ApiModelProperty("供应商/客户名称") + private String cpName; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PlaceLngUnloadServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PlaceLngUnloadServiceImpl.java index 33ab535..cce1247 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PlaceLngUnloadServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PlaceLngUnloadServiceImpl.java @@ -1,17 +1,13 @@ package com.xjrsoft.module.mdm.service.impl; +import org.springframework.stereotype.Service; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.base.MPJBaseServiceImpl; import com.xjrsoft.module.mdm.entity.LngBPlaceLngUnload; import com.xjrsoft.module.mdm.mapper.LngBPlaceLngUnloadMapper; import com.xjrsoft.module.mdm.service.IPlaceLngUnloadService; + import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; /** * @title: service diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerScoreController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerScoreController.java index ad744d6..9fdd4d7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerScoreController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerScoreController.java @@ -119,7 +119,18 @@ public class CustomerScoreController { @SaCheckPermission("scoreCustomer:edit") public R update(@Valid @RequestBody UpdateLngScoreDto dto){ - return R.ok(dataService.updateById(dto)); + return R.ok(dataService.updateById(dto, new DataOperationListener() { + @Override + public UpdateLngScoreDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngScoreDto after(DataOperationContent content) { + //execAfter(content.getTableName(), content.getIdValue(), "I"); + return content.getObj(); + } + })); } @DeleteMapping diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerScoreServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerScoreServiceImpl.java index a01553c..00ca0eb 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerScoreServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerScoreServiceImpl.java @@ -1,28 +1,25 @@ package com.xjrsoft.module.sales.service.impl; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.yulichang.base.MPJBaseServiceImpl; import com.xjrsoft.module.sales.entity.LngCustomer; import com.xjrsoft.module.sales.entity.LngScore; import com.xjrsoft.module.sales.entity.LngScoreDtl; +import com.xjrsoft.module.sales.mapper.LngCustomerMapper; import com.xjrsoft.module.sales.mapper.LngCustomerScoreDtlMapper; import com.xjrsoft.module.sales.mapper.LngCustomerScoreMapper; import com.xjrsoft.module.sales.service.IScoreCustomerService; -import com.xjrsoft.module.sales.vo.LngCustomerDocVo; -import com.xjrsoft.module.sales.vo.LngCustomerVo; import com.xjrsoft.module.sales.vo.LngScoreVo; import com.xjrsoft.module.system.client.IFileClient; import com.xjrsoft.module.system.vo.LngFileUploadVo; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; import lombok.AllArgsConstructor; /** @@ -34,9 +31,12 @@ import lombok.AllArgsConstructor; @Service @AllArgsConstructor public class CustomerScoreServiceImpl extends MPJBaseServiceImpl implements IScoreCustomerService { - private final LngCustomerScoreMapper scoreCustomerLngScoreMapper; + private final LngCustomerScoreMapper customerScoreMapper; + + private final LngCustomerScoreDtlMapper customerScoreDtlMapper; + + private final LngCustomerMapper customerMapper; - private final LngCustomerScoreDtlMapper scoreCustomerLngScoreDtlMapper; private final IFileClient fileClient; @@ -44,8 +44,8 @@ public class CustomerScoreServiceImpl extends MPJBaseServiceImpl ids) { - scoreCustomerLngScoreMapper.deleteBatchIds(ids); - scoreCustomerLngScoreDtlMapper.delete(Wrappers.lambdaQuery(LngScoreDtl.class).in(LngScoreDtl::getSId, ids)); + customerScoreMapper.deleteBatchIds(ids); + customerScoreDtlMapper.delete(Wrappers.lambdaQuery(LngScoreDtl.class).in(LngScoreDtl::getSId, ids)); return true; } @@ -57,6 +57,13 @@ public class CustomerScoreServiceImpl extends MPJBaseServiceImpl() + .eq(LngCustomer::getCuCode, vo.getCpCode())); + if(customer != null) { + vo.setCpClassCode(customer.getClassCode()); + vo.setCpName(customer.getCuName()); + } + List fileList = fileClient.getTableFiles("lng_score", "lngFileUploadList", vo.getId()); vo.setLngFileUploadList(fileList); return vo; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java index 7065812..e1da27e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java @@ -28,10 +28,8 @@ import com.xjrsoft.module.supplier.dto.UpdateLngScoreDto; import com.xjrsoft.module.supplier.entity.LngScore; import com.xjrsoft.module.supplier.service.IScoreSupplierService; import com.xjrsoft.module.supplier.vo.LngScorePageVo; -import com.xjrsoft.module.supplier.vo.LngScoreVo; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import io.swagger.annotations.Api; @@ -115,7 +113,17 @@ public class SupplierScoreController { @ApiOperation(value = "修改LngScore") @SaCheckPermission("scoreSupplier:edit") public R update(@Valid @RequestBody UpdateLngScoreDto dto){ - return R.ok(dataService.updateById(dto)); + return R.ok(dataService.updateById(dto, new DataOperationListener() { + @Override + public UpdateLngScoreDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngScoreDto after(DataOperationContent content) { + return content.getObj(); + } + })); } @DeleteMapping diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/ISupplierService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/ISupplierService.java index 8f6d64e..4cb6661 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/ISupplierService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/ISupplierService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.github.yulichang.base.MPJBaseService; import com.github.yulichang.extension.mapping.base.MPJDeepService; import com.github.yulichang.extension.mapping.base.MPJRelationService; +import com.xjrsoft.module.supplier.dto.UpdateLngSupplierDto; import com.xjrsoft.module.supplier.entity.LngSupplier; import com.xjrsoft.module.supplier.vo.LngSupplierVo; @@ -29,4 +30,5 @@ public interface ISupplierService extends MPJBaseService, MPJDeepSe Boolean delete(List ids); LngSupplierVo getSupplierById(Long id); + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierScoreServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierScoreServiceImpl.java index 7ebf562..83cf18b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierScoreServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierScoreServiceImpl.java @@ -3,7 +3,11 @@ package com.xjrsoft.module.supplier.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.base.MPJBaseServiceImpl; import com.xjrsoft.module.supplier.entity.LngScoreDtl; +import com.xjrsoft.module.supplier.entity.LngSupplier; +import com.xjrsoft.module.supplier.mapper.LngSupplierMapper; import com.xjrsoft.module.supplier.mapper.LngSupplierScoreDtlMapper; +import com.xjrsoft.module.mdm.entity.LngBRegion; +import com.xjrsoft.module.supplier.dto.UpdateLngSupplierDto; import com.xjrsoft.module.supplier.entity.LngScore; import com.xjrsoft.module.supplier.mapper.LngSupplierScoreMapper; import com.xjrsoft.module.supplier.service.IScoreSupplierService; @@ -18,6 +22,8 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; /** @@ -30,9 +36,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; @AllArgsConstructor public class SupplierScoreServiceImpl extends MPJBaseServiceImpl implements IScoreSupplierService { - private final LngSupplierScoreMapper scoreSupplierLngScoreMapper; + private final LngSupplierScoreMapper supplierScoreMapper; - private final LngSupplierScoreDtlMapper scoreSupplierLngScoreDtlMapper; + private final LngSupplierScoreDtlMapper supplierScoreDtlMapper; + + private final LngSupplierMapper supplierMapper; private final IFileClient fileClient; @@ -40,8 +48,8 @@ public class SupplierScoreServiceImpl extends MPJBaseServiceImpl ids) { - scoreSupplierLngScoreMapper.deleteBatchIds(ids); - scoreSupplierLngScoreDtlMapper.delete(Wrappers.lambdaQuery(LngScoreDtl.class).in(LngScoreDtl::getSId, ids)); + supplierScoreMapper.deleteBatchIds(ids); + supplierScoreDtlMapper.delete(Wrappers.lambdaQuery(LngScoreDtl.class).in(LngScoreDtl::getSId, ids)); return true; } @@ -54,6 +62,13 @@ public class SupplierScoreServiceImpl extends MPJBaseServiceImpl() + .eq(LngSupplier::getSuCode, vo.getCpCode())); + if(supplier != null) { + vo.setCpClassCode(supplier.getClassCode()); + vo.setCpName(supplier.getSuName()); + } + List fileList = fileClient.getTableFiles("lng_score", "lngFileUploadList", vo.getId()); vo.setLngFileUploadList(fileList); return vo; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierServiceImpl.java index c58994b..d5249ab 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierServiceImpl.java @@ -7,6 +7,7 @@ import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.module.supplier.dto.UpdateLngSupplierDto; import com.xjrsoft.module.supplier.entity.LngSupplier; import com.xjrsoft.module.supplier.entity.LngSupplierBank; import com.xjrsoft.module.supplier.entity.LngSupplierContact; @@ -34,7 +35,7 @@ import lombok.AllArgsConstructor; @Service @AllArgsConstructor public class SupplierServiceImpl extends MPJBaseServiceImpl implements ISupplierService { - private final LngSupplierMapper supplierLngSupplierMapper; + private final LngSupplierMapper supplierMapper; private final LngSupplierBankMapper supplierLngSupplierBankMapper; private final LngSupplierContactMapper supplierLngSupplierContactMapper; @@ -45,7 +46,7 @@ public class SupplierServiceImpl extends MPJBaseServiceImpl ids) { - supplierLngSupplierMapper.deleteBatchIds(ids); + supplierMapper.deleteBatchIds(ids); supplierLngSupplierBankMapper.delete(Wrappers.lambdaQuery(LngSupplierBank.class).in(LngSupplierBank::getSuCode, ids)); supplierLngSupplierContactMapper.delete(Wrappers.lambdaQuery(LngSupplierContact.class).in(LngSupplierContact::getSuCode, ids)); supplierLngSupplierDocMapper.delete(Wrappers.lambdaQuery(LngSupplierDoc.class).in(LngSupplierDoc::getSuCode, ids)); @@ -70,6 +71,7 @@ public class SupplierServiceImpl extends MPJBaseServiceImpl Date: Mon, 22 Dec 2025 17:48:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=20#789?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CountryRegionController.java | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java index 8870303..1dc6b4c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.pictc.constant.FieldNameConstants; import com.pictc.datalog.DataOperationContent; import com.pictc.datalog.DataOperationListener; import com.pictc.enums.BusinessCode; @@ -129,17 +130,18 @@ public class CountryRegionController { }else { dto.setFullPath(dto.getFullName()); } + checkParams(dto); return content.getObj(); } @Override public UpdateLngBRegionDto after(DataOperationContent content) { String msg = CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue()); - if (StringUtils.isNotBlank(msg)) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); - } - UpdateLngBRegionDto obj = content.getObj(); - tranProvider.saveData(obj.getCode(), obj.getFullName()); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + UpdateLngBRegionDto obj = content.getObj(); + tranProvider.saveData(obj.getCode(), obj.getFullName()); return content.getObj(); } })); @@ -164,15 +166,16 @@ public class CountryRegionController { }else { dto.setFullPath(dto.getFullName()); } + checkParams(dto); return content.getObj(); } @Override public UpdateLngBRegionDto after(DataOperationContent content) { String msg = CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue()); - if (StringUtils.isNotBlank(msg)) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); - } + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } UpdateLngBRegionDto obj = content.getObj(); tranProvider.saveData(obj.getCode(), obj.getFullName()); return content.getObj(); @@ -241,6 +244,22 @@ public class CountryRegionController { return R.ok(countryRegionService.getParentByCode(code,excludeType,startPCode)); } + + + private void checkParams(UpdateLngBRegionDto dto) { + Long codeCount = countryRegionService.count(new LambdaQueryWrapper() + .eq(LngBRegion::getCode, dto.getCode()).ne(dto.getId() != null, LngBRegion::getId, dto.getId())); + if (codeCount > 0) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DATA_FIELD_DUPLICATION, + FieldNameConstants.CODE)); + } + Long nameCount = countryRegionService.count(new LambdaQueryWrapper() + .eq(LngBRegion::getFullName, dto.getFullName()).ne(dto.getId() != null, LngBRegion::getId, dto.getId())); + if (nameCount > 0) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DATA_FIELD_DUPLICATION, + FieldNameConstants.FULL_NAME)); + } + } } \ No newline at end of file From 15d673b6dd4de5f52eeae63b6a704ba7e9d00f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A6=8F=E8=B4=A2?= <1471584931@qq.com> Date: Mon, 22 Dec 2025 18:52:12 +0800 Subject: [PATCH 3/3] --- --- itc-pcitc-demo/itc-pcitc-demo-service/pom.xml | 3 ++- .../itc-pcitc-demo-service/src/main/docker/startApp.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/pom.xml b/itc-pcitc-demo/itc-pcitc-demo-service/pom.xml index 52723fb..7998853 100644 --- a/itc-pcitc-demo/itc-pcitc-demo-service/pom.xml +++ b/itc-pcitc-demo/itc-pcitc-demo-service/pom.xml @@ -18,10 +18,11 @@ ${java.version} ${java.version} pcitc/itc-pcitc-demo - http://10.10.2.102:9500/ + http://10.10.2.102:9509/ pcitc K9$pQ3!zX7@rT2&w false + ${project.build.finalName}-server.jar diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/src/main/docker/startApp.sh b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/docker/startApp.sh index 7dff4c5..b5d03f6 100644 --- a/itc-pcitc-demo/itc-pcitc-demo-service/src/main/docker/startApp.sh +++ b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/docker/startApp.sh @@ -31,8 +31,8 @@ else export JAVA_OPTS="$JAVA_OPTS -XX:+CMSParallelRemarkEnabled -XX:+CMSClassUnloadingEnabled -XX:CMSMaxAbortablePrecleanTime=5000" export JAVA_OPTS="$JAVA_OPTS -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly" export JAVA_OPTS="$JAVA_OPTS -verbose:gc -Xloggc:./logs/gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps" - # 开发环境开启远程调试 - export JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" + # 开发环境开启远程调试 + # export JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" fi # 公共配置（编码、时区等）