Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liqin
chnmuseum-party
Commits
c026d943
Commit
c026d943
authored
Apr 27, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
839912e5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
19 deletions
+13
-19
ExhibitionBoardController.java
...useum/party/web/controller/ExhibitionBoardController.java
+9
-14
VideoContentController.java
...hnmuseum/party/web/controller/VideoContentController.java
+4
-5
No files found.
src/main/java/cn/chnmuseum/party/web/controller/ExhibitionBoardController.java
View file @
c026d943
...
...
@@ -392,23 +392,18 @@ public class ExhibitionBoardController extends BaseController {
exhibitionBoard
.
setVideoContentCopyrightOwnerName
(
name
);
}
LambdaQueryWrapper
<
Asset
>
assetQueryWrapper
=
Wrappers
.<
Asset
>
lambdaQuery
().
eq
(
Asset:
:
getRefItemId
,
exhibitionBoard
.
getId
());
assetQueryWrapper
.
eq
(
Asset:
:
getPublished
,
false
);
assetQueryWrapper
.
eq
(
Asset:
:
getFileCat
,
FileCatEnum
.
EXHIBITION_BOARD_AUDIO
.
name
());
final
List
<
Asset
>
audioList
=
this
.
assetService
.
list
(
assetQueryWrapper
);
if
(
audioList
!=
null
&&
!
audioList
.
isEmpty
())
{
final
List
<
String
>
audioIdList
=
exhibitionBoard
.
getAudioIdList
();
if
(
audioIdList
!=
null
&&
!
audioIdList
.
isEmpty
())
{
final
List
<
Asset
>
audioList
=
this
.
assetService
.
listByIds
(
audioIdList
);
exhibitionBoard
.
setAudioIdList
(
audioIdList
);
exhibitionBoard
.
setAudioList
(
audioList
);
exhibitionBoard
.
setAudioIdList
(
audioList
.
stream
().
map
(
Asset:
:
getId
).
collect
(
Collectors
.
toList
()));
}
assetQueryWrapper
.
clear
();
assetQueryWrapper
=
Wrappers
.<
Asset
>
lambdaQuery
().
eq
(
Asset:
:
getRefItemId
,
exhibitionBoard
.
getId
());
assetQueryWrapper
.
eq
(
Asset:
:
getPublished
,
false
);
assetQueryWrapper
.
eq
(
Asset:
:
getFileCat
,
FileCatEnum
.
EXHIBITION_BOARD_DATUM
.
name
());
final
List
<
Asset
>
datumList
=
this
.
assetService
.
list
(
assetQueryWrapper
);
if
(
datumList
!=
null
&&
!
datumList
.
isEmpty
())
{
final
List
<
String
>
datumIdList
=
exhibitionBoard
.
getDatumIdList
();
if
(
datumIdList
!=
null
&&
!
datumIdList
.
isEmpty
())
{
final
List
<
Asset
>
datumList
=
this
.
assetService
.
listByIds
(
datumIdList
);
exhibitionBoard
.
setDatumIdList
(
datumIdList
);
exhibitionBoard
.
setDatumList
(
datumList
);
exhibitionBoard
.
setDatumIdList
(
datumList
.
stream
().
map
(
Asset:
:
getId
).
collect
(
Collectors
.
toList
()));
}
final
LambdaQueryWrapper
<
Audit
>
auditQueryWrapper
=
Wrappers
.<
Audit
>
lambdaQuery
().
eq
(
Audit:
:
getRefItemId
,
exhibitionBoard
.
getId
());
...
...
@@ -425,7 +420,7 @@ public class ExhibitionBoardController extends BaseController {
}
final
LambdaQueryWrapper
<
Asset
>
lambdaQueryWrapper
=
Wrappers
.<
Asset
>
lambdaQuery
().
eq
(
Asset:
:
getRefItemId
,
videoContentId
);
lambdaQueryWrapper
.
eq
(
Asset:
:
getFileCat
,
FileCatEnum
.
VIDEO_CONTENT
.
name
());
assetQueryWrapper
.
eq
(
Asset:
:
getPublished
,
fals
e
);
lambdaQueryWrapper
.
eq
(
Asset:
:
getPublished
,
tru
e
);
final
List
<
Asset
>
videoList
=
this
.
assetService
.
list
(
lambdaQueryWrapper
);
exhibitionBoard
.
setVideoList
(
videoList
);
}
...
...
src/main/java/cn/chnmuseum/party/web/controller/VideoContentController.java
View file @
c026d943
...
...
@@ -324,12 +324,11 @@ public class VideoContentController extends BaseController {
videoContent
.
setVideoContentCopyrightOwnerName
(
copyrightOwner
.
getName
());
}
}
final
LambdaQueryWrapper
<
Asset
>
assetQueryWrapper
=
Wrappers
.<
Asset
>
lambdaQuery
().
eq
(
Asset:
:
getRefItemId
,
id
);
assetQueryWrapper
.
eq
(
Asset:
:
getPublished
,
false
);
assetQueryWrapper
.
eq
(
Asset:
:
getFileCat
,
FileCatEnum
.
VIDEO_CONTENT
.
name
()
);
final
List
<
Asset
>
videoFileList
=
this
.
assetService
.
list
(
assetQueryWrapper
);
final
List
<
String
>
videoFileIdList
=
videoContent
.
getVideoFileIdList
(
);
final
List
<
Asset
>
videoFileList
=
this
.
assetService
.
listByIds
(
videoFileIdList
);
videoContent
.
setVideoFileIdList
(
videoFileIdList
);
videoContent
.
setVideoFileList
(
videoFileList
);
videoContent
.
setVideoFileIdList
(
videoFileList
.
stream
().
map
(
Asset:
:
getId
).
collect
(
Collectors
.
toList
()));
final
LambdaQueryWrapper
<
Audit
>
auditQueryWrapper
=
Wrappers
.<
Audit
>
lambdaQuery
().
eq
(
Audit:
:
getRefItemId
,
id
);
final
List
<
Audit
>
auditList
=
this
.
auditService
.
list
(
auditQueryWrapper
);
...
...
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