bug fixed

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

@@ -63,9 +63,9 @@ public class ExhibitionBoard implements Serializable {
     private String qrcodeUrl;
 
     @ApiModelProperty("简介")
-    @TableField("introduction")
+    @TableField("remarks")
     @NotBlank(message = "简介不能为空", groups = {Add.class, Update.class})
-    private String introduction;
+    private String remarks;
 
     @ApiModelProperty("视频版权方ID")
     @TableField("asset_copyright_owner_id")
@@ -86,7 +86,6 @@ public class ExhibitionBoard implements Serializable {
 
     @ApiModelProperty("参考资料文件夹")
     @TableField("ref_material_dir")
-    @NotBlank(message = "参考资料文件夹不能为空", groups = {Add.class, Update.class})
     private String refMaterialDir;
 
     @ApiModelProperty("参考资料URL")

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

@@ -5,6 +5,7 @@ import cn.wisenergy.chnmuseum.party.auth.util.JwtTokenUtil;
 import cn.wisenergy.chnmuseum.party.common.enums.LanguageEnum;
 import cn.wisenergy.chnmuseum.party.common.util.TimeUtils;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
+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.*;
@@ -440,13 +441,14 @@ public class ChinaMobileRestApiController extends BaseController {
             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);
+            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(page);
     }
 
-    @ApiOperation(value = "获取展板详情", notes = "获取展板详情")
+    @ApiOperation(value = "展板详情页面查询", notes = "展板详情页面查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "boardId", value = "展板ID", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "language", value = "语言", dataType = "String", paramType = "query"),
@@ -466,7 +468,8 @@ public class ChinaMobileRestApiController extends BaseController {
         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);
+        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);
     }
@@ -571,4 +574,39 @@ public class ChinaMobileRestApiController extends BaseController {
         return getResult(page);
     }
 
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "boardId", value = "名称或编码", paramType = "query", dataType = "String")
+    })
+    @PostMapping("/exhibitionBoard/getRefMaterial")
+    @RequiresPermissions("learning:project:page")
+    @ApiOperation(value = "展板参考资料查询", notes = "展板参考资料查询")
+    public Map<String, Object> getBoardRefMaterial(@RequestParam(value = "boardId", required = false) String boardId) {
+        final ExhibitionBoard exhibitionBoard = this.exhibitionBoardService.getById(boardId);
+        final String refMaterialUrl = exhibitionBoard.getRefMaterialUrl();
+        final List<AudioVo> audioVoList = JSONObject.parseObject(refMaterialUrl, new TypeReference<List<AudioVo>>() {
+        }, Feature.OrderedField);
+        return getResult(audioVoList);
+    }
+
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "nameOrCode", value = "名称或编码", paramType = "query", dataType = "String")
+    })
+    @PostMapping("/exhibitionBoard/search")
+    @RequiresPermissions("learning:content:board:page")
+    @ApiOperation(value = "获取学习内容展板分页列表", notes = "获取学习内容展板分页列表")
+    public Map<String, Object> getLearningContentBoardPageList(GenericPageParam genericPageParam, @RequestParam(value = "learningContentId", required = false) String learningContentId) {
+        LambdaQueryWrapper<LearningContentBoard> queryWrapper = new LambdaQueryWrapper<>();
+        // 设置查询内容
+        queryWrapper.select(
+                LearningContentBoard::getId,
+                LearningContentBoard::getLearningContentId,
+                LearningContentBoard::getExhibitionBoardId);
+        Page<LearningContentBoard> page = this.learningContentBoardService.page(getPage(), queryWrapper);
+        return getResult(page);
+    }
+
 }

src/main/resources/mapper/ExhibitionBoardMapper.xml

@@ -10,7 +10,7 @@
                 <result column="exhibition_board_cat_id" property="exhibitionBoardCatId" />
                 <result column="cover" property="cover" />
                 <result column="qrcode_url" property="qrcodeUrl" />
-                <result column="introduction" property="introduction" />
+                <result column="remarks" property="remarks" />
                 <result column="asset_copyright_owner_id" property="assetCopyrightOwnerId" />
                 <result column="asset_type_id" property="assetTypeId" />
                 <result column="asset_id" property="assetId" />
@@ -26,7 +26,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, board_copyright_owner_id, exhibition_board_cat_id, cover, qrcode_url, introduction, asset_copyright_owner_id, asset_type_id, asset_id, guide_audio_url, ref_material_dir, ref_material_url, audit_status, is_published, is_deleted, create_time, update_time
+        id, name, board_copyright_owner_id, exhibition_board_cat_id, cover, qrcode_url, remarks, asset_copyright_owner_id, asset_type_id, asset_id, guide_audio_url, ref_material_dir, ref_material_url, audit_status, is_published, is_deleted, create_time, update_time
     </sql>
 
 </mapper>