From 58dd7806de804d2cfe8c1a4ce3449f7a9b946f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 11 Mar 2026 10:17:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20bug-1344=20=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=A6=96=E9=A1=B5=E7=9A=84=E6=A1=88=E4=BE=8B?= =?UTF-8?q?=EF=BC=8C=E4=BA=A7=E5=93=81=E6=9C=BA=E5=9E=8B=E9=87=8C=E7=9A=84?= =?UTF-8?q?=E6=A1=88=E4=BE=8B=EF=BC=8C=E9=83=A8=E4=BB=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=AD=E6=97=A0=E6=B3=95=E4=B8=8A=E4=BC=A0=E7=BA=AF=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E6=88=96=E5=85=B6=E4=BB=96=E8=AF=AD=E7=A7=8D=E8=A7=86?= =?UTF-8?q?=E9=A2=91=EF=BC=8C=E9=83=BD=E5=BF=85=E9=A1=BB=E8=A6=81=E5=8B=BE?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E6=96=87=EF=BC=8C=E9=9C=80=E8=A6=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProductHonorServiceImpl.java | 7 +-- .../service/impl/ProductPartServiceImpl.java | 14 +---- .../impl/ProductSeriesServiceImpl.java | 14 +---- .../service/impl/ProductTypeServiceImpl.java | 61 ++++++++----------- 4 files changed, 30 insertions(+), 66 deletions(-) diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorServiceImpl.java index 65ff79dd..bf2d8931 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorServiceImpl.java @@ -44,12 +44,7 @@ public class ProductHonorServiceImpl extends ServiceImpl StrUtil.equals(it.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE)) - .findFirst() - .get() - .getTitle() - .trim()) + .setTitle(request.getItems().get(0).getTitle().trim()) .setObtainingTime(request.getObtainingTime()) .setBatchNumber(request.getBatchNumber()) .setEnable(request.getEnable()) diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartServiceImpl.java index 9416269e..fa2de1d1 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartServiceImpl.java @@ -42,13 +42,8 @@ public class ProductPartServiceImpl extends ServiceImpl StrUtil.equals(it.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE)) - .findFirst() - .orElse(null); - VUtils.trueThrowBusinessError(Objects.isNull(cn)).throwMessage("必须包含中文数据"); ProductPart part = new ProductPart() - .setName(cn.getName()) + .setName(request.getItems().get(0).getName()) .setAttrId(request.getAttrId()) .setDescribe(request.getDescribe()) .setCreateBy(AdminUserUtil.getUserName()) @@ -60,14 +55,9 @@ public class ProductPartServiceImpl extends ServiceImpl StrUtil.equals(it.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE)) - .findFirst() - .orElse(null); - VUtils.trueThrowBusinessError(Objects.isNull(cn)).throwMessage("必须包含中文数据"); lambdaUpdate() .set(ProductPart::getAttrId, request.getAttrId()) - .set(ProductPart::getName, cn.getName()) + .set(ProductPart::getName, request.getItems().get(0).getName()) .set(ProductPart::getDescribe, request.getDescribe()) .set(ProductPart::getUpdateBy, AdminUserUtil.getUserName()) .set(ProductPart::getUpdateTime, LocalDateTime.now()) diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesServiceImpl.java index 68108f7b..af5a1b44 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesServiceImpl.java @@ -51,14 +51,9 @@ public class ProductSeriesServiceImpl extends ServiceImpl StrUtil.equals(it.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE)) - .findFirst() - .orElse(null); - VUtils.trueThrowBusinessError(Objects.isNull(cn)).throwMessage("必须包含中文数据"); ProductSeries productSeries = new ProductSeries() .setModuleId(request.getModuleId()) - .setName(cn.getName().trim()) + .setName(request.getItems().get(0).getName().trim()) .setBatchNumber(IdUtil.getSnowflakeNextIdStr()) .setSort(RandomUtil.randomInt(0,10000)) .setCreateBy(AdminUserUtil.getUserName()) @@ -88,13 +83,8 @@ public class ProductSeriesServiceImpl extends ServiceImpl StrUtil.equals(it.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE)) - .findFirst() - .orElse(null); - VUtils.trueThrowBusinessError(Objects.isNull(cn)).throwMessage("必须包含中文数据"); info.setModuleId(request.getModuleId()); - info.setName(cn.getName().trim()); + info.setName(request.getItems().get(0).getName().trim()); // info.setSort(request.getSort()); info.setUpdateBy(AdminUserUtil.getUserName()); info.setUpdateTime(LocalDateTime.now()); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java index 1315e4af..acf067b8 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java @@ -34,7 +34,6 @@ import java.util.Objects; *

* 产品中心-产品类型 服务实现类 *

- * * @author 代码生成器生成 * @since 2025 */ @@ -43,7 +42,7 @@ import java.util.Objects; public class ProductTypeServiceImpl extends ServiceImpl implements IProductTypeService { @Resource - private IProductTypeInfoService productTypeInfoService; + private IProductTypeInfoService productTypeInfoService; @Resource private IProductTypeFileService productTypeFileService; @@ -54,17 +53,12 @@ public class ProductTypeServiceImpl extends ServiceImpl StrUtil.equals(it.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE)) - .findFirst() - .orElse(null); - VUtils.trueThrowBusinessError(Objects.isNull(cn)).throwMessage("必须包含中文数据"); ProductType productType = new ProductType() .setModuleId(request.getModuleId()) .setSeriesNumber(request.getSeriesNumber()) .setBatchNumber(request.getBatchNumber()) - .setName(cn.getName().trim()) - .setSort(RandomUtil.randomInt(0,10000)) + .setName(request.getItems().get(0).getName().trim()) + .setSort(RandomUtil.randomInt(0, 10000)) .setCreateBy(AdminUserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); save(productType); @@ -73,17 +67,17 @@ public class ProductTypeServiceImpl extends ServiceImpl files=new ArrayList<>(); - request.getItems().forEach(item->{ - if (CollectionUtil.isNotEmpty(item.getFiles())){ - item.getFiles().forEach(file->{ + productTypeInfoService.add(productType.getId(), request.getItems()); + List files = new ArrayList<>(); + request.getItems().forEach(item -> { + if (CollectionUtil.isNotEmpty(item.getFiles())) { + item.getFiles().forEach(file -> { file.setLanguageCode(item.getLanguageCode()); files.add(file); }); } }); - productTypeFileService.add(productType.getId(),files); + productTypeFileService.add(productType.getId(), files); return productType.getId(); } @@ -97,12 +91,7 @@ public class ProductTypeServiceImpl extends ServiceImpl StrUtil.equals(it.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE)) - .findFirst() - .orElse(null); - VUtils.trueThrowBusinessError(Objects.isNull(cn)).throwMessage("必须包含中文数据"); - info.setName(cn.getName().trim()); + info.setName(request.getItems().get(0).getName().trim()); info.setModuleId(request.getModuleId()); info.setSeriesNumber(request.getSeriesNumber()); // info.setSort(request.getSort()); @@ -115,9 +104,9 @@ public class ProductTypeServiceImpl extends ServiceImpl files=new ArrayList<>(); - request.getItems().forEach(item->{ - if (CollectionUtil.isNotEmpty(item.getFiles())){ + List files = new ArrayList<>(); + request.getItems().forEach(item -> { + if (CollectionUtil.isNotEmpty(item.getFiles())) { files.addAll(item.getFiles()); } }); @@ -128,7 +117,7 @@ public class ProductTypeServiceImpl extends ServiceImpl getList(ProductTypeSearchRequest request) { - return baseMapper.getList(request,new Page<>(request.getPage(), request.getPageSize())); + return baseMapper.getList(request, new Page<>(request.getPage(), request.getPageSize())); } @Override @@ -142,17 +131,17 @@ public class ProductTypeServiceImpl extends ServiceImpl items = productTypeInfoService.getInfo(typeId); items.forEach(item -> { - item.setFiles(productTypeFileService.getInfo(typeId,item.getLanguageCode())); + item.setFiles(productTypeFileService.getInfo(typeId, item.getLanguageCode())); }); return new ProductTypeInfoVO() .setId(info.getId()) @@ -308,22 +297,22 @@ public class ProductTypeServiceImpl extends ServiceImpl getSimpleListByLanguage(String batchNumber, String language) { - return baseMapper.getSimpleListByLanguage(batchNumber,language); + return baseMapper.getSimpleListByLanguage(batchNumber, language); } - private void delete(Integer typeId){ - ProductType info=getById(typeId); + private void delete(Integer typeId) { + ProductType info = getById(typeId); removeById(typeId); productTypeInfoService.delete(Collections.singletonList(typeId)); productTypeFileService.delete(Collections.singletonList(typeId)); - if(!lambdaQuery() + if (!lambdaQuery() .eq(ProductType::getSeriesNumber, info.getSeriesNumber()) - .exists()){ + .exists()) { log.info("删除对应的设备机型数据"); productModelService.deleteByParent(info.getBatchNumber()); } From 4e94408ab2836c2303ce82967340742e916c5a8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 16 Mar 2026 17:19:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20bug-1344=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=97=A0=E5=AF=B9=E5=BA=94=E8=AF=AD=E8=A8=80=E6=97=B6=E8=8D=A3?= =?UTF-8?q?=E8=AA=89=E4=BC=9A=E6=98=BE=E7=A4=BA=E7=A9=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ProductHonorMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductHonorMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductHonorMapper.xml index d3caecbb..dc8a57ae 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductHonorMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductHonorMapper.xml @@ -28,7 +28,7 @@