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
0f0f4e13
Commit
0f0f4e13
authored
Apr 02, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
fb4341f5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
ChinaMobileRestApiController.java
...um/party/web/controller/ChinaMobileRestApiController.java
+10
-2
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java
View file @
0f0f4e13
...
@@ -399,6 +399,9 @@ public class ChinaMobileRestApiController extends BaseController {
...
@@ -399,6 +399,9 @@ public class ChinaMobileRestApiController extends BaseController {
LambdaQueryWrapper
<
Asset
>
assetQueryWrapper
=
Wrappers
.<
Asset
>
lambdaQuery
().
eq
(
Asset:
:
getRefItemId
,
exhibitionBoard
.
getId
());
LambdaQueryWrapper
<
Asset
>
assetQueryWrapper
=
Wrappers
.<
Asset
>
lambdaQuery
().
eq
(
Asset:
:
getRefItemId
,
exhibitionBoard
.
getId
());
assetQueryWrapper
.
eq
(
Asset:
:
getFileCat
,
FileCatEnum
.
EXHIBITION_BOARD_AUDIO
.
name
());
assetQueryWrapper
.
eq
(
Asset:
:
getFileCat
,
FileCatEnum
.
EXHIBITION_BOARD_AUDIO
.
name
());
if
(
language
!=
null
)
{
assetQueryWrapper
.
eq
(
Asset:
:
getLanguage
,
language
.
name
());
}
final
List
<
Asset
>
audioList
=
this
.
assetService
.
list
(
assetQueryWrapper
);
final
List
<
Asset
>
audioList
=
this
.
assetService
.
list
(
assetQueryWrapper
);
exhibitionBoard
.
setAudioList
(
audioList
);
exhibitionBoard
.
setAudioList
(
audioList
);
...
@@ -416,6 +419,9 @@ public class ChinaMobileRestApiController extends BaseController {
...
@@ -416,6 +419,9 @@ public class ChinaMobileRestApiController extends BaseController {
assetQueryWrapper
.
clear
();
assetQueryWrapper
.
clear
();
assetQueryWrapper
=
Wrappers
.<
Asset
>
lambdaQuery
().
eq
(
Asset:
:
getRefItemId
,
videoContentId
);
assetQueryWrapper
=
Wrappers
.<
Asset
>
lambdaQuery
().
eq
(
Asset:
:
getRefItemId
,
videoContentId
);
assetQueryWrapper
.
eq
(
Asset:
:
getFileCat
,
FileCatEnum
.
VIDEO_CONTENT
.
name
());
assetQueryWrapper
.
eq
(
Asset:
:
getFileCat
,
FileCatEnum
.
VIDEO_CONTENT
.
name
());
if
(
language
!=
null
)
{
assetQueryWrapper
.
eq
(
Asset:
:
getLanguage
,
language
.
name
());
}
final
List
<
Asset
>
videoList
=
this
.
assetService
.
list
(
assetQueryWrapper
);
final
List
<
Asset
>
videoList
=
this
.
assetService
.
list
(
assetQueryWrapper
);
exhibitionBoard
.
setVideoList
(
videoList
);
exhibitionBoard
.
setVideoList
(
videoList
);
}
}
...
@@ -449,7 +455,8 @@ public class ChinaMobileRestApiController extends BaseController {
...
@@ -449,7 +455,8 @@ public class ChinaMobileRestApiController extends BaseController {
@PostMapping
(
"/learningContent/getPage"
)
@PostMapping
(
"/learningContent/getPage"
)
@RequiresPermissions
(
"learning:content:page"
)
@RequiresPermissions
(
"learning:content:page"
)
@ApiOperation
(
value
=
"查询学习内容"
,
notes
=
"查询学习内容"
)
@ApiOperation
(
value
=
"查询学习内容"
,
notes
=
"查询学习内容"
)
public
Map
<
String
,
Object
>
getLearningContentPageList
(
GenericPageParam
genericPageParam
,
@RequestParam
(
value
=
"learningProjectId"
,
required
=
false
)
String
learningProjectId
)
{
public
Map
<
String
,
Object
>
getLearningContentPageList
(
GenericPageParam
genericPageParam
,
@RequestParam
(
value
=
"learningProjectId"
,
required
=
false
)
String
learningProjectId
)
{
LambdaQueryWrapper
<
LearningContent
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
LearningContent
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
// 对名称或编码模糊查询
// 对名称或编码模糊查询
if
(
StringUtils
.
isNotBlank
(
learningProjectId
))
{
if
(
StringUtils
.
isNotBlank
(
learningProjectId
))
{
...
@@ -555,7 +562,8 @@ public class ChinaMobileRestApiController extends BaseController {
...
@@ -555,7 +562,8 @@ public class ChinaMobileRestApiController extends BaseController {
@PostMapping
(
"/exhibitionBoard/search"
)
@PostMapping
(
"/exhibitionBoard/search"
)
@RequiresPermissions
(
"learning:content:board:page"
)
@RequiresPermissions
(
"learning:content:board:page"
)
@ApiOperation
(
value
=
"模糊搜索查询"
,
notes
=
"模糊搜索查询"
)
@ApiOperation
(
value
=
"模糊搜索查询"
,
notes
=
"模糊搜索查询"
)
public
Map
<
String
,
Object
>
getLearningContentBoardPageList
(
GenericPageParam
genericPageParam
,
@RequestParam
(
value
=
"learningContentId"
,
required
=
false
)
String
learningContentId
)
{
public
Map
<
String
,
Object
>
getLearningContentBoardPageList
(
GenericPageParam
genericPageParam
,
@RequestParam
(
value
=
"learningContentId"
,
required
=
false
)
String
learningContentId
)
{
IPage
<
ExhibitionBoard
>
page
=
this
.
learningContentBoardService
.
getBoardPageByLearningContentId
(
getPage
(),
learningContentId
,
genericPageParam
.
getNameOrCode
());
IPage
<
ExhibitionBoard
>
page
=
this
.
learningContentBoardService
.
getBoardPageByLearningContentId
(
getPage
(),
learningContentId
,
genericPageParam
.
getNameOrCode
());
return
getResult
(
page
);
return
getResult
(
page
);
}
}
...
...
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