bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/model/ExhibitionBoard.java

@@ -112,10 +112,18 @@ public class ExhibitionBoard implements Serializable {
     @TableField(exist = false)
     private String boardCopyrightOwnerName;
 
+    @ApiModelProperty("视频版权方名称")
+    @TableField(exist = false)
+    private String assetCopyrightOwnerName;
+
     @ApiModelProperty("展板分类名称")
     @TableField(exist = false)
     private String exhibitionBoardCatName;
 
+    @ApiModelProperty("关联视频名称")
+    @TableField(exist = false)
+    private String assetName;
+
     @ApiModelProperty("展板视频URL列表")
     @TableField(exist = false)
     private List<String> videoUrlList;

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java

@@ -604,4 +604,16 @@ public class ChinaMobileRestApiController extends BaseController {
         return getResult(page);
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
 }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java

@@ -326,12 +326,19 @@ public class ExhibitionBoardController extends BaseController {
         }, Feature.OrderedField);
         exhibitionBoard.setMaterialUrlList(refMaterialVoList.stream().map(AudioVo::getFileUrl).collect(Collectors.toList()));
 
-        final String assetId = exhibitionBoard.getAssetId();
-        final Asset asset = this.assetService.getById(assetId);
-        final String videoUrl = asset.getVideoUrl();
-        final List<VideoVo> videoVoList = JSONObject.parseObject(videoUrl, new TypeReference<List<VideoVo>>() {
-        }, Feature.OrderedField);
-        exhibitionBoard.setVideoUrlList(videoVoList.stream().map(VideoVo::getFileUrl).collect(Collectors.toList()));
+        String assetId = exhibitionBoard.getAssetId();
+        if (assetId != null) {
+            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 List<VideoVo> videoVoList = JSONObject.parseObject(videoUrl, new TypeReference<List<VideoVo>>() {
+            }, Feature.OrderedField);
+            exhibitionBoard.setVideoUrlList(videoVoList.stream().map(VideoVo::getFileUrl).collect(Collectors.toList()));
+        }
         return getResult(exhibitionBoard);
     }