physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ls
2024-11-16 10:55:54 +08:00
parent f1448b1597
commit 6c02ec3364
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/DocumentHome.java
View File

@@ -21,7 +21,7 @@ public class DocumentHome implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Schema(description = "我的收藏") @Schema(description = "我的收藏")
private List<DocumentLibrary> favorite; private List<DocumentFavorites> favorite;
@Schema(description = "最新文档") @Schema(description = "最新文档")
private List<DocumentLibrary> latest; private List<DocumentLibrary> latest;
@Schema(description = "最近访问") @Schema(description = "最近访问")

3
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentFavoritesService.java
View File

@@ -2,7 +2,6 @@ package org.jeecg.modules.database.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.DocumentFavorites; import org.jeecg.modules.database.entity.DocumentFavorites;
import org.jeecg.modules.database.entity.DocumentLibrary;
import java.util.List; import java.util.List;
@@ -13,7 +12,7 @@ import java.util.List;
* @Version: V1.0 * @Version: V1.0
*/ */
public interface IDocumentFavoritesService extends IService<DocumentFavorites> { public interface IDocumentFavoritesService extends IService<DocumentFavorites> {
List<DocumentLibrary> getTopFavoritesByUserId(String userId); List<DocumentFavorites> getTopFavoritesByUserId(String userId);
DocumentFavorites getByDocIdAndUserId(String userId,String documentId); DocumentFavorites getByDocIdAndUserId(String userId,String documentId);
void removeByDocId(String documentId); void removeByDocId(String documentId);

11
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentFavoritesServiceImpl.java
View File

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.database.entity.DocumentFavorites; import org.jeecg.modules.database.entity.DocumentFavorites;
import org.jeecg.modules.database.entity.DocumentLibrary;
import org.jeecg.modules.database.mapper.DocumentFavoritesMapper; import org.jeecg.modules.database.mapper.DocumentFavoritesMapper;
import org.jeecg.modules.database.service.IDocumentFavoritesService; import org.jeecg.modules.database.service.IDocumentFavoritesService;
import org.jeecg.modules.database.service.IDocumentLibraryService; import org.jeecg.modules.database.service.IDocumentLibraryService;
@@ -12,8 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/** /**
* @Description: 我的收藏文档 * @Description: 我的收藏文档
@@ -28,14 +25,12 @@ public class DocumentFavoritesServiceImpl extends ServiceImpl<DocumentFavoritesM
private IDocumentLibraryService documentLibraryService; private IDocumentLibraryService documentLibraryService;
@Override @Override
public List<DocumentLibrary> getTopFavoritesByUserId(String userId) { public List<DocumentFavorites> getTopFavoritesByUserId(String userId) {
LambdaQueryWrapper<DocumentFavorites> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<DocumentFavorites> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DocumentFavorites::getUserId, userId); queryWrapper.eq(DocumentFavorites::getUserId, userId);
Page<DocumentFavorites> page = new Page<>(1, 5); Page<DocumentFavorites> page = new Page<>(1, 10);
List<DocumentFavorites> list = list(page, queryWrapper); List<DocumentFavorites> list = list(page, queryWrapper);
List<DocumentLibrary> result = list.stream().map(visitHistory -> documentLibraryService.getById(visitHistory.getDocumentId())) return list;
.filter(Objects::nonNull).collect(Collectors.toList());
return result;
} }
@Override @Override