bug fixed

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

@@ -119,7 +119,7 @@ public class LearningContent implements Serializable {
 
     @ApiModelProperty("展板列表")
     @TableField(exist = false)
-    private List<LearningContentBoard> learningContentBoardList;
+    private List<ExhibitionBoard> exhibitionBoardList;
 
     @ApiModelProperty("所含展板数量(列表使用)")
     @TableField(exist = false)

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

@@ -5,10 +5,15 @@ import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
 import cn.wisenergy.chnmuseum.party.common.enums.AuditTypeEnum;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
+import cn.wisenergy.chnmuseum.party.common.vo.AudioVo;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
+import cn.wisenergy.chnmuseum.party.common.vo.VideoVo;
 import cn.wisenergy.chnmuseum.party.model.*;
 import cn.wisenergy.chnmuseum.party.service.*;
 import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson.parser.Feature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -63,6 +68,8 @@ public class LearningContentController extends BaseController {
     private LearningProjectService learningProjectService;
     @Resource
     private AuditService auditService;
+    @Resource
+    private AssetService assetService;
 
     @PostMapping("/save")
     @RequiresPermissions("learning:content:save")
@@ -319,6 +326,42 @@ public class LearningContentController extends BaseController {
         learningContent.setExhibitionBoardIdList(exhibitionBoardList.stream().map(ExhibitionBoard::getId).collect(Collectors.toList()));
         learningContent.setExhibitionBoardNameList(exhibitionBoardList.stream().map(ExhibitionBoard::getName).collect(Collectors.toList()));
 
+        for (ExhibitionBoard exhibitionBoard : exhibitionBoardList) {
+            String exhibitionBoardCatId = exhibitionBoard.getExhibitionBoardCatId();
+            if (exhibitionBoardCatId != null) {
+                exhibitionBoard.setExhibitionBoardCatName(this.exhibitionBoardCatService.getById(exhibitionBoardCatId).getName());
+            }
+            String boardCopyrightOwnerId = exhibitionBoard.getBoardCopyrightOwnerId();
+            if (boardCopyrightOwnerId != null) {
+                exhibitionBoard.setBoardCopyrightOwnerName(this.copyrightOwnerService.getById(boardCopyrightOwnerId).getName());
+            }
+
+            final String guideAudioUrl = exhibitionBoard.getGuideAudioUrl();
+            final List<AudioVo> audioVoList = JSONObject.parseObject(guideAudioUrl, new TypeReference<List<AudioVo>>() {
+            }, Feature.OrderedField);
+            exhibitionBoard.setAudioUrlList(audioVoList.stream().map(AudioVo::getFileUrl).collect(Collectors.toList()));
+
+            final String refMaterialUrl = exhibitionBoard.getRefMaterialUrl();
+            final List<AudioVo> refMaterialVoList = JSONObject.parseObject(refMaterialUrl, new TypeReference<List<AudioVo>>() {
+            }, Feature.OrderedField);
+            exhibitionBoard.setMaterialUrlList(refMaterialVoList.stream().map(AudioVo::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()));
+            }
+        }
+        learningContent.setExhibitionBoardList(exhibitionBoardList);
+
         return getResult(learningContent);
     }