Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
K
know-base
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
张京坤
know-base
Commits
f12991cb
提交
f12991cb
authored
1月 23, 2024
作者:
chenshiqiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add permitKnows
上级
c6ab0b7f
显示空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
18 行增加
和
20 行删除
+18
-20
KnowledgeServiceImpl.java
.../com/zzsn/knowbase/service/impl/KnowledgeServiceImpl.java
+18
-20
没有找到文件。
src/main/java/com/zzsn/knowbase/service/impl/KnowledgeServiceImpl.java
浏览文件 @
f12991cb
...
@@ -90,7 +90,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
...
@@ -90,7 +90,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
knowledge
.
setVerifyStatus
(
0
);
knowledge
.
setVerifyStatus
(
0
);
}
}
knowledge
.
setCreateTime
(
cn
.
hutool
.
core
.
date
.
DateUtil
.
formatDateTime
(
new
Date
()).
replace
(
" "
,
"T"
));
knowledge
.
setCreateTime
(
cn
.
hutool
.
core
.
date
.
DateUtil
.
formatDateTime
(
new
Date
()).
replace
(
" "
,
"T"
));
if
(
null
==
knowledge
.
getPublishDate
())
{
if
(
null
==
knowledge
.
getPublishDate
())
{
knowledge
.
setPublishDate
(
cn
.
hutool
.
core
.
date
.
DateUtil
.
formatDateTime
(
new
Date
()).
replace
(
" "
,
"T"
));
knowledge
.
setPublishDate
(
cn
.
hutool
.
core
.
date
.
DateUtil
.
formatDateTime
(
new
Date
()).
replace
(
" "
,
"T"
));
}
}
...
@@ -179,7 +179,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
...
@@ -179,7 +179,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
esOpUtil
.
docDeleteById
(
Constants
.
ES_DATA_FOR_KNOWLEDGE
,
id
);
esOpUtil
.
docDeleteById
(
Constants
.
ES_DATA_FOR_KNOWLEDGE
,
id
);
}
}
CompletableFuture
.
runAsync
(()
->{
CompletableFuture
.
runAsync
(()
->
{
for
(
String
id
:
split
)
{
for
(
String
id
:
split
)
{
deleteForPython
(
id
);
deleteForPython
(
id
);
}
}
...
@@ -206,27 +206,25 @@ class KnowledgeServiceImpl implements IKnowledgeService {
...
@@ -206,27 +206,25 @@ class KnowledgeServiceImpl implements IKnowledgeService {
List
<
String
>
catList
;
List
<
String
>
catList
;
List
<
String
>
treeList
=
knowledgeProjectService
.
getTreeListBy
(
knowledgeParam
.
getKnowledgeProjectId
())
List
<
String
>
treeList
=
knowledgeProjectService
.
getTreeListBy
(
knowledgeParam
.
getKnowledgeProjectId
())
.
stream
().
map
(
KbKnowledgeProject:
:
getId
).
collect
(
Collectors
.
toList
());
.
stream
().
map
(
KbKnowledgeProject:
:
getId
).
collect
(
Collectors
.
toList
());
log
.
info
(
"treeList===={}"
,
treeList
.
toString
());
log
.
info
(
"treeList===={}"
,
treeList
.
toString
());
//获取用户拥有的分类
//获取用户拥有的分类
KbAuthorizedUser
userInfo
=
SpringContextUtils
.
getUserInfo
();
KbAuthorizedUser
userInfo
=
SpringContextUtils
.
getUserInfo
();
if
(
null
==
userInfo
)
{
if
(
null
==
userInfo
)
{
return
null
;
return
null
;
}
}
//查看全部且是非管理员的时候
//查看全部且是非管理员的时候
List
<
String
>
knowPermitList
=
new
ArrayList
<>();
if
((!
Integer
.
valueOf
(
"0"
).
equals
(
userInfo
.
getIsAll
()))
&&
knowledgeParam
.
getKnowledgeProjectId
().
equals
(
"0"
))
{
if
((!
Integer
.
valueOf
(
"0"
).
equals
(
userInfo
.
getIsAll
()))
&&
knowledgeParam
.
getKnowledgeProjectId
().
equals
(
"0"
))
{
Map
<
String
,
Boolean
>
userKnowProjectSigns
=
authorizedUserService
.
getUserKnowProjectSigns
(
treeList
,
userInfo
.
getId
());
Map
<
String
,
Boolean
>
userKnowProjectSigns
=
authorizedUserService
.
getUserKnowProjectSigns
(
treeList
,
userInfo
.
getId
());
log
.
info
(
"userKnowProjectSigns=={}"
,
userKnowProjectSigns
.
toString
());
log
.
info
(
"userKnowProjectSigns=={}"
,
userKnowProjectSigns
.
toString
());
//all permit
//all permit
Set
<
Map
.
Entry
<
String
,
Boolean
>>
entries
=
userKnowProjectSigns
.
entrySet
();
Set
<
Map
.
Entry
<
String
,
Boolean
>>
entries
=
userKnowProjectSigns
.
entrySet
();
List
<
String
>
allPermitList
=
entries
.
stream
().
filter
(
Map
.
Entry
::
getValue
).
map
(
Map
.
Entry
::
getKey
).
collect
(
Collectors
.
toList
());
List
<
String
>
allPermitList
=
entries
.
stream
().
filter
(
Map
.
Entry
::
getValue
).
map
(
Map
.
Entry
::
getKey
).
collect
(
Collectors
.
toList
());
List
<
String
>
halfPermitList
=
entries
.
stream
().
filter
(
item
->
!
item
.
getValue
()).
map
(
Map
.
Entry
::
getKey
).
collect
(
Collectors
.
toList
());
List
<
String
>
halfPermitList
=
entries
.
stream
().
filter
(
item
->
!
item
.
getValue
()).
map
(
Map
.
Entry
::
getKey
).
collect
(
Collectors
.
toList
());
//know permit
//know permit
log
.
info
(
"halfPermitList=={}"
,
halfPermitList
.
toString
());
log
.
info
(
"halfPermitList=={}"
,
halfPermitList
.
toString
());
List
<
String
>
knowPermitList
=
authorizedUserService
.
getUserPermissionKnowsByIds
(
halfPermitList
,
userInfo
.
getId
());
knowPermitList
=
authorizedUserService
.
getUserPermissionKnowsByIds
(
halfPermitList
,
userInfo
.
getId
());
log
.
info
(
"knowPermitList=={}"
,
knowPermitList
.
toString
());
log
.
info
(
"knowPermitList=={}"
,
knowPermitList
.
toString
());
if
(!
knowPermitList
.
isEmpty
())
{
permitKnowList
=
knowledgeProjectService
.
getKnowledgeListByUserId
(
userInfo
.
getId
(),
knowPermitList
);
}
catList
=
allPermitList
;
catList
=
allPermitList
;
}
else
{
}
else
{
catList
=
treeList
;
catList
=
treeList
;
...
@@ -315,13 +313,13 @@ class KnowledgeServiceImpl implements IKnowledgeService {
...
@@ -315,13 +313,13 @@ class KnowledgeServiceImpl implements IKnowledgeService {
boolQuery
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"origin"
,
knowledgeParam
.
getOrigin
()));
boolQuery
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"origin"
,
knowledgeParam
.
getOrigin
()));
}
}
if
(!
permitKnowList
.
isEmpty
())
{
BoolQueryBuilder
outer
=
new
BoolQueryBuilder
();
BoolQueryBuilder
outer
=
new
BoolQueryBuilder
();
if
(!
knowPermitList
.
isEmpty
())
{
BoolQueryBuilder
boolQueryColumn
=
new
BoolQueryBuilder
();
BoolQueryBuilder
boolQueryColumn
=
new
BoolQueryBuilder
();
boolQueryColumn
.
must
(
QueryBuilders
.
termsQuery
(
"id"
,
permitKnow
List
));
boolQueryColumn
.
must
(
QueryBuilders
.
termsQuery
(
"id"
,
knowPermit
List
));
outer
.
should
(
boolQueryColumn
);
outer
.
should
(
boolQueryColumn
);
boolQuery
.
must
(
outer
);
}
}
if
(!
catList
.
isEmpty
())
{
if
(!
catList
.
isEmpty
())
{
boolQuery
.
must
(
QueryBuilders
.
termsQuery
(
"knowledgeProjectId"
,
catList
));
boolQuery
.
must
(
QueryBuilders
.
termsQuery
(
"knowledgeProjectId"
,
catList
));
...
@@ -343,8 +341,8 @@ class KnowledgeServiceImpl implements IKnowledgeService {
...
@@ -343,8 +341,8 @@ class KnowledgeServiceImpl implements IKnowledgeService {
if
(
StringUtils
.
isNotBlank
(
knowledgeParam
.
getEndTime
()))
{
if
(
StringUtils
.
isNotBlank
(
knowledgeParam
.
getEndTime
()))
{
boolQuery
.
filter
(
QueryBuilders
.
rangeQuery
(
"publishDate"
).
lte
(
EsDateUtil
.
esFieldDateFormat
(
knowledgeParam
.
getEndTime
())));
boolQuery
.
filter
(
QueryBuilders
.
rangeQuery
(
"publishDate"
).
lte
(
EsDateUtil
.
esFieldDateFormat
(
knowledgeParam
.
getEndTime
())));
}
}
outer
.
should
(
boolQuery
);
searchSourceBuilder
.
query
(
boolQuery
);
searchSourceBuilder
.
query
(
outer
);
searchRequest
.
source
(
searchSourceBuilder
);
searchRequest
.
source
(
searchSourceBuilder
);
SearchResponse
searchResponse
=
null
;
SearchResponse
searchResponse
=
null
;
try
{
try
{
...
@@ -449,17 +447,17 @@ class KnowledgeServiceImpl implements IKnowledgeService {
...
@@ -449,17 +447,17 @@ class KnowledgeServiceImpl implements IKnowledgeService {
.
publishDate
(
one
.
get
(
"publishDate"
).
toString
())
.
publishDate
(
one
.
get
(
"publishDate"
).
toString
())
.
type
(
one
.
get
(
"type"
).
toString
())
.
type
(
one
.
get
(
"type"
).
toString
())
.
verifierName
(
one
.
get
(
"verifierName"
).
toString
())
.
verifierName
(
one
.
get
(
"verifierName"
).
toString
())
.
contents
(
Collections
.
singletonList
(
Content
.
builder
().
contentId
(
one
.
get
(
"contentId"
).
toString
()).
content
(
one
.
get
(
"content"
).
toString
()).
build
()))
.
contents
(
Collections
.
singletonList
(
Content
.
builder
().
contentId
(
one
.
get
(
"contentId"
).
toString
()).
content
(
one
.
get
(
"content"
).
toString
()).
build
()))
.
build
());
.
build
());
}
}
Map
<
String
,
List
<
KnowledgeVO
>>
map
=
knowledgeList
.
stream
().
collect
(
Collectors
.
groupingBy
((
KnowledgeVO:
:
getId
)));
Map
<
String
,
List
<
KnowledgeVO
>>
map
=
knowledgeList
.
stream
().
collect
(
Collectors
.
groupingBy
((
KnowledgeVO:
:
getId
)));
Iterator
<
Map
.
Entry
<
String
,
List
<
KnowledgeVO
>>>
iterator
=
map
.
entrySet
().
iterator
();
Iterator
<
Map
.
Entry
<
String
,
List
<
KnowledgeVO
>>>
iterator
=
map
.
entrySet
().
iterator
();
List
<
KnowledgeVO
>
knowledgeListGrouped
=
new
ArrayList
<>(
map
.
size
());
List
<
KnowledgeVO
>
knowledgeListGrouped
=
new
ArrayList
<>(
map
.
size
());
while
(
iterator
.
hasNext
()){
while
(
iterator
.
hasNext
())
{
Map
.
Entry
<
String
,
List
<
KnowledgeVO
>>
next
=
iterator
.
next
();
Map
.
Entry
<
String
,
List
<
KnowledgeVO
>>
next
=
iterator
.
next
();
List
<
KnowledgeVO
>
value
=
next
.
getValue
();
List
<
KnowledgeVO
>
value
=
next
.
getValue
();
KnowledgeVO
knowledgeVO
=
value
.
get
(
0
);
KnowledgeVO
knowledgeVO
=
value
.
get
(
0
);
knowledgeVO
.
setContents
(
value
.
stream
().
map
(
item
->
item
.
getContents
().
get
(
0
)).
collect
(
Collectors
.
toList
()));
knowledgeVO
.
setContents
(
value
.
stream
().
map
(
item
->
item
.
getContents
().
get
(
0
)).
collect
(
Collectors
.
toList
()));
knowledgeListGrouped
.
add
(
knowledgeVO
);
knowledgeListGrouped
.
add
(
knowledgeVO
);
}
}
IPage
<
KnowledgeVO
>
pageData
=
new
Page
<>(
pageNo
,
pageSize
,
knowledgeListGrouped
.
size
());
IPage
<
KnowledgeVO
>
pageData
=
new
Page
<>(
pageNo
,
pageSize
,
knowledgeListGrouped
.
size
());
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论