Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
beyond-clouds
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
4
Issues
4
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
段启岩
beyond-clouds
Commits
8d06a757
Commit
8d06a757
authored
Feb 06, 2020
by
段启岩
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/fix-issue#6'
parents
611f56f1
6a7af1ce
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
4 deletions
+25
-4
src/main/java/cn/meteor/beyondclouds/modules/blog/entity/Blog.java
+6
-0
src/main/java/cn/meteor/beyondclouds/modules/blog/service/impl/BlogCommentServiceImpl.java
+9
-3
src/main/java/cn/meteor/beyondclouds/modules/blog/service/impl/BlogServiceImpl.java
+10
-1
No files found.
src/main/java/cn/meteor/beyondclouds/modules/blog/entity/Blog.java
View file @
8d06a757
...
@@ -73,6 +73,12 @@ public class Blog implements Serializable {
...
@@ -73,6 +73,12 @@ public class Blog implements Serializable {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
List
<
Topic
>
topics
;
private
List
<
Topic
>
topics
;
@ApiModelProperty
(
value
=
"用户昵称"
)
private
String
userNick
;
@ApiModelProperty
(
value
=
"博客评论数量"
)
private
Integer
commentNumber
;
private
Date
createTime
;
private
Date
createTime
;
private
Date
updateTime
;
private
Date
updateTime
;
...
...
src/main/java/cn/meteor/beyondclouds/modules/blog/service/impl/BlogCommentServiceImpl.java
View file @
8d06a757
...
@@ -98,7 +98,14 @@ public class BlogCommentServiceImpl extends ServiceImpl<BlogCommentMapper, BlogC
...
@@ -98,7 +98,14 @@ public class BlogCommentServiceImpl extends ServiceImpl<BlogCommentMapper, BlogC
blogComment
.
setUserNick
(
user
.
getNickName
());
blogComment
.
setUserNick
(
user
.
getNickName
());
blogComment
.
setUserAvatar
(
user
.
getUserAvatar
());
blogComment
.
setUserAvatar
(
user
.
getUserAvatar
());
save
(
blogComment
);
save
(
blogComment
);
//3.查找上一层目录
//3.更新评论次数
if
(
null
==
blog
.
getCommentNumber
())
{
blog
.
setCommentNumber
(
1
);
}
else
{
blog
.
setCommentNumber
(
blog
.
getCommentNumber
()
+
1
);
}
blogService
.
updateById
(
blog
);
//4.查找上一层目录
if
(
blogComment
.
getParentId
()
==
null
)
{
if
(
blogComment
.
getParentId
()
==
null
)
{
thread
=
"/"
+
blogComment
.
getCommentId
();
thread
=
"/"
+
blogComment
.
getCommentId
();
}
else
{
}
else
{
...
@@ -109,9 +116,8 @@ public class BlogCommentServiceImpl extends ServiceImpl<BlogCommentMapper, BlogC
...
@@ -109,9 +116,8 @@ public class BlogCommentServiceImpl extends ServiceImpl<BlogCommentMapper, BlogC
thread
=
blogCommentPatent
.
getThread
()
+
"/"
+
blogComment
.
getCommentId
();
thread
=
blogCommentPatent
.
getThread
()
+
"/"
+
blogComment
.
getCommentId
();
}
}
blogComment
.
setThread
(
thread
);
blogComment
.
setThread
(
thread
);
//
4
.更新路径信息
//
5
.更新路径信息
updateById
(
blogComment
);
updateById
(
blogComment
);
}
}
...
...
src/main/java/cn/meteor/beyondclouds/modules/blog/service/impl/BlogServiceImpl.java
View file @
8d06a757
...
@@ -18,6 +18,8 @@ import cn.meteor.beyondclouds.modules.topic.entity.Topic;
...
@@ -18,6 +18,8 @@ import cn.meteor.beyondclouds.modules.topic.entity.Topic;
import
cn.meteor.beyondclouds.modules.topic.entity.TopicReference
;
import
cn.meteor.beyondclouds.modules.topic.entity.TopicReference
;
import
cn.meteor.beyondclouds.modules.topic.service.ITopicReferenceService
;
import
cn.meteor.beyondclouds.modules.topic.service.ITopicReferenceService
;
import
cn.meteor.beyondclouds.modules.topic.service.ITopicService
;
import
cn.meteor.beyondclouds.modules.topic.service.ITopicService
;
import
cn.meteor.beyondclouds.modules.user.entity.User
;
import
cn.meteor.beyondclouds.modules.user.service.IUserService
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
...
@@ -30,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
...
@@ -30,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
import
org.springframework.util.Assert
;
import
org.springframework.util.Assert
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.StringUtils
;
import
org.springframework.util.StringUtils
;
import
org.springframework.web.bind.UnsatisfiedServletRequestParameterException
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -63,8 +66,9 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
...
@@ -63,8 +66,9 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
private
ITopicService
topicService
;
private
ITopicService
topicService
;
private
IUserService
userService
;
@Autowired
@Autowired
public
BlogServiceImpl
(
IBlogTagService
blogTagService
,
ITopicReferenceService
topicReferenceService
,
IBlogExtService
blogExtService
,
IBlogCategoryService
blogCategoryService
,
BlogMapper
blogMapper
,
ITagService
tagService
,
ITopicService
topicService
)
{
public
BlogServiceImpl
(
IBlogTagService
blogTagService
,
ITopicReferenceService
topicReferenceService
,
IBlogExtService
blogExtService
,
IBlogCategoryService
blogCategoryService
,
BlogMapper
blogMapper
,
ITagService
tagService
,
ITopicService
topicService
,
IUserService
userService
)
{
this
.
blogTagService
=
blogTagService
;
this
.
blogTagService
=
blogTagService
;
this
.
topicReferenceService
=
topicReferenceService
;
this
.
topicReferenceService
=
topicReferenceService
;
this
.
blogExtService
=
blogExtService
;
this
.
blogExtService
=
blogExtService
;
...
@@ -72,6 +76,7 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
...
@@ -72,6 +76,7 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
this
.
blogMapper
=
blogMapper
;
this
.
blogMapper
=
blogMapper
;
this
.
tagService
=
tagService
;
this
.
tagService
=
tagService
;
this
.
topicService
=
topicService
;
this
.
topicService
=
topicService
;
this
.
userService
=
userService
;
}
}
@Autowired
@Autowired
...
@@ -104,6 +109,10 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
...
@@ -104,6 +109,10 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
throw
new
BlogCategoryServiceException
(
BlogCategoryErrorCode
.
INCORRECT_CATEGORY
);
throw
new
BlogCategoryServiceException
(
BlogCategoryErrorCode
.
INCORRECT_CATEGORY
);
}
}
//获取昵称
User
user
=
userService
.
getById
(
blog
.
getUserId
());
blog
.
setUserNick
(
user
.
getNickName
());
//2.保存博客
//2.保存博客
blog
.
setCategory
(
blogCategory
.
getCategory
());
blog
.
setCategory
(
blogCategory
.
getCategory
());
save
(
blog
);
save
(
blog
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment