|
@@ -3,10 +3,13 @@ package cn.reghao.tnb.content.app.data.service;
|
|
|
import cn.reghao.jutil.jdk.converter.DateTimeConverter;
|
|
import cn.reghao.jutil.jdk.converter.DateTimeConverter;
|
|
|
import cn.reghao.jutil.jdk.db.PageList;
|
|
import cn.reghao.jutil.jdk.db.PageList;
|
|
|
import cn.reghao.jutil.tool.id.IdGenerator;
|
|
import cn.reghao.jutil.tool.id.IdGenerator;
|
|
|
|
|
+import cn.reghao.jutil.tool.id.SnowFlake;
|
|
|
import cn.reghao.tnb.common.auth.UserContext;
|
|
import cn.reghao.tnb.common.auth.UserContext;
|
|
|
|
|
+import cn.reghao.tnb.content.app.data.db.mongo.RichTextMongo;
|
|
|
import cn.reghao.tnb.content.app.data.model.dto.ArticlePublishSbt;
|
|
import cn.reghao.tnb.content.app.data.model.dto.ArticlePublishSbt;
|
|
|
import cn.reghao.tnb.content.app.data.model.dto.UpdateArticleContent;
|
|
import cn.reghao.tnb.content.app.data.model.dto.UpdateArticleContent;
|
|
|
import cn.reghao.tnb.content.app.data.model.dto.UpdateArticleScope;
|
|
import cn.reghao.tnb.content.app.data.model.dto.UpdateArticleScope;
|
|
|
|
|
+import cn.reghao.tnb.content.app.data.model.po.RichText;
|
|
|
import cn.reghao.tnb.content.app.data.model.vo.AnswerCard;
|
|
import cn.reghao.tnb.content.app.data.model.vo.AnswerCard;
|
|
|
import cn.reghao.tnb.content.app.data.db.mongo.ArticlePostMongo;
|
|
import cn.reghao.tnb.content.app.data.db.mongo.ArticlePostMongo;
|
|
|
import cn.reghao.tnb.content.app.data.model.po.ArticlePost;
|
|
import cn.reghao.tnb.content.app.data.model.po.ArticlePost;
|
|
@@ -27,35 +30,38 @@ import java.util.stream.Collectors;
|
|
|
public class ArticlePostService {
|
|
public class ArticlePostService {
|
|
|
private final ArticlePostMongo articlePostMongo;
|
|
private final ArticlePostMongo articlePostMongo;
|
|
|
private final IdGenerator idGenerator = new IdGenerator("article-id");
|
|
private final IdGenerator idGenerator = new IdGenerator("article-id");
|
|
|
|
|
+ private final SnowFlake idGenerator1 = new SnowFlake(1L, 1L);
|
|
|
|
|
+ private RichTextMongo richTextMongo;
|
|
|
private int pageSize = 12;
|
|
private int pageSize = 12;
|
|
|
|
|
|
|
|
- public ArticlePostService(ArticlePostMongo articlePostMongo) {
|
|
|
|
|
|
|
+ public ArticlePostService(ArticlePostMongo articlePostMongo, RichTextMongo richTextMongo) {
|
|
|
this.articlePostMongo = articlePostMongo;
|
|
this.articlePostMongo = articlePostMongo;
|
|
|
|
|
+ this.richTextMongo = richTextMongo;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public void submitArticle(ArticlePublishSbt articlePublishSbt) {
|
|
public void submitArticle(ArticlePublishSbt articlePublishSbt) {
|
|
|
- long userId = UserContext.getUser();
|
|
|
|
|
|
|
+ long loginUser = UserContext.getUser();
|
|
|
String title = articlePublishSbt.getTitle();
|
|
String title = articlePublishSbt.getTitle();
|
|
|
String content = articlePublishSbt.getContent();
|
|
String content = articlePublishSbt.getContent();
|
|
|
- String excerpt;
|
|
|
|
|
- if (content.length() < 50) {
|
|
|
|
|
- excerpt = content;
|
|
|
|
|
- } else {
|
|
|
|
|
- excerpt = content.substring(0, 50);
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
- String articleId = idGenerator.stringId();
|
|
|
|
|
- ArticlePost articlePost = new ArticlePost(articleId, title, excerpt, content, userId);
|
|
|
|
|
- articlePostMongo.save(articlePost);
|
|
|
|
|
|
|
+ RichText richText = new RichText();
|
|
|
|
|
+ richText.setContentId(idGenerator1.nextId());
|
|
|
|
|
+ richText.setOriginalUrl("");
|
|
|
|
|
+ richText.setTitle(title);
|
|
|
|
|
+ richText.setCoverUrl("");
|
|
|
|
|
+ richText.setContent(content);
|
|
|
|
|
+ richText.setPublishAt(System.currentTimeMillis());
|
|
|
|
|
+ richText.setPublishBy(loginUser);
|
|
|
|
|
+ richTextMongo.save(richText);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public void submitArticle1(ArticlePublishSbt articlePublishSbt) {
|
|
public void submitArticle1(ArticlePublishSbt articlePublishSbt) {
|
|
|
- long userId = articlePublishSbt.getUserId();
|
|
|
|
|
|
|
+ //long userId = articlePublishSbt.getUserId();
|
|
|
String title = articlePublishSbt.getTitle();
|
|
String title = articlePublishSbt.getTitle();
|
|
|
String content = articlePublishSbt.getContent();
|
|
String content = articlePublishSbt.getContent();
|
|
|
- String excerpt = articlePublishSbt.getExcerpt();
|
|
|
|
|
|
|
+ //String excerpt = articlePublishSbt.getExcerpt();
|
|
|
|
|
|
|
|
- String articleId = idGenerator.stringId();
|
|
|
|
|
|
|
+ /*String articleId = idGenerator.stringId();
|
|
|
ArticlePost articlePost = new ArticlePost(articleId, title, excerpt, content, userId);
|
|
ArticlePost articlePost = new ArticlePost(articleId, title, excerpt, content, userId);
|
|
|
articlePostMongo.save(articlePost);
|
|
articlePostMongo.save(articlePost);
|
|
|
|
|
|
|
@@ -65,7 +71,7 @@ public class ArticlePostService {
|
|
|
elements.forEach(element -> {
|
|
elements.forEach(element -> {
|
|
|
String text = element.text();
|
|
String text = element.text();
|
|
|
sb.append(text).append(System.lineSeparator());
|
|
sb.append(text).append(System.lineSeparator());
|
|
|
- });
|
|
|
|
|
|
|
+ });*/
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public void updateArticleScope(UpdateArticleScope updateArticleScope) {
|
|
public void updateArticleScope(UpdateArticleScope updateArticleScope) {
|