|
@@ -23,8 +23,10 @@ import org.springframework.web.multipart.MultipartFile;
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import java.io.File;
|
|
import java.io.File;
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
|
|
+import java.util.Comparator;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.UUID;
|
|
import java.util.UUID;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
/**
|
|
* <p>
|
|
* <p>
|
|
@@ -95,6 +97,12 @@ public class BookServiceImpl extends ServiceImpl<BookMapper, Book> implements Bo
|
|
public HttpRespMsg getBookDetailById(String id) {
|
|
public HttpRespMsg getBookDetailById(String id) {
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
BookVO detail = bookMapper.selectDetailById(id);
|
|
BookVO detail = bookMapper.selectDetailById(id);
|
|
|
|
+ if(null != detail.getBookPages() && detail.getBookPages().size()>0){
|
|
|
|
+ detail.setBookPages(detail.getBookPages().stream().sorted(Comparator.comparing(BookPage::getPageNum)).collect(Collectors.toList()));
|
|
|
|
+ }
|
|
|
|
+ if(null != detail.getCategories() && detail.getCategories().size()>0){
|
|
|
|
+ detail.setCategories(detail.getCategories().stream().sorted(Comparator.comparing(BookCategory::getRank)).collect(Collectors.toList()));
|
|
|
|
+ }
|
|
msg.data = detail;
|
|
msg.data = detail;
|
|
return msg;
|
|
return msg;
|
|
}
|
|
}
|