rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/product' into test

This commit is contained in:
曹鹏飞 2025-07-17 12:17:15 +08:00
parent c4b047f52e 77a60f754b
commit 5bbc03e5c9
9 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/FrontendProductModelSearchVO.java
View File

@ -69,5 +69,5 @@ public class FrontendProductModelSearchVO {
/** /**
* 主要参数列表 * 主要参数列表
*/ */
private List<ProductModelParamVO> params; private List<ProductParamsItemVO> params;
} }

2
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductModelVO.java
View File

@ -29,7 +29,7 @@ public class ProductModelVO {
/** /**
* 主要参数列表 * 主要参数列表
*/ */
private List<ProductModelParamVO> params; private List<ProductParamsItemVO> params;
/** /**
* 文件 * 文件

2
nflg-mobilebroken-product/src/main/java/com/nflg/mobilebroken/product/controller/MobilebrokenController.java
View File

@ -92,7 +92,7 @@ public class MobilebrokenController extends BaseController{
@GetMapping("/getModel") @GetMapping("/getModel")
public ApiResult<List<ProductModelVO>> getModel(@Valid @RequestParam @NotNull Integer moduleId public ApiResult<List<ProductModelVO>> getModel(@Valid @RequestParam @NotNull Integer moduleId
,@Valid @RequestParam @NotNull String typeNumber){ ,@Valid @RequestParam @NotNull String typeNumber){
return ApiResult.success(productModelService.getList(moduleId,typeNumber,MultilingualUtil.getLanguage(),true)); return ApiResult.success(productModelService.getList(moduleId,typeNumber,MultilingualUtil.getLanguage()));
} }
/** /**

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelParamsMapper.java
View File

@ -18,8 +18,6 @@ import java.util.List;
*/ */
public interface ProductModelParamsMapper extends BaseMapper<ProductModelParams> { public interface ProductModelParamsMapper extends BaseMapper<ProductModelParams> {
List<ProductModelParamVO> getListByLanguage(Integer modelId, String language, boolean main);
List<ProductModelParamVO> getAllListByLanguage(Integer modelId, String language); List<ProductModelParamVO> getAllListByLanguage(Integer modelId, String language);
void copyItems(Integer oldId, Integer newId); void copyItems(Integer oldId, Integer newId);

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelParamsService.java
View File

@ -39,8 +39,6 @@ public interface IProductModelParamsService extends IService<ProductModelParams>
IPage<ProductModelParams> getList(ProductModelIntroSearchRequest request); IPage<ProductModelParams> getList(ProductModelIntroSearchRequest request);
List<ProductModelParamVO> getListByLanguage(Integer modelId, String language,boolean main);
List<ProductModelParamVO> getAllListByLanguage(Integer modelId, String language); List<ProductModelParamVO> getAllListByLanguage(Integer modelId, String language);
void deleteByModel(@NotEmpty List<Integer> ids); void deleteByModel(@NotEmpty List<Integer> ids);

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelService.java
View File

@ -26,7 +26,7 @@ public interface IProductModelService extends IService<ProductModel> {
Page<ProductModelSearchVO> getList(ProductModelSearchRequest request); Page<ProductModelSearchVO> getList(ProductModelSearchRequest request);
List<ProductModelVO> getList(Integer moduleId,String typeNumber, String language, boolean main); List<ProductModelVO> getList(Integer moduleId,String typeNumber, String language);
void delete(@Valid BatchDeleteRequest request); void delete(@Valid BatchDeleteRequest request);

5
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java
View File

@ -139,11 +139,6 @@ public class ProductModelParamsServiceImpl extends ServiceImpl<ProductModelParam
.page(new Page<>(request.getPage(), request.getPageSize())); .page(new Page<>(request.getPage(), request.getPageSize()));
} }
@Override
public List<ProductModelParamVO> getListByLanguage(Integer modelId, String language,boolean main) {
return baseMapper.getListByLanguage(modelId, language,main);
}
@Override @Override
public List<ProductModelParamVO> getAllListByLanguage(Integer modelId, String language) { public List<ProductModelParamVO> getAllListByLanguage(Integer modelId, String language) {
return baseMapper.getAllListByLanguage(modelId, language); return baseMapper.getAllListByLanguage(modelId, language);

6
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java
View File

@ -192,7 +192,7 @@ public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, Pro
} }
@Override @Override
public List<ProductModelVO> getList(Integer moduleId,String typeNumber, String language, boolean main) { public List<ProductModelVO> getList(Integer moduleId,String typeNumber, String language) {
List<ProductModel> list = lambdaQuery() List<ProductModel> list = lambdaQuery()
.eq(ProductModel::getModuleId, moduleId) .eq(ProductModel::getModuleId, moduleId)
.eq(ProductModel::getTypeNumber, typeNumber) .eq(ProductModel::getTypeNumber, typeNumber)
@ -206,7 +206,7 @@ public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, Pro
.setNo(item.getNo()) .setNo(item.getNo())
.setRecommend(item.getRecommend()) .setRecommend(item.getRecommend())
.setImage(item.getImage()) .setImage(item.getImage())
.setParams(productPartParamsService.getListByLanguage(item.getId(), language,main)) .setParams(productPartParamsService.getMainListByLanguage(item.getId(), language))
.setFile(productModelFileService.getDefaultByLanguage(item.getId(), language))) .setFile(productModelFileService.getDefaultByLanguage(item.getId(), language)))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@ -394,7 +394,7 @@ public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, Pro
public Page<FrontendProductModelSearchVO> search(ProductSeriesSearchRequest request, String language) { public Page<FrontendProductModelSearchVO> search(ProductSeriesSearchRequest request, String language) {
Page<FrontendProductModelSearchVO> datas=baseMapper.search(request.getName(),language,new Page<>(request.getPage(), request.getPageSize())); Page<FrontendProductModelSearchVO> datas=baseMapper.search(request.getName(),language,new Page<>(request.getPage(), request.getPageSize()));
datas.getRecords().forEach(it->{ datas.getRecords().forEach(it->{
it.setParams(productPartParamsService.getListByLanguage(it.getId(), language,true)); it.setParams(productPartParamsService.getMainListByLanguage(it.getId(), language));
}); });
return datas; return datas;
} }

11
nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsMapper.xml
View File

@ -2,17 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nflg.mobilebroken.repository.mapper.ProductModelParamsMapper"> <mapper namespace="com.nflg.mobilebroken.repository.mapper.ProductModelParamsMapper">
<select id="getListByLanguage" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductModelParamVO">
SELECT pmpi.index_name, pmpi.`name`, pmpi.`value`
FROM product_model_params pmp
INNER JOIN product_model_params_item pmpi ON pmp.id = pmpi.model_params_id
WHERE pmp.model_id = #{modelId}
AND pmp.state = 1
AND pmpi.main = #{main}
AND pmpi.language_code = #{language}
ORDER BY pmp.id DESC
</select>
<select id="getAllListByLanguage" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductModelParamVO"> <select id="getAllListByLanguage" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductModelParamVO">
SELECT pmpi.index_name, pmpi.`name`, pmpi.`value` SELECT pmpi.index_name, pmpi.`name`, pmpi.`value`
FROM product_model_params pmp FROM product_model_params pmp