diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java index 2ae551a..2e7e56a 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java @@ -41,7 +41,6 @@ public class DocumentLibraryController extends JeecgController { DocumentVisitHistory findByUserAndDocId(String userId, String documentId); + + List getRecently(String id); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentVisitHistoryServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentVisitHistoryServiceImpl.java index 82b3c7a..8dcafa7 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentVisitHistoryServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentVisitHistoryServiceImpl.java @@ -1,13 +1,19 @@ package org.jeecg.modules.database.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.database.entity.DocumentLibrary; import org.jeecg.modules.database.entity.DocumentVisitHistory; import org.jeecg.modules.database.mapper.DocumentVisitHistoryMapper; +import org.jeecg.modules.database.service.IDocumentLibraryService; import org.jeecg.modules.database.service.IDocumentVisitHistoryService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * @Description: 文档访问历史 @@ -18,6 +24,8 @@ import java.util.Objects; @Service public class DocumentVisitHistoryServiceImpl extends ServiceImpl implements IDocumentVisitHistoryService { + @Autowired + private IDocumentLibraryService documentLibraryService; @Override public DocumentVisitHistory findByUserAndDocId(String userId, String documentId) { @@ -32,4 +40,14 @@ public class DocumentVisitHistoryServiceImpl extends ServiceImpl getRecently(String userId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DocumentVisitHistory::getUserId, userId); + queryWrapper.orderByDesc(DocumentVisitHistory::getVisitCount); + List list = list(new Page<>(1, 5), queryWrapper); + return list.stream().map(visitHistory -> documentLibraryService.getById(visitHistory.getDocumentId())) + .collect(Collectors.toList()); + } }