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
67f307f8
Commit
67f307f8
authored
Feb 05, 2020
by
段启岩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复更新时删除话题喝和标签的问题,话题列表添加排序
parent
082de629
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
39 additions
and
20 deletions
+39
-20
src/main/java/cn/meteor/beyondclouds/modules/blog/service/impl/BlogServiceImpl.java
+11
-8
src/main/java/cn/meteor/beyondclouds/modules/question/service/impl/QuestionServiceImpl.java
+9
-8
src/main/java/cn/meteor/beyondclouds/modules/topic/api/TopicApi.java
+1
-3
src/main/java/cn/meteor/beyondclouds/modules/topic/service/ITopicService.java
+9
-1
src/main/java/cn/meteor/beyondclouds/modules/topic/service/impl/TopicServiceImpl.java
+9
-0
No files found.
src/main/java/cn/meteor/beyondclouds/modules/blog/service/impl/BlogServiceImpl.java
View file @
67f307f8
...
...
@@ -354,10 +354,6 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
}
//4.判断是否引用话题
// 删除旧话题引用
QueryWrapper
<
TopicReference
>
topicReferenceQueryWrapper
=
new
QueryWrapper
<>();
topicReferenceQueryWrapper
.
eq
(
"referencer_id"
,
blog
.
getBlogId
());
topicReferenceService
.
remove
(
topicReferenceQueryWrapper
);
// 添加新话题引用
if
(!
CollectionUtils
.
isEmpty
(
topicIds
))
{
...
...
@@ -365,6 +361,11 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
List
<
Topic
>
topicList
=
topicService
.
listByIds
(
topicIds
);
List
<
String
>
existsTopicIds
=
topicList
.
stream
().
map
(
Topic:
:
getTopicId
).
collect
(
Collectors
.
toList
());
if
(!
CollectionUtils
.
isEmpty
(
existsTopicIds
))
{
// 删除旧话题引用
QueryWrapper
<
TopicReference
>
topicReferenceQueryWrapper
=
new
QueryWrapper
<>();
topicReferenceQueryWrapper
.
eq
(
"referencer_id"
,
blog
.
getBlogId
());
topicReferenceService
.
remove
(
topicReferenceQueryWrapper
);
List
<
TopicReference
>
topicReferenceList
=
new
ArrayList
<>();
for
(
String
topicId
:
existsTopicIds
)
{
TopicReference
topicReference
=
new
TopicReference
();
...
...
@@ -383,15 +384,17 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
}
//5.判断是否引用标签
// 删除旧标签
QueryWrapper
<
BlogTag
>
blogTagQueryWrapper
=
new
QueryWrapper
<>();
blogTagQueryWrapper
.
eq
(
"blog_id"
,
blog
.
getBlogId
());
blogTagService
.
remove
(
blogTagQueryWrapper
);
// 添加新标签
if
(!
CollectionUtils
.
isEmpty
(
tagIds
))
{
List
<
String
>
existsTagIds
=
tagService
.
listByIds
(
tagIds
).
stream
().
map
(
Tag:
:
getTagId
).
collect
(
Collectors
.
toList
());
if
(!
CollectionUtils
.
isEmpty
(
existsTagIds
))
{
// 删除旧标签
QueryWrapper
<
BlogTag
>
blogTagQueryWrapper
=
new
QueryWrapper
<>();
blogTagQueryWrapper
.
eq
(
"blog_id"
,
blog
.
getBlogId
());
blogTagService
.
remove
(
blogTagQueryWrapper
);
List
<
BlogTag
>
blogTagList
=
new
ArrayList
<>();
for
(
String
tagId
:
existsTagIds
)
{
BlogTag
blogTag
=
new
BlogTag
();
...
...
src/main/java/cn/meteor/beyondclouds/modules/question/service/impl/QuestionServiceImpl.java
View file @
67f307f8
...
...
@@ -232,16 +232,17 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
questionExtService
.
update
(
questionExt
,
updateWrapper
);
}
// 删除旧话题引用
QueryWrapper
<
TopicReference
>
topicReferenceQueryWrapper
=
new
QueryWrapper
<>();
topicReferenceQueryWrapper
.
eq
(
"referencer_id"
,
question
.
getQuestionId
());
topicReferenceService
.
remove
(
topicReferenceQueryWrapper
);
//5.判断是否引用话题
if
(!
CollectionUtils
.
isEmpty
(
topicIds
))
{
// 获取要引用的话题,不正确的话题ID会被自动过滤
List
<
String
>
existsTopicIds
=
topicService
.
listByIds
(
topicIds
).
stream
().
map
(
Topic:
:
getTopicId
).
collect
(
Collectors
.
toList
());
if
(!
CollectionUtils
.
isEmpty
(
existsTopicIds
))
{
// 删除旧话题引用
QueryWrapper
<
TopicReference
>
topicReferenceQueryWrapper
=
new
QueryWrapper
<>();
topicReferenceQueryWrapper
.
eq
(
"referencer_id"
,
question
.
getQuestionId
());
topicReferenceService
.
remove
(
topicReferenceQueryWrapper
);
List
<
TopicReference
>
topicReferenceList
=
new
ArrayList
<>();
for
(
String
topicId
:
existsTopicIds
)
{
TopicReference
topicReference
=
new
TopicReference
();
...
...
@@ -261,14 +262,14 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
//5.判断是否引用标签
if
(!
CollectionUtils
.
isEmpty
(
tagIds
))
{
List
<
String
>
existsTagIds
=
tagService
.
listByIds
(
tagIds
).
stream
().
map
(
Tag:
:
getTagId
).
collect
(
Collectors
.
toList
());
if
(!
CollectionUtils
.
isEmpty
(
existsTagIds
))
{
// 删除旧标签
QueryWrapper
<
QuestionTag
>
questionTagQueryWrapper
=
new
QueryWrapper
<>();
questionTagQueryWrapper
.
eq
(
"question_id"
,
question
.
getQuestionId
());
questionTagService
.
remove
(
questionTagQueryWrapper
);
if
(!
CollectionUtils
.
isEmpty
(
tagIds
))
{
List
<
String
>
existsTagIds
=
tagService
.
listByIds
(
tagIds
).
stream
().
map
(
Tag:
:
getTagId
).
collect
(
Collectors
.
toList
());
if
(!
CollectionUtils
.
isEmpty
(
existsTagIds
))
{
List
<
QuestionTag
>
questionTagList
=
new
ArrayList
<>();
for
(
String
tagId
:
existsTagIds
)
{
QuestionTag
questionTag
=
new
QuestionTag
();
...
...
src/main/java/cn/meteor/beyondclouds/modules/topic/api/TopicApi.java
View file @
67f307f8
...
...
@@ -12,7 +12,6 @@ import cn.meteor.beyondclouds.modules.topic.form.CreateTopicForm;
import
cn.meteor.beyondclouds.modules.topic.service.ITopicService
;
import
cn.meteor.beyondclouds.modules.user.entity.User
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -57,8 +56,7 @@ public class TopicApi {
int
pageNo
=
pageForm
.
getPage
();
int
pageSize
=
pageForm
.
getSize
();
IPage
<
Topic
>
page
=
new
Page
<>(
pageNo
,
pageSize
);
IPage
<
Topic
>
topicPage
=
topicService
.
page
(
page
);
IPage
<
Topic
>
topicPage
=
topicService
.
getTopicPage
(
pageNo
,
pageSize
);
PageVO
<
Topic
>
topicPageVO
=
new
PageVO
<>(
topicPage
);
return
Response
.
success
(
topicPageVO
);
}
...
...
src/main/java/cn/meteor/beyondclouds/modules/topic/service/ITopicService.java
View file @
67f307f8
...
...
@@ -65,7 +65,7 @@ public interface ITopicService extends IService<Topic> {
IPage
<
User
>
getTopicsFollower
(
Integer
page
,
Integer
size
,
String
topicId
);
/**
* 获取话题分页
* 获取
用户的
话题分页
* @param page
* @param size
* @param userId
...
...
@@ -74,6 +74,14 @@ public interface ITopicService extends IService<Topic> {
IPage
<
Topic
>
getTopicPage
(
Integer
page
,
Integer
size
,
String
userId
);
/**
* 获取话题分页
* @param pageNumber
* @param pageSize
* @return
*/
IPage
<
Topic
>
getTopicPage
(
Integer
pageNumber
,
Integer
pageSize
);
/**
* 增加话题引用次数
* @param topicId
* @param count
...
...
src/main/java/cn/meteor/beyondclouds/modules/topic/service/impl/TopicServiceImpl.java
View file @
67f307f8
...
...
@@ -191,6 +191,15 @@ public class TopicServiceImpl extends ServiceImpl<TopicMapper, Topic> implements
IPage
<
Topic
>
page
=
new
Page
<>(
pageNumber
,
pageSize
);
QueryWrapper
<
Topic
>
topicQueryWrapper
=
new
QueryWrapper
<>();
topicQueryWrapper
.
eq
(
"user_id"
,
userId
);
topicQueryWrapper
.
orderByDesc
(
"create_time"
);
return
page
(
page
,
topicQueryWrapper
);
}
@Override
public
IPage
<
Topic
>
getTopicPage
(
Integer
pageNumber
,
Integer
pageSize
)
{
IPage
<
Topic
>
page
=
new
Page
<>(
pageNumber
,
pageSize
);
QueryWrapper
<
Topic
>
topicQueryWrapper
=
new
QueryWrapper
<>();
topicQueryWrapper
.
orderByDesc
(
"create_time"
);
return
page
(
page
,
topicQueryWrapper
);
}
...
...
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