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
904b326d
Commit
904b326d
authored
Feb 08, 2020
by
段启岩
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/fix-issue#36'
# Conflicts: # src/main/resources/application.yml
parents
8e41a997
69351773
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
34 additions
and
3 deletions
+34
-3
src/main/java/cn/meteor/beyondclouds/modules/blog/mapper/BlogTagMapper.java
+1
-1
src/main/java/cn/meteor/beyondclouds/modules/blog/service/impl/BlogServiceImpl.java
+1
-1
src/main/java/cn/meteor/beyondclouds/modules/blog/service/impl/BlogTagServiceImpl.java
+2
-0
src/main/java/cn/meteor/beyondclouds/modules/post/entity/Post.java
+6
-0
src/main/java/cn/meteor/beyondclouds/modules/post/mapper/PostMapper.java
+4
-1
src/main/java/cn/meteor/beyondclouds/modules/post/service/impl/PostServiceImpl.java
+16
-0
src/main/java/cn/meteor/beyondclouds/modules/post/vo/PostVO.java
+4
-0
No files found.
src/main/java/cn/meteor/beyondclouds/modules/blog/mapper/BlogTagMapper.java
View file @
904b326d
...
@@ -19,7 +19,7 @@ import java.util.Collection;
...
@@ -19,7 +19,7 @@ import java.util.Collection;
public
interface
BlogTagMapper
extends
BaseMapper
<
BlogTag
>
{
public
interface
BlogTagMapper
extends
BaseMapper
<
BlogTag
>
{
/**
/**
* 根据
博客
ID获取相关的博客ids
* 根据
标签
ID获取相关的博客ids
* @param page
* @param page
* @param tagIds
* @param tagIds
* @return
* @return
...
...
src/main/java/cn/meteor/beyondclouds/modules/blog/service/impl/BlogServiceImpl.java
View file @
904b326d
...
@@ -517,7 +517,7 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
...
@@ -517,7 +517,7 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
return
PageUtils
.
emptyPage
();
return
PageUtils
.
emptyPage
();
}
}
// 如果博客
没有
引用了标签,则查询引用的标签下的所有博客ID的分页
// 如果博客引用了标签,则查询引用的标签下的所有博客ID的分页
IPage
<
String
>
page
=
new
Page
<>(
pageNumber
,
pageSize
);
IPage
<
String
>
page
=
new
Page
<>(
pageNumber
,
pageSize
);
IPage
<
String
>
blogIdPage
=
blogTagService
.
getRelatedBlogIds
(
page
,
tagIds
);
IPage
<
String
>
blogIdPage
=
blogTagService
.
getRelatedBlogIds
(
page
,
tagIds
);
List
<
String
>
blogIds
=
blogIdPage
.
getRecords
();
List
<
String
>
blogIds
=
blogIdPage
.
getRecords
();
...
...
src/main/java/cn/meteor/beyondclouds/modules/blog/service/impl/BlogTagServiceImpl.java
View file @
904b326d
...
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...
@@ -7,6 +7,7 @@ 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
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.Collection
;
import
java.util.Collection
;
...
@@ -24,6 +25,7 @@ public class BlogTagServiceImpl extends ServiceImpl<BlogTagMapper, BlogTag> impl
...
@@ -24,6 +25,7 @@ public class BlogTagServiceImpl extends ServiceImpl<BlogTagMapper, BlogTag> impl
private
BlogTagMapper
blogTagMapper
;
private
BlogTagMapper
blogTagMapper
;
@Autowired
public
BlogTagServiceImpl
(
BlogTagMapper
blogTagMapper
)
{
public
BlogTagServiceImpl
(
BlogTagMapper
blogTagMapper
)
{
this
.
blogTagMapper
=
blogTagMapper
;
this
.
blogTagMapper
=
blogTagMapper
;
}
}
...
...
src/main/java/cn/meteor/beyondclouds/modules/post/entity/Post.java
View file @
904b326d
...
@@ -44,6 +44,12 @@ public class Post implements Serializable {
...
@@ -44,6 +44,12 @@ public class Post implements Serializable {
@ApiModelProperty
(
value
=
"动态中的视频"
)
@ApiModelProperty
(
value
=
"动态中的视频"
)
private
String
video
;
private
String
video
;
@ApiModelProperty
(
value
=
"用户头像"
)
private
String
userAvatar
;
@ApiModelProperty
(
value
=
"用户昵称"
)
private
String
userNick
;
private
Date
createTime
;
private
Date
createTime
;
private
Date
updateTime
;
private
Date
updateTime
;
...
...
src/main/java/cn/meteor/beyondclouds/modules/post/mapper/PostMapper.java
View file @
904b326d
package
cn
.
meteor
.
beyondclouds
.
modules
.
post
.
mapper
;
package
cn
.
meteor
.
beyondclouds
.
modules
.
post
.
mapper
;
import
cn.meteor.beyondclouds.modules.post.entity.Post
;
import
cn.meteor.beyondclouds.modules.post.entity.Post
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Constants
;
import
org.apache.ibatis.annotations.Param
;
/**
/**
* <p>
* <p>
...
@@ -12,5 +16,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
...
@@ -12,5 +16,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @since 2020-01-30
* @since 2020-01-30
*/
*/
public
interface
PostMapper
extends
BaseMapper
<
Post
>
{
public
interface
PostMapper
extends
BaseMapper
<
Post
>
{
}
}
src/main/java/cn/meteor/beyondclouds/modules/post/service/impl/PostServiceImpl.java
View file @
904b326d
...
@@ -6,11 +6,15 @@ import cn.meteor.beyondclouds.modules.post.exception.PostServiceException;
...
@@ -6,11 +6,15 @@ import cn.meteor.beyondclouds.modules.post.exception.PostServiceException;
import
cn.meteor.beyondclouds.modules.post.mapper.PostMapper
;
import
cn.meteor.beyondclouds.modules.post.mapper.PostMapper
;
import
cn.meteor.beyondclouds.modules.post.service.IPostService
;
import
cn.meteor.beyondclouds.modules.post.service.IPostService
;
import
cn.meteor.beyondclouds.modules.project.exception.ProjectServiceException
;
import
cn.meteor.beyondclouds.modules.project.exception.ProjectServiceException
;
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
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.CollectionUtils
;
/**
/**
* <p>
* <p>
...
@@ -23,6 +27,12 @@ import org.springframework.stereotype.Service;
...
@@ -23,6 +27,12 @@ import org.springframework.stereotype.Service;
@Service
@Service
public
class
PostServiceImpl
extends
ServiceImpl
<
PostMapper
,
Post
>
implements
IPostService
{
public
class
PostServiceImpl
extends
ServiceImpl
<
PostMapper
,
Post
>
implements
IPostService
{
private
IUserService
userService
;
@Autowired
public
void
setUserService
(
IUserService
userService
)
{
this
.
userService
=
userService
;
}
/**
/**
* 发布动态
* 发布动态
...
@@ -52,6 +62,10 @@ public class PostServiceImpl extends ServiceImpl<PostMapper, Post> implements IP
...
@@ -52,6 +62,10 @@ public class PostServiceImpl extends ServiceImpl<PostMapper, Post> implements IP
post
.
setType
(
type
);
post
.
setType
(
type
);
//获取用户头像和昵称
User
user
=
userService
.
getById
(
post
.
getUserId
());
post
.
setUserNick
(
user
.
getNickName
());
post
.
setUserAvatar
(
user
.
getUserAvatar
());
//2.保存动态
//2.保存动态
save
(
post
);
save
(
post
);
...
@@ -89,6 +103,8 @@ public class PostServiceImpl extends ServiceImpl<PostMapper, Post> implements IP
...
@@ -89,6 +103,8 @@ public class PostServiceImpl extends ServiceImpl<PostMapper, Post> implements IP
@Override
@Override
public
IPage
<
Post
>
getPostPage
(
Integer
pageNumber
,
Integer
pageSize
)
{
public
IPage
<
Post
>
getPostPage
(
Integer
pageNumber
,
Integer
pageSize
)
{
IPage
<
Post
>
postPage
=
new
Page
<>(
pageNumber
,
pageSize
);
IPage
<
Post
>
postPage
=
new
Page
<>(
pageNumber
,
pageSize
);
QueryWrapper
<
Post
>
queryWrapper
=
new
QueryWrapper
();
queryWrapper
.
orderByDesc
(
"create_time"
);
return
page
(
postPage
);
return
page
(
postPage
);
}
}
...
...
src/main/java/cn/meteor/beyondclouds/modules/post/vo/PostVO.java
View file @
904b326d
...
@@ -24,6 +24,10 @@ public class PostVO {
...
@@ -24,6 +24,10 @@ public class PostVO {
private
String
video
;
private
String
video
;
private
String
userAvatar
;
private
String
userNick
;
private
Date
createTime
;
private
Date
createTime
;
private
Date
updateTime
;
private
Date
updateTime
;
...
...
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