From 77a60f754b620a4afdc86c34a25969b6ee6b96bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 17 Jul 2025 12:16:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=87=8C=E7=9A=84=E4=BA=A7=E5=93=81=E4=B8=BB=E8=A6=81=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=8E=92=E5=BA=8F=E4=B8=8E=E8=AE=BE=E7=BD=AE=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/pojo/vo/FrontendProductModelSearchVO.java | 2 +- .../mobilebroken/common/pojo/vo/ProductModelVO.java | 2 +- .../product/controller/MobilebrokenController.java | 2 +- .../repository/mapper/ProductModelParamsMapper.java | 2 -- .../service/IProductModelParamsService.java | 2 -- .../repository/service/IProductModelService.java | 2 +- .../service/impl/ProductModelParamsServiceImpl.java | 5 ----- .../service/impl/ProductModelServiceImpl.java | 6 +++--- .../resources/mapper/ProductModelParamsMapper.xml | 11 ----------- 9 files changed, 7 insertions(+), 27 deletions(-) diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/FrontendProductModelSearchVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/FrontendProductModelSearchVO.java index 61930841..dfad3e9e 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/FrontendProductModelSearchVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/FrontendProductModelSearchVO.java @@ -69,5 +69,5 @@ public class FrontendProductModelSearchVO { /** * 主要参数列表 */ - private List params; + private List params; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductModelVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductModelVO.java index 5db02ec6..c0fdf3a4 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductModelVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductModelVO.java @@ -29,7 +29,7 @@ public class ProductModelVO { /** * 主要参数列表 */ - private List params; + private List params; /** * 文件 diff --git a/nflg-mobilebroken-product/src/main/java/com/nflg/mobilebroken/product/controller/MobilebrokenController.java b/nflg-mobilebroken-product/src/main/java/com/nflg/mobilebroken/product/controller/MobilebrokenController.java index a432115a..46538d80 100644 --- a/nflg-mobilebroken-product/src/main/java/com/nflg/mobilebroken/product/controller/MobilebrokenController.java +++ b/nflg-mobilebroken-product/src/main/java/com/nflg/mobilebroken/product/controller/MobilebrokenController.java @@ -92,7 +92,7 @@ public class MobilebrokenController extends BaseController{ @GetMapping("/getModel") public ApiResult> getModel(@Valid @RequestParam @NotNull Integer moduleId ,@Valid @RequestParam @NotNull String typeNumber){ - return ApiResult.success(productModelService.getList(moduleId,typeNumber,MultilingualUtil.getLanguage(),true)); + return ApiResult.success(productModelService.getList(moduleId,typeNumber,MultilingualUtil.getLanguage())); } /** diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelParamsMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelParamsMapper.java index 9c0da3ad..02f80fc0 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelParamsMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelParamsMapper.java @@ -18,8 +18,6 @@ import java.util.List; */ public interface ProductModelParamsMapper extends BaseMapper { - List getListByLanguage(Integer modelId, String language, boolean main); - List getAllListByLanguage(Integer modelId, String language); void copyItems(Integer oldId, Integer newId); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelParamsService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelParamsService.java index 293abb8b..be1f0ca8 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelParamsService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelParamsService.java @@ -39,8 +39,6 @@ public interface IProductModelParamsService extends IService IPage getList(ProductModelIntroSearchRequest request); - List getListByLanguage(Integer modelId, String language,boolean main); - List getAllListByLanguage(Integer modelId, String language); void deleteByModel(@NotEmpty List ids); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelService.java index 51eb7f84..73c94216 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelService.java @@ -26,7 +26,7 @@ public interface IProductModelService extends IService { Page getList(ProductModelSearchRequest request); - List getList(Integer moduleId,String typeNumber, String language, boolean main); + List getList(Integer moduleId,String typeNumber, String language); void delete(@Valid BatchDeleteRequest request); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java index 631ad583..63937de6 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java @@ -139,11 +139,6 @@ public class ProductModelParamsServiceImpl extends ServiceImpl(request.getPage(), request.getPageSize())); } - @Override - public List getListByLanguage(Integer modelId, String language,boolean main) { - return baseMapper.getListByLanguage(modelId, language,main); - } - @Override public List getAllListByLanguage(Integer modelId, String language) { return baseMapper.getAllListByLanguage(modelId, language); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java index 101284e3..ce383a6b 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java @@ -192,7 +192,7 @@ public class ProductModelServiceImpl extends ServiceImpl getList(Integer moduleId,String typeNumber, String language, boolean main) { + public List getList(Integer moduleId,String typeNumber, String language) { List list = lambdaQuery() .eq(ProductModel::getModuleId, moduleId) .eq(ProductModel::getTypeNumber, typeNumber) @@ -206,7 +206,7 @@ public class ProductModelServiceImpl extends ServiceImpl search(ProductSeriesSearchRequest request, String language) { Page datas=baseMapper.search(request.getName(),language,new Page<>(request.getPage(), request.getPageSize())); datas.getRecords().forEach(it->{ - it.setParams(productPartParamsService.getListByLanguage(it.getId(), language,true)); + it.setParams(productPartParamsService.getMainListByLanguage(it.getId(), language)); }); return datas; } diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsMapper.xml index 9920a93c..f83dcbc9 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsMapper.xml @@ -2,17 +2,6 @@ - -