This commit is contained in:
ls
2024-11-19 17:33:27 +08:00
parent 80cb5a4745
commit 32b72076d9
2 changed files with 27 additions and 18 deletions

View File

@@ -130,12 +130,14 @@ public class DocumentLibraryController extends JeecgController<DocumentLibrary,
String username = JwtUtil.getUserNameByToken(request); String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username); SysUser userByName = userService.getUserByName(username);
DocumentVisitHistory his = new DocumentVisitHistory(); if (StringUtils.equals(documentLibrary.getType(), "DOCUMENT")) {
his.setDocumentId(documentLibrary.getId()); DocumentVisitHistory his = new DocumentVisitHistory();
his.setUserId(userByName.getId()); his.setDocumentId(documentLibrary.getId());
his.setDocumentTitle(documentLibrary.getTitle()); his.setUserId(userByName.getId());
his.setVisitCount(1); his.setDocumentTitle(documentLibrary.getTitle());
documentVisitHistoryService.save(his); his.setVisitCount(1);
documentVisitHistoryService.save(his);
}
return Result.OK("添加成功!"); return Result.OK("添加成功!");
} }
@@ -154,12 +156,14 @@ public class DocumentLibraryController extends JeecgController<DocumentLibrary,
String username = JwtUtil.getUserNameByToken(request); String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username); SysUser userByName = userService.getUserByName(username);
DocumentVisitHistory his = documentVisitHistoryService.findByUserAndDocId(userByName.getId(), documentLibrary.getId()); if (StringUtils.equals(documentLibrary.getType(), "DOCUMENT")) {
his.setDocumentId(documentLibrary.getId()); DocumentVisitHistory his = documentVisitHistoryService.findByUserAndDocId(userByName.getId(), documentLibrary.getId());
his.setDocumentTitle(documentLibrary.getTitle()); his.setDocumentId(documentLibrary.getId());
his.setUserId(userByName.getId()); his.setDocumentTitle(documentLibrary.getTitle());
his.addVisitCount(); his.setUserId(userByName.getId());
documentVisitHistoryService.saveOrUpdate(his); his.addVisitCount();
documentVisitHistoryService.saveOrUpdate(his);
}
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
@@ -217,12 +221,15 @@ public class DocumentLibraryController extends JeecgController<DocumentLibrary,
String username = JwtUtil.getUserNameByToken(request); String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username); SysUser userByName = userService.getUserByName(username);
DocumentVisitHistory his = documentVisitHistoryService.findByUserAndDocId(userByName.getId(), documentLibrary.getId());
his.setDocumentId(documentLibrary.getId()); if (StringUtils.equals(documentLibrary.getType(), "DOCUMENT")) {
his.setUserId(userByName.getId()); DocumentVisitHistory his = documentVisitHistoryService.findByUserAndDocId(userByName.getId(), documentLibrary.getId());
his.addVisitCount(); his.setDocumentId(documentLibrary.getId());
his.setDocumentTitle(documentLibrary.getTitle()); his.setUserId(userByName.getId());
documentVisitHistoryService.saveOrUpdate(his); his.addVisitCount();
his.setDocumentTitle(documentLibrary.getTitle());
documentVisitHistoryService.saveOrUpdate(his);
}
return Result.OK(documentLibrary); return Result.OK(documentLibrary);
} }

View File

@@ -24,6 +24,7 @@ public class DocumentLibraryServiceImpl extends ServiceImpl<DocumentLibraryMappe
@Override @Override
public List<DocumentLibrary> getLatest() { public List<DocumentLibrary> getLatest() {
LambdaQueryWrapper<DocumentLibrary> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<DocumentLibrary> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DocumentLibrary::getType,"DOCUMENT");
queryWrapper.orderByDesc(DocumentLibrary::getCreateTime); queryWrapper.orderByDesc(DocumentLibrary::getCreateTime);
Page<DocumentLibrary> page = new Page<>(1, 5); Page<DocumentLibrary> page = new Page<>(1, 5);
return list(page, queryWrapper); return list(page, queryWrapper);
@@ -37,6 +38,7 @@ public class DocumentLibraryServiceImpl extends ServiceImpl<DocumentLibraryMappe
@Override @Override
public Long getToday() { public Long getToday() {
QueryWrapper<DocumentLibrary> queryWrapper = new QueryWrapper<>(); QueryWrapper<DocumentLibrary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type","DOCUMENT");
queryWrapper.eq("DATE_FORMAT (create_time,'%Y-%m-%d')", queryWrapper.eq("DATE_FORMAT (create_time,'%Y-%m-%d')",
DateUtils.formatDate(new Date(), "yyyy-MM-dd")); DateUtils.formatDate(new Date(), "yyyy-MM-dd"));
return count(queryWrapper); return count(queryWrapper);