Commit 280a25ea authored by liqin's avatar liqin 💬

bug fixed

parent 739d901e
...@@ -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;
......
...@@ -604,4 +604,16 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -604,4 +604,16 @@ public class ChinaMobileRestApiController extends BaseController {
return getResult(page); return getResult(page);
} }
} }
...@@ -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);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment