Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复便签功能

Browse Source
This commit is contained in:
WangHao
2021-01-24 21:26:28 +08:00
parent 116204666b
commit db1fae1c4f
16 changed files with 2148 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ruoyi-note/src/main/java/com/ruoyi/note/domain/NmNoteContent.java
View File

@ -15,21 +15,28 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @date 2020-09-12
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class NmNoteContent
{
/** 便签主键ID */
private Long noteId;
/** markdown编辑器内容 */
@Excel(name = "markdown编辑器内容")
private String markdownContent;
/** ueditor编辑器内容 */
@Excel(name = "ueditor编辑器内容")
private String ueditorContent;
/** markdown编辑器内容 */
@Excel(name = "markdown编辑器内容")
private String markdownContent;
public NmNoteContent() {
}
public NmNoteContent(Long noteId, String ueditorContent, String markdownContent) {
this.noteId = noteId;
this.ueditorContent = ueditorContent;
this.markdownContent = markdownContent;
}
}

30
ruoyi-note/src/main/java/com/ruoyi/note/service/impl/NmNoteServiceImpl.java
View File

@ -80,11 +80,14 @@ public class NmNoteServiceImpl implements INmNoteService {
*/
@Override
public int insertNmNote(NmNote nmNote) {
Long uuid = defaultUidGenerator.getUID();
nmNote.setCreateTime(DateUtils.getNowDate());
nmNote.setTitle(DateUtil.now());
nmNote.setTiymceUeditor(defaultUidGenerator.getUID());
nmNote.setTiymceUeditor(uuid);
//文章内容
nmNoteContentService.insertNmNoteContent(new NmNoteContent(uuid,null,"请开始你的记录~"));
//创建文章>>mongodb
redisCache.setCacheObject(Constants.NM_NOTE_CONTENT+nmNote.getTiymceUeditor(),"请开始你的创作!");
// redisCache.setCacheObject(Constants.NM_NOTE_CONTENT+nmNote.getTiymceUeditor(),"请开始你的创作!");
return nmNoteMapper.insertSelective(nmNote);
}
@ -133,18 +136,11 @@ public class NmNoteServiceImpl implements INmNoteService {
NmNote nmNote = new NmNote();
nmNote.setNoteId(noteId);
nmNote.setUserId(userID);
NmNote isnmNote1 = nmNoteMapper.selectOne(nmNote);
//查询对应的文章数据
//1.查redis缓存
String noteContent = redisCache.getCacheObject(Constants.NM_NOTE_CONTENT + isnmNote1.getTiymceUeditor());
if (noteContent != null && !"".equals(noteContent)) {
isnmNote1.setUeditorContent(noteContent);
} else {
// 2不存在就走mogodb
List<NoteContentMgDb> NoteContentMgDb = noteRepositoryService.findById(isnmNote1.getTiymceUeditor() + "");
isnmNote1.setUeditorContent(NoteContentMgDb.get(0).getNoteContent());
}
return isnmNote1;
NmNote nmNoteS = nmNoteMapper.selectOne(nmNote);
//获取文章
NmNoteContent nmNoteContent = nmNoteContentService.selectNmNoteContentById(nmNoteS.getTiymceUeditor());
nmNoteS.setUeditorContent(nmNoteContent.getUeditorContent());
return nmNoteS;
}
/**
@ -156,8 +152,10 @@ public class NmNoteServiceImpl implements INmNoteService {
@Override
public int userUpdateNote(NmNote nmNote) {
//储存到redis中 只缓存频繁操作的文章内容
redisCache.setCacheObject(Constants.NM_NOTE_CONTENT+nmNote.getTiymceUeditor(),nmNote.getUeditorContent());
// 更新标题信息
// redisCache.setCacheObject(Constants.NM_NOTE_CONTENT+nmNote.getTiymceUeditor(),nmNote.getUeditorContent());
// 更新文章信息
nmNoteContentService.updateNmNoteContent(new NmNoteContent(nmNote.getTiymceUeditor(),nmNote.getUeditorContent(),null));
return nmNoteMapper.updateNmNote(nmNote);
}