update
This commit is contained in:
@@ -41,7 +41,6 @@ public class DocumentLibraryController extends JeecgController<DocumentLibrary,
|
||||
private IDocumentLibraryService documentLibraryService;
|
||||
@Autowired
|
||||
private IDocumentFavoritesService documentFavoritesService;
|
||||
|
||||
@Autowired
|
||||
private ISysUserService userService;
|
||||
@Autowired
|
||||
@@ -57,7 +56,7 @@ public class DocumentLibraryController extends JeecgController<DocumentLibrary,
|
||||
DocumentHome home = new DocumentHome();
|
||||
home.setFavorite(documentFavoritesService.getTopFavoritesByUserId(userByName.getId()));
|
||||
home.setLatest(documentLibraryService.getLatest());
|
||||
home.setRecently(home.getLatest());
|
||||
home.setRecently(documentVisitHistoryService.getRecently(userByName.getId()));
|
||||
return Result.OK(home);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
package org.jeecg.modules.database.service;
|
||||
|
||||
import org.jeecg.modules.database.entity.DocumentLibrary;
|
||||
import org.jeecg.modules.database.entity.DocumentVisitHistory;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 文档访问历史
|
||||
* @Author: jeecg-boot
|
||||
@@ -11,4 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||
*/
|
||||
public interface IDocumentVisitHistoryService extends IService<DocumentVisitHistory> {
|
||||
DocumentVisitHistory findByUserAndDocId(String userId, String documentId);
|
||||
|
||||
List<DocumentLibrary> getRecently(String id);
|
||||
}
|
||||
|
||||
@@ -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<DocumentVisitHistoryMapper, DocumentVisitHistory>
|
||||
implements IDocumentVisitHistoryService {
|
||||
@Autowired
|
||||
private IDocumentLibraryService documentLibraryService;
|
||||
|
||||
@Override
|
||||
public DocumentVisitHistory findByUserAndDocId(String userId, String documentId) {
|
||||
@@ -32,4 +40,14 @@ public class DocumentVisitHistoryServiceImpl extends ServiceImpl<DocumentVisitHi
|
||||
}
|
||||
return one;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DocumentLibrary> getRecently(String userId) {
|
||||
LambdaQueryWrapper<DocumentVisitHistory> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(DocumentVisitHistory::getUserId, userId);
|
||||
queryWrapper.orderByDesc(DocumentVisitHistory::getVisitCount);
|
||||
List<DocumentVisitHistory> list = list(new Page<>(1, 5), queryWrapper);
|
||||
return list.stream().map(visitHistory -> documentLibraryService.getById(visitHistory.getDocumentId()))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user