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-08-13 09:15:02 +08:00
parent 64d9c12850 7fd5bbb19e
commit 3cd0b3d8b4
5 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java
View File

@ -995,7 +995,7 @@ public class ProductModelController extends ControllerBase{
* @param request 请求参数
*/
@PostMapping("/saveFileSort")
public ApiResult<Void> saveFileSort(@Valid @RequestBody SortSaveRequest request){
public ApiResult<Void> saveFileSort(@Valid @RequestBody SortSaveRequest request) {
productModelFileService.saveSort(request);
return ApiResult.success();
}

23
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SortSaveNewRequest.java Normal file
View File

@ -0,0 +1,23 @@
package com.nflg.mobilebroken.common.pojo.request;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
public class SortSaveNewRequest {
/**
* 机型id
*/
@NotNull
private Integer modelId;
/**
* 调整后的顺序
*/
@NotEmpty
private List<Integer> ids;
}

11
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileItemServiceImpl.java
View File

@ -14,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
@ -72,10 +73,12 @@ public class ProductModelFileItemServiceImpl extends ServiceImpl<ProductModelFil
.eq(ProductModelFileItem::getModelId, request.getModelId())
.update();
request.getItems().forEach(item -> {
lambdaUpdate()
.set(ProductModelFileItem::getShowInList, true)
.eq(ProductModelFileItem::getId, item.getFileItemId())
.update();
if (Objects.nonNull(item.getFileItemId())) {
lambdaUpdate()
.set(ProductModelFileItem::getShowInList, true)
.eq(ProductModelFileItem::getId, item.getFileItemId())
.update();
}
});
}

32
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java
View File

@ -29,7 +29,6 @@ import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
@ -240,25 +239,20 @@ public class ProductModelFileServiceImpl extends ServiceImpl<ProductModelFileMap
@Override
public List<FileDefaultConfigVO> getDefaultConfig(Integer modelId) {
List<Language> languages = languageService.getAllLanguages();
// List<ProductModelFileItem> list = productModelFileItemService.lambdaQuery()
// .eq(ProductModelFileItem::getModelId, modelId)
// .orderByAsc(ProductModelFileItem::getLanguageCode)
// .orderByDesc(ProductModelFileItem::getShowInList)
// .list();
List<ProductModelFileItem> list =productModelFileItemService.getPublishedByLanguage(modelId);
List<FileDefaultConfigVO> vos=new ArrayList<>();
Map<String, List<ProductModelFileItem>> maps=list.stream().collect(Collectors.groupingBy(ProductModelFileItem::getLanguageCode));
maps.forEach((languageCode,data)->{
FileDefaultConfigVO vo=new FileDefaultConfigVO()
.setLanguageCode(languageCode)
.setLanguageName(languages.stream().filter(lang->lang.getCode().equals(languageCode)).findFirst().get().getName())
.setItems(data.stream().map(item->new FileDefaultConfigItemVO()
.setId(item.getId())
.setName(item.getName())
.setSelected(item.getShowInList()))
.collect(Collectors.toList())
);
List<Language> languages = languageService.getLanguages();
List<ProductModelFileItem> list = productModelFileItemService.getPublishedByLanguage(modelId);
languages.forEach(language -> {
FileDefaultConfigVO vo = new FileDefaultConfigVO()
.setLanguageCode(language.getCode())
.setLanguageName(language.getName())
.setItems(list.stream().filter(item -> StrUtil.equals(language.getCode(), item.getLanguageCode()))
.map(item -> {
return new FileDefaultConfigItemVO()
.setId(item.getId())
.setName(item.getName())
.setSelected(item.getShowInList());
}).collect(Collectors.toList()));
vos.add(vo);
});
return vos;

1
nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelFileMapper.xml
View File

@ -25,5 +25,6 @@
FROM product_model_file pmf
INNER JOIN product_model_file_item pmfi ON pmf.id = pmfi.model_file_id
WHERE pmf.`enable` = 1 AND pmf.state = 1 AND pmf.model_id = #{modelId} AND pmfi.language_code = #{language}
ORDER BY pmf.sort
</select>
</mapper>