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
dac935fc
Commit
dac935fc
authored
Feb 04, 2020
by
段启岩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
我的博客列表和他人博客列表添加标签、类别详细信息
parent
2b0140a7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
11 deletions
+14
-11
src/main/java/cn/meteor/beyondclouds/modules/blog/entity/Blog.java
+6
-3
src/main/java/cn/meteor/beyondclouds/modules/blog/mapper/xml/BlogMapper.xml
+1
-1
src/main/java/cn/meteor/beyondclouds/modules/blog/service/impl/BlogServiceImpl.java
+7
-7
No files found.
src/main/java/cn/meteor/beyondclouds/modules/blog/entity/Blog.java
View file @
dac935fc
...
@@ -5,6 +5,7 @@ import cn.meteor.beyondclouds.modules.topic.entity.Topic;
...
@@ -5,6 +5,7 @@ import cn.meteor.beyondclouds.modules.topic.entity.Topic;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -12,7 +13,7 @@ import lombok.EqualsAndHashCode;
...
@@ -12,7 +13,7 @@ import lombok.EqualsAndHashCode;
import
lombok.experimental.Accessors
;
import
lombok.experimental.Accessors
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.
time.LocalDateTim
e
;
import
java.
util.Dat
e
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -64,15 +65,17 @@ public class Blog implements Serializable {
...
@@ -64,15 +65,17 @@ public class Blog implements Serializable {
@ApiModelProperty
(
value
=
"是否允许转发"
)
@ApiModelProperty
(
value
=
"是否允许转发"
)
private
Boolean
allowForward
;
private
Boolean
allowForward
;
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
List
<
Tag
>
tags
;
private
List
<
Tag
>
tags
;
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
List
<
Topic
>
topics
;
private
List
<
Topic
>
topics
;
private
LocalDateTim
e
createTime
;
private
Dat
e
createTime
;
private
LocalDateTim
e
updateTime
;
private
Dat
e
updateTime
;
}
}
src/main/java/cn/meteor/beyondclouds/modules/blog/mapper/xml/BlogMapper.xml
View file @
dac935fc
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
left join tag t
left join tag t
on t.tag_id = bt.tag_id
on t.tag_id = bt.tag_id
<if
test=
"ew != null and ew.sqlSegment != null"
>
<if
test=
"ew != null and ew.sqlSegment != null"
>
and
${ew.sqlSegment}
where
${ew.sqlSegment}
</if>
</if>
</select>
</select>
</mapper>
</mapper>
src/main/java/cn/meteor/beyondclouds/modules/blog/service/impl/BlogServiceImpl.java
View file @
dac935fc
...
@@ -279,12 +279,12 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
...
@@ -279,12 +279,12 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
*/
*/
@Override
@Override
public
IPage
<
Blog
>
getUserBlogPage
(
Integer
pageNumber
,
Integer
pageSize
,
String
userId
)
{
public
IPage
<
Blog
>
getUserBlogPage
(
Integer
pageNumber
,
Integer
pageSize
,
String
userId
)
{
QueryWrapper
blogQueryWrapper
=
new
QueryWrapper
();
QueryWrapper
<
Blog
>
blogQueryWrapper
=
new
QueryWrapper
();
blogQueryWrapper
.
eq
(
"user_id"
,
userId
);
blogQueryWrapper
.
eq
(
"
b.
user_id"
,
userId
);
blogQueryWrapper
.
eq
(
"view_privileges"
,
1
);
blogQueryWrapper
.
eq
(
"view_privileges"
,
1
);
blogQueryWrapper
.
orderByDesc
(
"create_time"
);
blogQueryWrapper
.
orderByDesc
(
"
b.
create_time"
);
IPage
<
Blog
>
page
=
new
Page
<>(
pageNumber
,
pageSize
);
IPage
<
Blog
>
page
=
new
Page
<>(
pageNumber
,
pageSize
);
return
page
(
page
,
blogQueryWrapper
);
return
blogMapper
.
selectPageWithTags
(
page
,
blogQueryWrapper
);
}
}
/**
/**
...
@@ -297,10 +297,10 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
...
@@ -297,10 +297,10 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
@Override
@Override
public
IPage
<
Blog
>
getMyBlogPage
(
Integer
pageNumber
,
Integer
pageSize
,
String
userId
)
{
public
IPage
<
Blog
>
getMyBlogPage
(
Integer
pageNumber
,
Integer
pageSize
,
String
userId
)
{
QueryWrapper
myBlogQueryWrapper
=
new
QueryWrapper
();
QueryWrapper
myBlogQueryWrapper
=
new
QueryWrapper
();
myBlogQueryWrapper
.
eq
(
"user_id"
,
userId
);
myBlogQueryWrapper
.
eq
(
"
b.
user_id"
,
userId
);
myBlogQueryWrapper
.
orderByDesc
(
"create_time"
);
myBlogQueryWrapper
.
orderByDesc
(
"
b.
create_time"
);
IPage
<
Blog
>
page
=
new
Page
<>(
pageNumber
,
pageSize
);
IPage
<
Blog
>
page
=
new
Page
<>(
pageNumber
,
pageSize
);
return
page
(
page
,
myBlogQueryWrapper
);
return
blogMapper
.
selectPageWithTags
(
page
,
myBlogQueryWrapper
);
}
}
/**
/**
...
...
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