修改-填充展板编号，新增展板视频内容信息可为空

src/main/java/cn/chnmuseum/party/common/util/AddressUtil.java

@@ -28,6 +28,12 @@ public class AddressUtil {
         if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
             ip = request.getRemoteAddr();
         }
+        // 多次反向代理后会有多个IP值，只有第一个是真实IP
+        if(null != ip && ip.length() > 15){
+            if(ip.indexOf(",") > 0){
+                ip = ip.substring(0, ip.indexOf(","));
+            }
+        }
         return ip;
     }
 

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

@@ -19,4 +19,5 @@ 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/web/controller/ChinaMobileRestApiController.java

@@ -357,20 +357,26 @@ public class ChinaMobileRestApiController extends BaseController {
             List<Map<String, String>> videoList = new ArrayList<>();
             final ExhibitionBoard exhibitionBoard = this.exhibitionBoardService.getById(boardId);
             final String videoContentId = exhibitionBoard.getVideoContentId();
-            LambdaQueryWrapper<Asset> assetLambdaQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId).eq(Asset::getPublished, true);
-            List<Asset> assetList = this.assetService.list(assetLambdaQueryWrapper);
-            List<String> languageList = assetList.stream().map(Asset::getLanguage).collect(Collectors.toList());
-            for (LanguageEnum languageEnum : LanguageEnum.values()) {
-                if (languageList.contains(languageEnum.name())) {
-                    Map<String, String> map = new LinkedHashMap<>(2);
-                    map.put("code", languageEnum.name());
-                    map.put("name", languageEnum.getName());
-                    videoList.add(map);
+            LambdaQueryWrapper<Asset> assetLambdaQueryWrapper;
+            List<Asset> assetList = new ArrayList<>();
+            List<String> languageList = new ArrayList<>();
+            if (StringUtils.isNotEmpty(videoContentId)) {
+                assetLambdaQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId).eq(Asset::getPublished, true);
+                assetList = this.assetService.list(assetLambdaQueryWrapper);
+                languageList = assetList.stream().map(Asset::getLanguage).collect(Collectors.toList());
+                for (LanguageEnum languageEnum : LanguageEnum.values()) {
+                    if (languageList.contains(languageEnum.name())) {
+                        Map<String, String> map = new LinkedHashMap<>(2);
+                        map.put("code", languageEnum.name());
+                        map.put("name", languageEnum.getName());
+                        videoList.add(map);
+                    }
                 }
+                assetLambdaQueryWrapper.clear();
             }
             langMap.put("video", videoList);
 
-            assetLambdaQueryWrapper.clear();
+
             List<Map<String, String>> audioList = new ArrayList<>();
             assetLambdaQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, boardId);
             assetLambdaQueryWrapper.eq(Asset::getPublished, true);
@@ -417,16 +423,17 @@ public class ChinaMobileRestApiController extends BaseController {
         }
         //中移要求，如果翻页参数超出数据总数，返回第一页
         Page<ExhibitionBoard> page1 = getPage();
-        long l = page1.getCurrent() * page1.getSize()-10;
+        long l = page1.getCurrent() * page1.getSize() - 10;
         int size = exhibitionBoardService.getList(learningProjectId, true).size();
-        if (l>size){
+        if (l > size) {
             page1 = new Page<>(1, 10);
         }
 
         final IPage<ExhibitionBoard> page = this.learningContentBoardService.getBoardPageByLearningProjectId(page1, learningProjectId, null);
         for (ExhibitionBoard exhibitionBoard : page.getRecords()) {
             exhibitionBoard.setLearningProjectId(learningProjectId);
-            if (exhibitionBoard.getVideoContentCopyrightOwnerId() != null) {
+            // 展板的视频内容版权方
+            if (StringUtils.isNotEmpty(exhibitionBoard.getVideoContentCopyrightOwnerId())) {
                 String name = this.copyrightOwnerService.getById(exhibitionBoard.getVideoContentCopyrightOwnerId()).getName();
                 exhibitionBoard.setBoardCopyrightOwnerName(name);
             }
@@ -434,22 +441,25 @@ public class ChinaMobileRestApiController extends BaseController {
                 String name = this.exhibitionBoardCatService.getById(exhibitionBoard.getExhibitionBoardCatId()).getName();
                 exhibitionBoard.setExhibitionBoardCatName(name);
             }
-            if (exhibitionBoard.getVideoContentId() != null) {
+            LambdaQueryWrapper<Asset> assetQueryWrapper;
+            if (StringUtils.isNotEmpty(exhibitionBoard.getVideoContentId())) {
                 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 = 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());
+                }
+                exhibitionBoard.setVideoList(videoList);
+                assetQueryWrapper.clear();
             }
 
-            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());
@@ -461,13 +471,14 @@ public class ChinaMobileRestApiController extends BaseController {
             exhibitionBoard.setDatumList(datumList);
 
 //            videoList.addAll(datumList.stream().filter(x -> FileTypeEnum.VIDEO.name().equalsIgnoreCase(x.getFileType())).collect(Collectors.toList()));
-            exhibitionBoard.setVideoList(videoList);
+            // 填充编号
+            setBoardSerial(exhibitionBoard);
+
         }
         return getResult(page);
     }
 
 
-
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
             @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
@@ -477,17 +488,17 @@ public class ChinaMobileRestApiController extends BaseController {
     @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;
+        long l = page1.getCurrent() * page1.getSize() - 10;
         int size = exhibitionBoardService.getByContentList(learningContentId, true).size();
-        if (l>size){
+        if (l > size) {
             page1 = new Page<>(1, 10);
         }
-      final IPage<ExhibitionBoard> page = this.learningContentBoardService.getBoardPageByLearningContentId(page1, learningContentId, null);
-      for (ExhibitionBoard exhibitionBoard : page.getRecords()) {
+        final IPage<ExhibitionBoard> page = this.learningContentBoardService.getBoardPageByLearningContentId(page1, learningContentId, null);
+        for (ExhibitionBoard exhibitionBoard : page.getRecords()) {
             exhibitionBoard.setLearningContentId(learningContentId);
-            if (exhibitionBoard.getVideoContentCopyrightOwnerId() != null) {
+            if (StringUtils.isNotEmpty(exhibitionBoard.getVideoContentCopyrightOwnerId())) {
                 String name = this.copyrightOwnerService.getById(exhibitionBoard.getVideoContentCopyrightOwnerId()).getName();
                 exhibitionBoard.setBoardCopyrightOwnerName(name);
             }
@@ -495,22 +506,25 @@ public class ChinaMobileRestApiController extends BaseController {
                 String name = this.exhibitionBoardCatService.getById(exhibitionBoard.getExhibitionBoardCatId()).getName();
                 exhibitionBoard.setExhibitionBoardCatName(name);
             }
-            if (exhibitionBoard.getVideoContentId() != null) {
+            LambdaQueryWrapper<Asset> assetQueryWrapper;
+            if (StringUtils.isNotEmpty(exhibitionBoard.getVideoContentId())) {
                 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 = 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());
+                }
+                exhibitionBoard.setVideoList(videoList);
+                assetQueryWrapper.clear();
             }
 
-            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());
@@ -522,7 +536,9 @@ public class ChinaMobileRestApiController extends BaseController {
             exhibitionBoard.setDatumList(datumList);
 
             //videoList.addAll(datumList.stream().filter(x -> FileTypeEnum.VIDEO.name().equalsIgnoreCase(x.getFileType())).collect(Collectors.toList()));
-            exhibitionBoard.setVideoList(videoList);
+
+            // 填充编号
+            setBoardSerial(exhibitionBoard);
         }
         return getResult(page);
     }
@@ -547,7 +563,7 @@ public class ChinaMobileRestApiController extends BaseController {
         if (boardCopyrightOwnerId != null) {
             exhibitionBoard.setBoardCopyrightOwnerName(this.copyrightOwnerService.getById(boardCopyrightOwnerId).getName());
         }
-        if (exhibitionBoard.getVideoContentCopyrightOwnerId() != null) {
+        if (StringUtils.isNotEmpty(exhibitionBoard.getVideoContentCopyrightOwnerId())) {
             String name = this.copyrightOwnerService.getById(exhibitionBoard.getVideoContentCopyrightOwnerId()).getName();
             exhibitionBoard.setVideoContentCopyrightOwnerName(name);
         }
@@ -610,6 +626,8 @@ public class ChinaMobileRestApiController extends BaseController {
             exhibitionBoard.setVideoList(videoList);
             exhibitionBoard.setVideoLanguageList(videoLanguageList);
         }
+        // 填充编号
+        setBoardSerial(exhibitionBoard);
         return getResult(exhibitionBoard);
     }
 
@@ -689,16 +707,17 @@ public class ChinaMobileRestApiController extends BaseController {
             //学习项目图片默认展示主学习内容图片
             List<LearningContent> list1 = learningContentService.list(new LambdaQueryWrapper<LearningContent>().eq(LearningContent::getLearningProjectId, learningProject.getId())
                     .eq(LearningContent::getIsMajor, true));
-            if (list1.size()>0) {
+            if (list1.size() > 0) {
                 learningProject.setThumbnail(list1.get(0).getCover());
             }
 
-           List<ExhibitionBoard> list= exhibitionBoardService.getList(learningProject.getId(),true);
+            List<ExhibitionBoard> list = exhibitionBoardService.getList(learningProject.getId(), true);
             if (!list.isEmpty()) {
                 String exhibitionBoardNames = list.stream().map(ExhibitionBoard::getName).collect(Collectors.joining("、"));
                 //所有展板名称
                 learningProject.setExhibitionBoardNames(exhibitionBoardNames);
             }
+
         }
         return getResult(page);
     }
@@ -733,8 +752,8 @@ public class ChinaMobileRestApiController extends BaseController {
                     .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.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())));
@@ -799,7 +818,7 @@ public class ChinaMobileRestApiController extends BaseController {
     @RequiresAuthentication  //@RequiresPermissions("learning:content:board:page")
     @ApiOperation(value = "根据学习内容模糊搜索查询", notes = "根据学习内容模糊搜索查询")
     public Map<String, Object> getByContentSearch(GenericPageParam genericPageParam,
-                                                               @RequestParam(value = "learningContentId", required = false) String learningContentId) {
+                                                  @RequestParam(value = "learningContentId", required = false) String learningContentId) {
         IPage<ExhibitionBoard> page = this.learningContentBoardService.getBoardPageByLearningContentId(getPage(), learningContentId, genericPageParam.getNameOrCode());
         return getResult(page);
     }
@@ -894,4 +913,16 @@ public class ChinaMobileRestApiController extends BaseController {
         map.put("runImgUrl", currentRun != null ? currentRun.getAppRunPic() : "未设置运行图片");
         return getResult(map);
     }
+
+    /**
+     * 填充编号
+     */
+    public void setBoardSerial(ExhibitionBoard board) {
+        String serialNo = board.getSerialNo();
+        int length = serialNo.length();
+        for (int i = 0; i < 3 - length; i++) {
+            board.setSerialNo("0" + serialNo);
+            serialNo = board.getSerialNo();
+        }
+    }
 }

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

@@ -68,8 +68,6 @@ public class ExhibitionBoardController extends BaseController {
     private LearningContentBoardService learningContentBoardService;
     @Resource
     private LearningContentService learningContentService;
-    @Resource
-    private LearningProjectService learningProjectService;
 
     @PostMapping("/save")
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:save")
@@ -422,6 +420,10 @@ public class ExhibitionBoardController extends BaseController {
                     exhibitionBoard.setVideoContentCopyrightOwnerName(copyrightOwner.getName());
                 }
             }
+            if (StringUtils.isEmpty(exhibitionBoard.getVideoContentCopyrightOwnerId())) {
+                exhibitionBoard.setVideoContentCopyrightOwnerName("无");
+                exhibitionBoard.setVideoContentName("无");
+            }
             if (exhibitionBoard.getExhibitionBoardCatId() != null) {
                 final ExhibitionBoardCat exhibitionBoardCat = this.exhibitionBoardCatService.getById(exhibitionBoard.getExhibitionBoardCatId());
                 if (exhibitionBoardCat == null) {
@@ -462,7 +464,7 @@ public class ExhibitionBoardController extends BaseController {
         if (boardCopyrightOwnerId != null) {
             exhibitionBoard.setBoardCopyrightOwnerName(this.copyrightOwnerService.getById(boardCopyrightOwnerId).getName());
         }
-        if (exhibitionBoard.getVideoContentCopyrightOwnerId() != null) {
+        if (StringUtils.isNotEmpty(exhibitionBoard.getVideoContentCopyrightOwnerId())) {
             String name = this.copyrightOwnerService.getById(exhibitionBoard.getVideoContentCopyrightOwnerId()).getName();
             exhibitionBoard.setVideoContentCopyrightOwnerName(name);
         }
@@ -485,7 +487,7 @@ public class ExhibitionBoardController extends BaseController {
         exhibitionBoard.setAuditHistoryList(auditList);
 
         final String videoContentId = exhibitionBoard.getVideoContentId();
-        if (videoContentId != null) {
+        if (StringUtils.isNotEmpty(videoContentId)) {
             final VideoContent videoContent = this.videoContentService.getById(videoContentId);
             exhibitionBoard.setVideoContentName(videoContent.getName());