update
This commit is contained in:
@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
import org.springframework.web.servlet.ModelAndView;
|
import org.springframework.web.servlet.ModelAndView;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 我的收藏文档
|
* @Description: 我的收藏文档
|
||||||
@@ -84,14 +85,21 @@ public class DocumentFavoritesController extends JeecgController<DocumentFavorit
|
|||||||
public Result<String> add(@RequestBody DocumentFavorites documentFavorites, HttpServletRequest request) {
|
public Result<String> add(@RequestBody DocumentFavorites documentFavorites, HttpServletRequest request) {
|
||||||
String documentId = documentFavorites.getDocumentId();
|
String documentId = documentFavorites.getDocumentId();
|
||||||
DocumentLibrary documentLibrary = documentLibraryService.getById(documentId);
|
DocumentLibrary documentLibrary = documentLibraryService.getById(documentId);
|
||||||
documentFavorites.setDocumentTitle(documentLibrary.getTitle());
|
|
||||||
|
|
||||||
String username = JwtUtil.getUserNameByToken(request);
|
String username = JwtUtil.getUserNameByToken(request);
|
||||||
SysUser userByName = userService.getUserByName(username);
|
SysUser userByName = userService.getUserByName(username);
|
||||||
documentFavorites.setUserId(userByName.getId());
|
|
||||||
|
|
||||||
documentFavoritesService.save(documentFavorites);
|
DocumentFavorites old = documentFavoritesService.getByDocIdAndUserId(documentId, userByName.getId());
|
||||||
return Result.OK("添加成功!");
|
if (Objects.isNull(old)) {
|
||||||
|
documentFavorites.setId(null);
|
||||||
|
}else{
|
||||||
|
documentFavorites.setId(old.getId());
|
||||||
|
}
|
||||||
|
documentFavorites.setUserId(userByName.getId());
|
||||||
|
documentFavorites.setDocumentTitle(documentLibrary.getTitle());
|
||||||
|
|
||||||
|
documentFavoritesService.saveOrUpdate(documentFavorites);
|
||||||
|
return Result.OK("收藏成功!");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -13,4 +13,5 @@ import java.util.List;
|
|||||||
*/
|
*/
|
||||||
public interface IDocumentFavoritesService extends IService<DocumentFavorites> {
|
public interface IDocumentFavoritesService extends IService<DocumentFavorites> {
|
||||||
List<DocumentFavorites> getTopFavoritesByUserId(String userId);
|
List<DocumentFavorites> getTopFavoritesByUserId(String userId);
|
||||||
|
DocumentFavorites getByDocIdAndUserId(String userId,String documentId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,4 +27,12 @@ public class DocumentFavoritesServiceImpl extends ServiceImpl<DocumentFavoritesM
|
|||||||
Page<DocumentFavorites> page = new Page<>(1, 5);
|
Page<DocumentFavorites> page = new Page<>(1, 5);
|
||||||
return list(page, queryWrapper);
|
return list(page, queryWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public DocumentFavorites getByDocIdAndUserId(String userId, String documentId) {
|
||||||
|
LambdaQueryWrapper<DocumentFavorites> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
queryWrapper.eq(DocumentFavorites::getUserId, userId);
|
||||||
|
queryWrapper.eq(DocumentFavorites::getDocumentId, userId);
|
||||||
|
return getOne(queryWrapper,false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ public class DocumentVisitHistoryServiceImpl extends ServiceImpl<DocumentVisitHi
|
|||||||
@Override
|
@Override
|
||||||
public DocumentVisitHistory findByUserAndDocId(String userId, String documentId) {
|
public DocumentVisitHistory findByUserAndDocId(String userId, String documentId) {
|
||||||
DocumentVisitHistory one = getOne(new LambdaQueryWrapper<DocumentVisitHistory>().eq(DocumentVisitHistory::getUserId, userId)
|
DocumentVisitHistory one = getOne(new LambdaQueryWrapper<DocumentVisitHistory>().eq(DocumentVisitHistory::getUserId, userId)
|
||||||
.eq(DocumentVisitHistory::getDocumentId, documentId));
|
.eq(DocumentVisitHistory::getDocumentId, documentId), false);
|
||||||
if (Objects.isNull(one)) {
|
if (Objects.isNull(one)) {
|
||||||
DocumentVisitHistory documentVisitHistory = new DocumentVisitHistory();
|
DocumentVisitHistory documentVisitHistory = new DocumentVisitHistory();
|
||||||
documentVisitHistory.setUserId(userId);
|
documentVisitHistory.setUserId(userId);
|
||||||
|
|||||||
@@ -19,6 +19,6 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ExperimentAnnealProcess getByExperimentId(String experimentId) {
|
public ExperimentAnnealProcess getByExperimentId(String experimentId) {
|
||||||
return getOne(new LambdaQueryWrapper<ExperimentAnnealProcess>().eq(ExperimentAnnealProcess::getExperimentId, experimentId));
|
return getOne(new LambdaQueryWrapper<ExperimentAnnealProcess>().eq(ExperimentAnnealProcess::getExperimentId, experimentId),false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,6 @@ public class ExperimentRadiationProcessServiceImpl extends ServiceImpl<Experimen
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ExperimentRadiationProcess getByExperimentId(String experimentId) {
|
public ExperimentRadiationProcess getByExperimentId(String experimentId) {
|
||||||
return getOne(new LambdaQueryWrapper<ExperimentRadiationProcess>().eq(ExperimentRadiationProcess::getExperimentId, experimentId));
|
return getOne(new LambdaQueryWrapper<ExperimentRadiationProcess>().eq(ExperimentRadiationProcess::getExperimentId, experimentId),false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,6 @@ public class ExperimentReportServiceImpl extends ServiceImpl<ExperimentReportMap
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ExperimentReport getByExperimentId(String experimentId) {
|
public ExperimentReport getByExperimentId(String experimentId) {
|
||||||
return getOne(new LambdaQueryWrapper<ExperimentReport>().eq(ExperimentReport::getExperimentId, experimentId));
|
return getOne(new LambdaQueryWrapper<ExperimentReport>().eq(ExperimentReport::getExperimentId, experimentId),false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,6 @@ public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewMap
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ExperimentReview getByExperimentId(String experimentId) {
|
public ExperimentReview getByExperimentId(String experimentId) {
|
||||||
return getOne(new LambdaQueryWrapper<ExperimentReview>().eq(ExperimentReview::getExperimentId, experimentId));
|
return getOne(new LambdaQueryWrapper<ExperimentReview>().eq(ExperimentReview::getExperimentId, experimentId),false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,6 @@ public class ExperimentTestProcessServiceImpl extends ServiceImpl<ExperimentTest
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ExperimentTestProcess getByExperimentId(String experimentId) {
|
public ExperimentTestProcess getByExperimentId(String experimentId) {
|
||||||
return getOne(new LambdaQueryWrapper<ExperimentTestProcess>().eq(ExperimentTestProcess::getExperimentId, experimentId));
|
return getOne(new LambdaQueryWrapper<ExperimentTestProcess>().eq(ExperimentTestProcess::getExperimentId, experimentId),false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user