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
280a25ea
Commit
280a25ea
authored
Mar 30, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
739d901e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
6 deletions
+33
-6
ExhibitionBoard.java
...a/cn/wisenergy/chnmuseum/party/model/ExhibitionBoard.java
+8
-0
ChinaMobileRestApiController.java
...um/party/web/controller/ChinaMobileRestApiController.java
+12
-0
ExhibitionBoardController.java
...useum/party/web/controller/ExhibitionBoardController.java
+13
-6
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/model/ExhibitionBoard.java
View file @
280a25ea
...
@@ -112,10 +112,18 @@ public class ExhibitionBoard implements Serializable {
...
@@ -112,10 +112,18 @@ public class ExhibitionBoard implements Serializable {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
boardCopyrightOwnerName
;
private
String
boardCopyrightOwnerName
;
@ApiModelProperty
(
"视频版权方名称"
)
@TableField
(
exist
=
false
)
private
String
assetCopyrightOwnerName
;
@ApiModelProperty
(
"展板分类名称"
)
@ApiModelProperty
(
"展板分类名称"
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
exhibitionBoardCatName
;
private
String
exhibitionBoardCatName
;
@ApiModelProperty
(
"关联视频名称"
)
@TableField
(
exist
=
false
)
private
String
assetName
;
@ApiModelProperty
(
"展板视频URL列表"
)
@ApiModelProperty
(
"展板视频URL列表"
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
List
<
String
>
videoUrlList
;
private
List
<
String
>
videoUrlList
;
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java
View file @
280a25ea
...
@@ -604,4 +604,16 @@ public class ChinaMobileRestApiController extends BaseController {
...
@@ -604,4 +604,16 @@ public class ChinaMobileRestApiController extends BaseController {
return
getResult
(
page
);
return
getResult
(
page
);
}
}
}
}
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java
View file @
280a25ea
...
@@ -326,12 +326,19 @@ public class ExhibitionBoardController extends BaseController {
...
@@ -326,12 +326,19 @@ public class ExhibitionBoardController extends BaseController {
},
Feature
.
OrderedField
);
},
Feature
.
OrderedField
);
exhibitionBoard
.
setMaterialUrlList
(
refMaterialVoList
.
stream
().
map
(
AudioVo:
:
getFileUrl
).
collect
(
Collectors
.
toList
()));
exhibitionBoard
.
setMaterialUrlList
(
refMaterialVoList
.
stream
().
map
(
AudioVo:
:
getFileUrl
).
collect
(
Collectors
.
toList
()));
final
String
assetId
=
exhibitionBoard
.
getAssetId
();
String
assetId
=
exhibitionBoard
.
getAssetId
();
if
(
assetId
!=
null
)
{
final
Asset
asset
=
this
.
assetService
.
getById
(
assetId
);
final
Asset
asset
=
this
.
assetService
.
getById
(
assetId
);
exhibitionBoard
.
setAssetName
(
this
.
assetService
.
getById
(
assetId
).
getName
());
final
String
assetCopyrightOwnerId
=
asset
.
getAssetCopyrightOwnerId
();
final
String
assetCopyrightOwnerName
=
this
.
copyrightOwnerService
.
getById
(
assetCopyrightOwnerId
).
getName
();
exhibitionBoard
.
setAssetCopyrightOwnerName
(
assetCopyrightOwnerName
);
final
String
videoUrl
=
asset
.
getVideoUrl
();
final
String
videoUrl
=
asset
.
getVideoUrl
();
final
List
<
VideoVo
>
videoVoList
=
JSONObject
.
parseObject
(
videoUrl
,
new
TypeReference
<
List
<
VideoVo
>>()
{
final
List
<
VideoVo
>
videoVoList
=
JSONObject
.
parseObject
(
videoUrl
,
new
TypeReference
<
List
<
VideoVo
>>()
{
},
Feature
.
OrderedField
);
},
Feature
.
OrderedField
);
exhibitionBoard
.
setVideoUrlList
(
videoVoList
.
stream
().
map
(
VideoVo:
:
getFileUrl
).
collect
(
Collectors
.
toList
()));
exhibitionBoard
.
setVideoUrlList
(
videoVoList
.
stream
().
map
(
VideoVo:
:
getFileUrl
).
collect
(
Collectors
.
toList
()));
}
return
getResult
(
exhibitionBoard
);
return
getResult
(
exhibitionBoard
);
}
}
...
...
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