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
3787ebc2
Commit
3787ebc2
authored
Jun 26, 2021
by
nie'hong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改-修改展板出错
parent
4704c9ef
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
AssetController.java
...va/cn/chnmuseum/party/web/controller/AssetController.java
+1
-0
ExhibitionBoardController.java
...useum/party/web/controller/ExhibitionBoardController.java
+2
-2
LearningContentController.java
...useum/party/web/controller/LearningContentController.java
+2
-0
No files found.
src/main/java/cn/chnmuseum/party/web/controller/AssetController.java
View file @
3787ebc2
...
@@ -148,6 +148,7 @@ public class AssetController extends BaseController {
...
@@ -148,6 +148,7 @@ public class AssetController extends BaseController {
final
String
fileName
=
TimeUtils
.
format
(
LocalDateTime
.
now
(),
TimeUtils
.
FORMAT_ONE
)
+
"视频集.zip"
;
final
String
fileName
=
TimeUtils
.
format
(
LocalDateTime
.
now
(),
TimeUtils
.
FORMAT_ONE
)
+
"视频集.zip"
;
response
.
addHeader
(
HttpHeaders
.
CONTENT_DISPOSITION
,
"attachment; filename="
+
URLEncoder
.
encode
(
fileName
,
"UTF-8"
));
response
.
addHeader
(
HttpHeaders
.
CONTENT_DISPOSITION
,
"attachment; filename="
+
URLEncoder
.
encode
(
fileName
,
"UTF-8"
));
final
Map
<
String
,
InputStream
>
map
=
new
LinkedHashMap
<>(
idList
.
size
());
final
Map
<
String
,
InputStream
>
map
=
new
LinkedHashMap
<>(
idList
.
size
());
final
List
<
Asset
>
assetList
=
assetService
.
listByIds
(
idList
);
final
List
<
Asset
>
assetList
=
assetService
.
listByIds
(
idList
);
for
(
Asset
asset
:
assetList
)
{
for
(
Asset
asset
:
assetList
)
{
...
...
src/main/java/cn/chnmuseum/party/web/controller/ExhibitionBoardController.java
View file @
3787ebc2
...
@@ -168,14 +168,14 @@ public class ExhibitionBoardController extends BaseController {
...
@@ -168,14 +168,14 @@ public class ExhibitionBoardController extends BaseController {
}
}
List
<
String
>
audioIdList
=
exhibitionBoard
.
getAudioIdList
();
List
<
String
>
audioIdList
=
exhibitionBoard
.
getAudioIdList
();
if
(
CollectionUtil
.
isEmpty
(
audioIdList
))
{
if
(
CollectionUtil
.
isEmpty
(
audioIdList
))
{
audioIdList
=
Collections
.
emptyList
();
audioIdList
=
new
ArrayList
<>
();
}
}
// if (audioIdList == null || audioIdList.isEmpty()) {
// if (audioIdList == null || audioIdList.isEmpty()) {
// return getFailResult("400", "导览音频文件必须上传");
// return getFailResult("400", "导览音频文件必须上传");
// }
// }
List
<
String
>
datumIdList
=
exhibitionBoard
.
getDatumIdList
();
List
<
String
>
datumIdList
=
exhibitionBoard
.
getDatumIdList
();
if
(
CollectionUtil
.
isEmpty
(
datumIdList
))
{
if
(
CollectionUtil
.
isEmpty
(
datumIdList
))
{
datumIdList
=
Collections
.
emptyList
();
audioIdList
=
new
ArrayList
<>
();
}
}
// if (datumIdList == null || datumIdList.isEmpty()) {
// if (datumIdList == null || datumIdList.isEmpty()) {
// return getFailResult("400", "参考资料文件必须上传");
// return getFailResult("400", "参考资料文件必须上传");
...
...
src/main/java/cn/chnmuseum/party/web/controller/LearningContentController.java
View file @
3787ebc2
...
@@ -309,6 +309,8 @@ public class LearningContentController extends BaseController {
...
@@ -309,6 +309,8 @@ public class LearningContentController extends BaseController {
queryWrapper
.
and
(
s
->
s
.
in
(
LearningContent:
:
getOrganCode
,
curUserSubOrgIds
).
or
()
queryWrapper
.
and
(
s
->
s
.
in
(
LearningContent:
:
getOrganCode
,
curUserSubOrgIds
).
or
()
.
in
(
LearningContent:
:
getApplicableScope
,
list
));
.
in
(
LearningContent:
:
getApplicableScope
,
list
));
}
}
// 根据创建时间区间检索
// 根据创建时间区间检索
if
(
genericPageParam
.
getIsPublished
()
!=
null
)
{
if
(
genericPageParam
.
getIsPublished
()
!=
null
)
{
queryWrapper
.
eq
(
LearningContent:
:
getPublished
,
genericPageParam
.
getIsPublished
());
queryWrapper
.
eq
(
LearningContent:
:
getPublished
,
genericPageParam
.
getIsPublished
());
...
...
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