From 9db27db96a92ee182c7821f834ec063aeadcaf1a Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 10 Jan 2026 08:12:07 +0800 Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E7=A7=BB=E9=99=A4=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=92=8C=E5=8E=9F=E6=9D=90=E6=96=99=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=BC=93=E5=AD=98=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 注释掉了 WmsProductServiceImpl 中的 @Cacheable 和 @CacheEvict 注解 - 注释掉了 WmsRawMaterialServiceImpl 中的 @Cacheable 和 @CacheEvict 注解 - 清理了查询方法中的多余空行格式 - 暂时禁用 Redis 缓存功能以便后续重构优化 --- .../com/klp/service/impl/WmsProductServiceImpl.java | 12 ++++++------ .../klp/service/impl/WmsRawMaterialServiceImpl.java | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java index d781f404..8c206f32 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java @@ -58,7 +58,7 @@ public class WmsProductServiceImpl implements IWmsProductService { * 查询产品列表（带Redis缓存，30分钟过期） */ @Override - @Cacheable(cacheNames = "wms:product:list", key = "'bo_' + #bo + '_page_' + #pageQuery.pageNum + '_' + #pageQuery.pageSize") +// @Cacheable(cacheNames = "wms:product:list", key = "'bo_' + #bo + '_page_' + #pageQuery.pageNum + '_' + #pageQuery.pageSize") public TableDataInfo queryPageList(WmsProductBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); @@ -92,7 +92,7 @@ public class WmsProductServiceImpl implements IWmsProductService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(StringUtils.isNotBlank(bo.getProductCode()), WmsProduct::getProductCode, bo.getProductCode()); - + // 如果同时传入了名称和规格，且值相同（搜索关键词），使用 OR 条件 boolean hasName = StringUtils.isNotBlank(bo.getProductName()); boolean hasSpec = StringUtils.isNotBlank(bo.getSpecification()); @@ -109,7 +109,7 @@ public class WmsProductServiceImpl implements IWmsProductService { lqw.like(hasName, WmsProduct::getProductName, bo.getProductName()); lqw.like(hasSpec, WmsProduct::getSpecification, bo.getSpecification()); } - + lqw.eq(StringUtils.isNotBlank(bo.getOwner()), WmsProduct::getOwner, bo.getOwner()); lqw.eq(bo.getBaseMaterialId() != null, WmsProduct::getBaseMaterialId, bo.getBaseMaterialId()); lqw.eq(bo.getSurfaceTreatmentId() != null, WmsProduct::getSurfaceTreatmentId, bo.getSurfaceTreatmentId()); @@ -133,7 +133,7 @@ public class WmsProductServiceImpl implements IWmsProductService { */ @Override @Transactional(rollbackFor = Exception.class) - @CacheEvict(cacheNames = "wms:product:list", allEntries = true) +// @CacheEvict(cacheNames = "wms:product:list", allEntries = true) public Boolean insertByBo(WmsProductBo bo) { // 1. 先创建BOM头 WmsBomBo bomBo = new WmsBomBo(); @@ -196,7 +196,7 @@ public class WmsProductServiceImpl implements IWmsProductService { * 修改产品 */ @Override - @CacheEvict(cacheNames = "wms:product:list", allEntries = true) +// @CacheEvict(cacheNames = "wms:product:list", allEntries = true) public Boolean updateByBo(WmsProductBo bo) { WmsProduct update = BeanUtil.toBean(bo, WmsProduct.class); validEntityBeforeSave(update); @@ -233,7 +233,7 @@ public class WmsProductServiceImpl implements IWmsProductService { * 批量删除产品 */ @Override - @CacheEvict(cacheNames = "wms:product:list", allEntries = true) +// @CacheEvict(cacheNames = "wms:product:list", allEntries = true) public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java index c56e80a3..3e81dce8 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java @@ -64,7 +64,7 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService { * 查询原材料列表（带Redis缓存，30分钟过期） */ @Override - @Cacheable(cacheNames = "wms:rawMaterial:list", key = "'bo_' + #bo + '_page_' + #pageQuery.pageNum + '_' + #pageQuery.pageSize") +// @Cacheable(cacheNames = "wms:rawMaterial:list", key = "'bo_' + #bo + '_page_' + #pageQuery.pageNum + '_' + #pageQuery.pageSize") public TableDataInfo queryPageList(WmsRawMaterialBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); @@ -184,7 +184,7 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(StringUtils.isNotBlank(bo.getRawMaterialCode()), WmsRawMaterial::getRawMaterialCode, bo.getRawMaterialCode()); - + // 如果同时传入了名称和规格，且值相同（搜索关键词），使用 OR 条件 boolean hasName = StringUtils.isNotBlank(bo.getRawMaterialName()); boolean hasSpec = StringUtils.isNotBlank(bo.getSpecification()); @@ -201,7 +201,7 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService { lqw.like(hasName, WmsRawMaterial::getRawMaterialName, bo.getRawMaterialName()); lqw.like(hasSpec, WmsRawMaterial::getSpecification, bo.getSpecification()); } - + lqw.eq(StringUtils.isNotBlank(bo.getSteelGrade()), WmsRawMaterial::getSteelGrade, bo.getSteelGrade()); lqw.eq(StringUtils.isNotBlank(bo.getTargetColdGrade()), WmsRawMaterial::getTargetColdGrade, bo.getTargetColdGrade()); lqw.eq(bo.getBaseMaterialId() != null, WmsRawMaterial::getBaseMaterialId, bo.getBaseMaterialId()); @@ -235,7 +235,7 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService { */ @Override @Transactional(rollbackFor = Exception.class) - @CacheEvict(cacheNames = "wms:rawMaterial:list", allEntries = true) +// @CacheEvict(cacheNames = "wms:rawMaterial:list", allEntries = true) public WmsRawMaterialBo insertByBo(WmsRawMaterialBo bo) { // 1. 先创建BOM头 WmsBomBo bomBo = new WmsBomBo(); @@ -335,7 +335,7 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService { * 批量删除原材料 */ @Override - @CacheEvict(cacheNames = "wms:rawMaterial:list", allEntries = true) +// @CacheEvict(cacheNames = "wms:rawMaterial:list", allEntries = true) public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验