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

Merge branch 'feature/product' into develop

This commit is contained in:
曹鹏飞 2025-08-12 18:10:52 +08:00
parent fe6c3cc27a 7fd5bbb19e
commit 62ce622d9b
4 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.IOException;
import java.io.InputStream;
@ -993,11 +992,11 @@ public class ProductModelController extends ControllerBase{
/**
* 保存资料排序
* @param ids 排序后的id列表
* @param request 请求参数
*/
@PostMapping("/saveFileSort")
public ApiResult<Void> saveFileSort(@Valid @RequestBody @NotEmpty List<Integer> ids) {
productModelFileService.saveSort(ids);
public ApiResult<Void> saveFileSort(@Valid @RequestBody SortSaveRequest request) {
productModelFileService.saveSort(request);
return ApiResult.success();
}

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

@ -41,7 +41,7 @@ public interface IProductModelFileService extends IService<ProductModelFile> {
List<ProductModelFile> getListForSort(Integer modelId);
void saveSort(List<Integer> ids);
void saveSort(SortSaveRequest request);
void copyItems(Integer oldId, Integer newId);

3
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 -> {
if (Objects.nonNull(item.getFileItemId())) {
lambdaUpdate()
.set(ProductModelFileItem::getShowInList, true)
.eq(ProductModelFileItem::getId, item.getFileItemId())
.update();
}
});
}

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

@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.mobilebroken.common.constant.PublishState;
import com.nflg.mobilebroken.common.constant.STATE;
import com.nflg.mobilebroken.common.exception.NflgException;
import com.nflg.mobilebroken.common.pojo.request.*;
import com.nflg.mobilebroken.common.pojo.vo.FileDefaultConfigItemVO;
import com.nflg.mobilebroken.common.pojo.vo.FileDefaultConfigVO;
@ -27,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;
@ -204,13 +205,22 @@ public class ProductModelFileServiceImpl extends ServiceImpl<ProductModelFileMap
@Transactional
@Override
public void saveSort(List<Integer> ids) {
List<ProductModelFile> datas = new ArrayList<>();
for (int i = 0; i < ids.size(); i++) {
datas.add(new ProductModelFile()
.setId(ids.get(i))
.setSort(i + 1)
public void saveSort(SortSaveRequest request) {
List<ProductModelFile> datas = lambdaQuery()
.select(ProductModelFile::getId, ProductModelFile::getSort)
.in(ProductModelFile::getId, request.getId(), request.getPreviousId(), request.getNextId())
.list();
ProductModelFile current = datas.stream().filter(data -> data.getId().equals(request.getId())).findFirst().orElseThrow(
() -> new NflgException(STATE.BusinessError, "无效的数据")
);
ProductModelFile previous = datas.stream().filter(data -> data.getId().equals(request.getPreviousId())).findFirst().orElse(null);
ProductModelFile next = datas.stream().filter(data -> data.getId().equals(request.getNextId())).findFirst().orElse(null);
if (Objects.isNull(previous)) {
current.setSort(next.getSort() / 2);
} else if (Objects.isNull(next)) {
current.setSort(previous.getSort() * 2);
} else {
current.setSort((previous.getSort() + next.getSort()) / 2);
}
updateBatchById(datas);
}
@ -229,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()
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())
);
.setSelected(item.getShowInList());
}).collect(Collectors.toList()));
vos.add(vo);
});
return vos;