app需求变动

src/main/java/cn/chnmuseum/party/mapper/ExhibitionBoardMapper.java

@@ -17,4 +17,6 @@ import java.util.List;
 public interface ExhibitionBoardMapper extends BaseMapper<ExhibitionBoard> {
 
     List<ExhibitionBoard> getList(@Param("learningProjectId") String learningProjectId, @Param("isPublished") boolean isPublished);
+
+    List<ExhibitionBoard> getByContentList(@Param("learningContentId") String learningContentId, @Param("isPublished")  boolean isPublished);
 }

src/main/java/cn/chnmuseum/party/mapper/LearningContentBoardMapper.java

@@ -122,7 +122,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
     @Select("<script>"
             + "SELECT eb.* FROM learning_project p,learning_content lc,learning_content_board lcb, exhibition_board eb "
             + "WHERE lcb.exhibition_board_id = eb.id and p.id = lc.learning_project_id and lc.id = lcb.learning_content_id "
-            + "and eb.is_published = 1 and eb.is_deleted = 0 and lc.is_deleted = 0 and lc.is_published = 1"
+            + "and eb.is_published = 1 and eb.is_deleted = 0 and lc.is_deleted = 0 and lc.is_published = 1 and lc.is_major = 1 "
             + "<if test='learningProjectId != null'>and p.id = #{learningProjectId} </if>"
             + "<if test='nameOrCode != null'>"
             +"AND ( eb.name LIKE CONCAT('%', #{nameOrCode}, '%') OR eb.name_pin_yin LIKE CONCAT('%', #{nameOrCode}, '%') " +
@@ -133,4 +133,24 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
             + "</script>"
     )
     IPage<ExhibitionBoard> getBoardPageByLearningProjectId(Page<ExhibitionBoard> page, String learningProjectId, String nameOrCode);
+
+
+    @Select("SELECT t.* FROM " +
+            "("
+            + "SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name, eb.cover exhibition_board_cover " +
+            "FROM learning_content_board lcb, learning_content lc, exhibition_board eb, video_content vc, asset a " +
+            "WHERE lcb.learning_content_id = lc.id and lcb.exhibition_board_id = eb.id and eb.video_content_id = vc.id " +
+            "and vc.id = a.ref_item_id and lc.is_published = 1 and lc.is_deleted = 0 and eb.is_published = 1 " +
+            "and eb.is_deleted = 0 and vc.is_deleted = 0 and vc.is_published = 1 and a.is_published = 1 " +
+            "and a.is_published = 1 and a.file_type = 'VIDEO' and lc.is_major = 1 " +
+            "union " +
+            "SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name, eb.cover exhibition_board_cover " +
+            "FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a " +
+            " WHERE lcb.learning_content_id = lc.id and lcb.exhibition_board_id = eb.id and eb.id = a.ref_item_id " +
+            "and lc.is_published = 1 and lc.is_deleted = 0 and eb.is_published = 1 and eb.is_deleted = 0 " +
+            "and a.is_published = 1 and a.is_published = 1 and a.file_cat = 'EXHIBITION_BOARD_DATUM' " +
+            "and a.file_type = 'VIDEO' and lc.is_major = 1"
+            + ") t"
+    )
+    IPage<Asset> selectAssetPageAll(Page<Asset> page);
 }

src/main/java/cn/chnmuseum/party/service/ExhibitionBoardService.java

@@ -3,6 +3,7 @@ package cn.chnmuseum.party.service;
 import cn.chnmuseum.party.model.ExhibitionBoard;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -16,4 +17,6 @@ import java.util.List;
 public interface ExhibitionBoardService extends IService<ExhibitionBoard> {
 
     List<ExhibitionBoard> getList(String learningProjectId, boolean b);
+
+    List<ExhibitionBoard> getByContentList(String learningContentId, boolean b);
 }

src/main/java/cn/chnmuseum/party/service/impl/ExhibitionBoardServiceImpl.java

@@ -23,8 +23,15 @@ public class ExhibitionBoardServiceImpl extends ServiceImpl<ExhibitionBoardMappe
     @Autowired
     private ExhibitionBoardMapper exhibitionBoardMapper;
 
+    //根据学习项目id查询所有展板
     @Override
     public List<ExhibitionBoard> getList(String learningProjectId, boolean isPublished) {
         return exhibitionBoardMapper.getList(learningProjectId,isPublished);
     }
+
+    //根据学习内容id查询所有展板
+    @Override
+    public List<ExhibitionBoard> getByContentList(String learningContentId, boolean isPublished) {
+        return exhibitionBoardMapper.getByContentList(learningContentId,isPublished);
+    }
 }

src/main/java/cn/chnmuseum/party/service/impl/LearningContentBoardServiceImpl.java

@@ -39,11 +39,15 @@ public class LearningContentBoardServiceImpl extends ServiceImpl<LearningContent
 
     @Override
     public IPage<Asset> getAssetPageByOrganCode(Page<Asset> page, String organCode) {
-        return learningContentBoardMapper.selectAssetPageByOrganCode(page, organCode);
+        //查询所有可看子学习内容视频列表
+//        return learningContentBoardMapper.selectAssetPageByOrganCode(page, organCode);
+        //直接查询主学习内容更新视频
+        return learningContentBoardMapper.selectAssetPageAll(page);
     }
 
     @Override
     public IPage<ExhibitionBoard> getBoardPageByLearningProjectId(Page<ExhibitionBoard> page, String learningProjectId, String nameOrCode) {
+        //直接关联主学习内容查询展板
         return learningContentBoardMapper.getBoardPageByLearningProjectId(page, learningProjectId, nameOrCode);
     }
 

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

@@ -406,8 +406,9 @@ public class ChinaMobileRestApiController extends BaseController {
     })
     @PostMapping("/exhibitionBoard/getPage")
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:page")
-    @ApiOperation(value = "展板列表查询", notes = "展板列表查询")
+    @ApiOperation(value = "总展板列表查询", notes = "总展板列表查询")
     public Map<String, Object> getExhibitionBoardPageList(@RequestParam(value = "learningProjectId", required = false) String learningProjectId) {
+        //中移要求，如果翻页参数超出数据总数，返回第一页
         Page<ExhibitionBoard> page1 = getPage();
         long l = page1.getCurrent() * page1.getSize()-10;
         int size = exhibitionBoardService.getList(learningProjectId, true).size();
@@ -459,57 +460,64 @@ public class ChinaMobileRestApiController extends BaseController {
 
 
 
-//    @ApiImplicitParams(value = {
-//            @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
-//            @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
-//            @ApiImplicitParam(name = "learningContentId", value = "学习内容ID", paramType = "query", dataType = "String")
-//    })
-//    @PostMapping("/exhibitionBoard/getPage1")
-//    @RequiresAuthentication  //@RequiresPermissions("exhibition:board:page")
-//    @ApiOperation(value = "展板列表查询", notes = "展板列表查询")
-//    public Map<String, Object> getExhibitionBoardPageList(@RequestParam(value = "learningContentId", required = false) String learningContentId) {
-//      final IPage<ExhibitionBoard> page = this.learningContentBoardService.getBoardPageByLearningContentId(getPage(), learningContentId, null);
-//      for (ExhibitionBoard exhibitionBoard : page.getRecords()) {
-//            exhibitionBoard.setLearningContentId(learningContentId);
-//            if (exhibitionBoard.getVideoContentCopyrightOwnerId() != null) {
-//                String name = this.copyrightOwnerService.getById(exhibitionBoard.getVideoContentCopyrightOwnerId()).getName();
-//                exhibitionBoard.setBoardCopyrightOwnerName(name);
-//            }
-//            if (exhibitionBoard.getExhibitionBoardCatId() != null) {
-//                String name = this.exhibitionBoardCatService.getById(exhibitionBoard.getExhibitionBoardCatId()).getName();
-//                exhibitionBoard.setExhibitionBoardCatName(name);
-//            }
-//            if (exhibitionBoard.getVideoContentId() != null) {
-//                final VideoContent videoContent = this.videoContentService.getById(exhibitionBoard.getVideoContentId());
-//                if (videoContent != null) {
-//                    exhibitionBoard.setBoardVideoContentThumbnail(videoContent.getThumbnail());
-//                }
-//            }
-//            LambdaQueryWrapper<Asset> assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getVideoContentId());
-//            assetQueryWrapper.eq(Asset::getPublished, true);
-//            assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name());
-//            List<Asset> videoList = this.assetService.list(assetQueryWrapper);
-//            for (Asset asset : videoList) {
-//                asset.setExhibitionBoardName(exhibitionBoard.getName());
-//                asset.setExhibitionBoardId(exhibitionBoard.getId());
-//            }
-//
-//            assetQueryWrapper.clear();
-//            assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId());
-//            assetQueryWrapper.eq(Asset::getPublished, true);
-//            assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_DATUM.name());
-//            List<Asset> datumList = this.assetService.list(assetQueryWrapper);
-//            for (Asset asset : datumList) {
-//                asset.setExhibitionBoardName(exhibitionBoard.getName());
-//                asset.setExhibitionBoardId(exhibitionBoard.getId());
-//            }
-//            exhibitionBoard.setDatumList(datumList);
-//
-//            videoList.addAll(datumList.stream().filter(x -> FileTypeEnum.VIDEO.name().equalsIgnoreCase(x.getFileType())).collect(Collectors.toList()));
-//            exhibitionBoard.setVideoList(videoList);
-//        }
-//        return getResult(page);
-//    }
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "learningContentId", value = "学习内容ID", paramType = "query", dataType = "String")
+    })
+    @PostMapping("/exhibitionBoard/getByContentPage")
+    @RequiresAuthentication  //@RequiresPermissions("exhibition:board:page")
+    @ApiOperation(value = "根据学习内容查询展板列表", notes = "根据学习内容查询展板列表")
+    public Map<String, Object> getByContentExhibitionBoardPageList(@RequestParam(value = "learningContentId", required = false) String learningContentId) {
+       //中移要求，如果翻页参数超出数据总数，返回第一页
+        Page<ExhibitionBoard> page1 = getPage();
+        long l = page1.getCurrent() * page1.getSize()-10;
+        int size = exhibitionBoardService.getByContentList(learningContentId, true).size();
+        if (l>size){
+            page1 = new Page<>(1, 10);
+        }
+      final IPage<ExhibitionBoard> page = this.learningContentBoardService.getBoardPageByLearningContentId(page1, learningContentId, null);
+      for (ExhibitionBoard exhibitionBoard : page.getRecords()) {
+            exhibitionBoard.setLearningContentId(learningContentId);
+            if (exhibitionBoard.getVideoContentCopyrightOwnerId() != null) {
+                String name = this.copyrightOwnerService.getById(exhibitionBoard.getVideoContentCopyrightOwnerId()).getName();
+                exhibitionBoard.setBoardCopyrightOwnerName(name);
+            }
+            if (exhibitionBoard.getExhibitionBoardCatId() != null) {
+                String name = this.exhibitionBoardCatService.getById(exhibitionBoard.getExhibitionBoardCatId()).getName();
+                exhibitionBoard.setExhibitionBoardCatName(name);
+            }
+            if (exhibitionBoard.getVideoContentId() != null) {
+                final VideoContent videoContent = this.videoContentService.getById(exhibitionBoard.getVideoContentId());
+                if (videoContent != null) {
+                    exhibitionBoard.setBoardVideoContentThumbnail(videoContent.getThumbnail());
+                }
+            }
+            LambdaQueryWrapper<Asset> assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getVideoContentId());
+            assetQueryWrapper.eq(Asset::getPublished, true);
+            assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name());
+            List<Asset> videoList = this.assetService.list(assetQueryWrapper);
+            for (Asset asset : videoList) {
+                asset.setExhibitionBoardName(exhibitionBoard.getName());
+                asset.setExhibitionBoardId(exhibitionBoard.getId());
+            }
+
+            assetQueryWrapper.clear();
+            assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId());
+            assetQueryWrapper.eq(Asset::getPublished, true);
+            assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_DATUM.name());
+            List<Asset> datumList = this.assetService.list(assetQueryWrapper);
+            for (Asset asset : datumList) {
+                asset.setExhibitionBoardName(exhibitionBoard.getName());
+                asset.setExhibitionBoardId(exhibitionBoard.getId());
+            }
+            exhibitionBoard.setDatumList(datumList);
+
+            //videoList.addAll(datumList.stream().filter(x -> FileTypeEnum.VIDEO.name().equalsIgnoreCase(x.getFileType())).collect(Collectors.toList()));
+            exhibitionBoard.setVideoList(videoList);
+        }
+        return getResult(page);
+    }
 
     @ApiOperation(value = "展板详情查询", notes = "展板详情查询")
     @ApiImplicitParams({
@@ -669,10 +677,18 @@ public class ChinaMobileRestApiController extends BaseController {
 //                learningProject.setThumbnail(learningContentList.get(0).getCover());
 //                learningProject.setLearningContentNames(learningContentNames);
 //            }
+
+            //学习项目图片默认展示主学习内容图片
+            List<LearningContent> list1 = learningContentService.list(new LambdaQueryWrapper<LearningContent>().eq(LearningContent::getLearningProjectId, learningProject.getId())
+                    .eq(LearningContent::getIsMajor, true));
+            if (list1.size()>0) {
+                learningProject.setThumbnail(list1.get(0).getCover());
+            }
+
            List<ExhibitionBoard> list= exhibitionBoardService.getList(learningProject.getId(),true);
             if (!list.isEmpty()) {
                 String exhibitionBoardNames = list.stream().map(ExhibitionBoard::getName).collect(Collectors.joining("、"));
-                learningProject.setThumbnail(list.get(0).getCover());
+                //所有展板名称
                 learningProject.setExhibitionBoardNames(exhibitionBoardNames);
             }
         }
@@ -690,8 +706,11 @@ public class ChinaMobileRestApiController extends BaseController {
     @ApiOperation(value = "查询学习内容", notes = "查询学习内容")
     public Map<String, Object> getLearningContentPageList(GenericPageParam genericPageParam,
                                                           @RequestParam(value = "learningProjectId", required = false) String learningProjectId) {
+        TUser tUser = getcurUser();
         LambdaQueryWrapper<LearningContent> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(LearningContent::getPublished, true);
+        //只查询子学习项目
+        queryWrapper.eq(LearningContent::getIsMajor, false);
         // 对名称或编码模糊查询
         if (StringUtils.isNotBlank(learningProjectId)) {
             queryWrapper.eq(LearningContent::getLearningProjectId, learningProjectId);
@@ -705,6 +724,12 @@ public class ChinaMobileRestApiController extends BaseController {
             queryWrapper.ge(LearningContent::getCreateTime, genericPageParam.getStartDate().atTime(0, 0, 0))
                     .le(LearningContent::getCreateTime, genericPageParam.getEndDate().atTime(23, 59, 59));
         }
+        //学习内容适用范围筛选条件
+        queryWrapper.apply(" (applicable_scope = 'ALL_PLAT' or (applicable_scope = 'THIS_ORGAN' and organ_code = '" + tUser.getOrgCode()+
+                "') or (applicable_scope = 'THIS_ORGAN_SUB' and  organ_code like '"+ tUser.getOrgCode()+"%' ))");
+//        queryWrapper.and(wapper->wapper.eq(LearningContent::getApplicableScope,"ALL_PLAT")
+//                .or(wapper2->wapper2.eq(LearningContent::getApplicableScope,"THIS_ORGAN").eq(LearningContent::getOrganCode,tUser.getOrgCode()))
+//                .or(wapper2->wapper2.eq(LearningContent::getApplicableScope,"THIS_ORGAN_SUB").likeRight(LearningContent::getOrganCode,tUser.getOrgCode())));
         // 设置排序规则
         queryWrapper.orderByDesc(LearningContent::getSortorder);
         // 设置查询内容
@@ -756,20 +781,20 @@ 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 = "learningContentId", value = "学习内容ID", paramType = "query", dataType = "String"),
-//            @ApiImplicitParam(name = "nameOrCode", value = "名称或编码", paramType = "query", dataType = "String")
-//    })
-//    @PostMapping("/exhibitionBoard/search1")
-//    @RequiresAuthentication  //@RequiresPermissions("learning:content:board:page")
-//    @ApiOperation(value = "模糊搜索查询", notes = "模糊搜索查询")
-//    public Map<String, Object> getLearningContentBoardPageList(GenericPageParam genericPageParam,
-//                                                               @RequestParam(value = "learningContentId", required = false) String learningContentId) {
-//        IPage<ExhibitionBoard> page = this.learningContentBoardService.getBoardPageByLearningContentId(getPage(), learningContentId, genericPageParam.getNameOrCode());
-//        return getResult(page);
-//    }
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "learningContentId", value = "学习内容ID", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "nameOrCode", value = "名称或编码", paramType = "query", dataType = "String")
+    })
+    @PostMapping("/exhibitionBoard/getByContentSearch")
+    @RequiresAuthentication  //@RequiresPermissions("learning:content:board:page")
+    @ApiOperation(value = "根据学习内容模糊搜索查询", notes = "根据学习内容模糊搜索查询")
+    public Map<String, Object> getByContentSearch(GenericPageParam genericPageParam,
+                                                               @RequestParam(value = "learningContentId", required = false) String learningContentId) {
+        IPage<ExhibitionBoard> page = this.learningContentBoardService.getBoardPageByLearningContentId(getPage(), learningContentId, genericPageParam.getNameOrCode());
+        return getResult(page);
+    }
 
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),

src/main/resources/mapper/ExhibitionBoardMapper.xml

@@ -35,9 +35,18 @@
         select e.name,e.cover,lb.sortorder,e.create_time
         from exhibition_board e
         left join learning_content_board lb on lb.exhibition_board_id = e.id
-        left join learning_content lc on lb.learning_content_id = lc.id and lc.is_deleted = 0
-        left join learning_project p on lc.learning_project_id = p.id
-        where e.is_published = #{isPublished} and p.id = #{learningProjectId} and e.is_deleted = 0 and lc.is_deleted = 0 and lc.is_published = 1
+        inner join learning_content lc on lb.learning_content_id = lc.id and lc.is_deleted = 0 and lc.is_published = 1 and lc.is_major = 1
+        left join learning_project p on lc.learning_project_id = p.id and p.id = #{learningProjectId}
+        where e.is_published = #{isPublished} and e.is_deleted = 0
+        order by lb.sortorder desc,e.create_time DESC
+    </select>
+
+    <select id="getByContentList" resultMap="BaseResultMap">
+        select e.name,e.cover,lb.sortorder,e.create_time
+        from exhibition_board e
+        left join learning_content_board lb on lb.exhibition_board_id = e.id
+        inner join learning_content lc on lb.learning_content_id = lc.id and lc.id = #{learningContentId}
+        where e.is_published = #{isPublished} and e.is_deleted = 0
         order by lb.sortorder desc,e.create_time DESC
     </select>