bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/common/vo/DatumVo.java

+package cn.wisenergy.chnmuseum.party.common.vo;
+
+import lombok.*;
+import lombok.experimental.Accessors;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DatumVo {
+
+    private String fileName;
+
+    private String fileExtName;
+
+    private String fileType;
+
+    private Long fileSize;
+
+    private String fileUrl;
+
+    private String updateTime;
+
+    private String md5;
+
+}

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

@@ -140,4 +140,8 @@ public class ExhibitionBoard implements Serializable {
     @TableField(exist = false)
     private List<String> materialUrlList;
 
+    @ApiModelProperty("所属学习内容ID")
+    @TableField(exist = false)
+    private String learningContentId;
+
 }

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

@@ -7,6 +7,7 @@ import cn.wisenergy.chnmuseum.party.common.mvc.InterfaceException;
 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.DatumVo;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
 import cn.wisenergy.chnmuseum.party.common.vo.VideoVo;
 import cn.wisenergy.chnmuseum.party.model.*;
@@ -132,7 +133,9 @@ public class ChinaMobileRestApiController extends BaseController {
                 final String organId = tBoxOperation.getOrganId();
                 final TUser tUser = getcurUser();
                 if (tUser != null && organId.equals(tUser.getOrgId())) {
-                    return getResult(tBoxOperation.getPrivateKey());
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("key", tBoxOperation.getPrivateKey());
+                    return getResult(jsonObject);
                 } else {
                     throw new InterfaceException("400", "您无权获取本单位机顶盒密钥");
                 }
@@ -367,7 +370,7 @@ public class ChinaMobileRestApiController extends BaseController {
     @PostMapping("/exhibitionBoard/getPage")
     @RequiresPermissions("exhibition:board:page")
     @ApiOperation(value = "展板列表查询", notes = "展板列表查询")
-    public Map<String, Object> getExhibitionBoardPageList(@RequestParam(value = "learningContentId", required = false) String learningContentId) {
+    public Map<String, Object> getExhibitionBoardPageList(@RequestParam(value = "learningContentId") String learningContentId) {
         final IPage<ExhibitionBoard> page = this.learningContentBoardService.getBoardPageByLearningContentId(getPage(), learningContentId, null);
         for (ExhibitionBoard exhibitionBoard : page.getRecords()) {
             if (exhibitionBoard.getAssetCopyrightOwnerId() != null) {
@@ -381,9 +384,10 @@ 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()));
+            exhibitionBoard.setVideoUrl(videoUrl);
+            exhibitionBoard.setLearningContentId(learningContentId);
         }
         return getResult(page);
     }
@@ -452,16 +456,19 @@ 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 = "nameOrCode", value = "名称或编码", paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "startDate", value = "创建时间-开始", paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "endDate", value = "创建时间-结束", paramType = "query", dataType = "String")
+            @ApiImplicitParam(name = "learningProjectId", value = "学习项目ID", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "nameOrCode", value = "名称或编码", paramType = "query", dataType = "String")
     })
     @PostMapping("/learningContent/getPage")
     @RequiresPermissions("learning:content:page")
     @ApiOperation(value = "查询学习内容", notes = "查询学习内容")
-    public Map<String, Object> getLearningContentPageList(GenericPageParam genericPageParam) {
+    public Map<String, Object> getLearningContentPageList(GenericPageParam genericPageParam, @RequestParam(value = "learningProjectId", required = false) String learningProjectId) {
         LambdaQueryWrapper<LearningContent> queryWrapper = new LambdaQueryWrapper<>();
         // 对名称或编码模糊查询
+        if (StringUtils.isNotBlank(learningProjectId)) {
+            queryWrapper.eq(LearningContent::getLearningProjectId, learningProjectId);
+        }
+        // 对名称或编码模糊查询
         if (StringUtils.isNotBlank(genericPageParam.getNameOrCode())) {
             queryWrapper.like(LearningContent::getName, genericPageParam.getNameOrCode());
         }
@@ -532,19 +539,17 @@ 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 = "boardId", value = "名称或编码", paramType = "query", dataType = "String")
+            @ApiImplicitParam(name = "boardId", value = "展板内容ID", paramType = "path", dataType = "String", required = true)
     })
-    @PostMapping("/exhibitionBoard/getRefMaterial")
+    @GetMapping("/exhibitionBoard/getRefMaterial/{boardId}")
     @RequiresPermissions("learning:project:page")
     @ApiOperation(value = "展板参考资料查询", notes = "展板参考资料查询")
-    public Map<String, Object> getBoardRefMaterial(@RequestParam(value = "boardId", required = false) String boardId) {
+    public Map<String, Object> getBoardRefMaterial(@PathVariable(value = "boardId") 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);
+        final List<DatumVo> datumVoList = JSONObject.parseObject(refMaterialUrl, new TypeReference<List<DatumVo>>() {}, Feature.OrderedField);
+        return getResult(datumVoList);
     }
 
     @ApiImplicitParams(value = {

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

@@ -16,7 +16,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -43,9 +42,9 @@ import java.util.Objects;
 public class FileUploadController {
 
     private static final String[] IMAGE_TYPE = new String[]{"JPG", "JPEG", "PNG", "BMP", "WBMP"};
-    private static final String[] AUDIO_TYPE = new String[]{"MP3", "AAC", "WMA", "WAV", "FLAC", "RM", "OGG"};
+    private static final String[] AUDIO_TYPE = new String[]{"MP3", "AAC", "WMA", "FLAC", "RM", "OGG"};
     private static final String[] VIDEO_TYPE = new String[]{"MP4", "FLV"};
-    private static final String[] DOC_TYPE = new String[]{"PDF", "DOC", "DOCX", "XLS", "XLSX", "PPT", "PPTX"};
+    private static final String[] DOC_TYPE = new String[]{"PDF", "DOC", "DOCX", "PPT", "PPTX", "XLS", "XLSX"};
     private static final String[] DATUM_TYPE = ArrayUtil.addAll(DOC_TYPE, IMAGE_TYPE, VIDEO_TYPE);
 
 //    @RequestMapping(value = "/upload", method = RequestMethod.POST)
@@ -111,7 +110,7 @@ public class FileUploadController {
         int failureCount = 0;
         List<BatchUploadResVO.HandleResult> handleList = new ArrayList<>();
 
-        List<String> videoUrlList = new ArrayList<>();
+        List<String> datumUrlList = new ArrayList<>();
         for (MultipartFile file : files) {
             // 当前维度表下线结果
             BatchUploadResVO.HandleResult handleResult = new BatchUploadResVO.HandleResult();
@@ -132,10 +131,16 @@ public class FileUploadController {
             handleResult.setHandleResult(HANDLE_STATUS_ENUM.SUCCESS.getName());
             boolean anyMatch = Arrays.stream(DATUM_TYPE).anyMatch(s -> Objects.equals(s, FilenameUtils.getExtension(originalFilename).toUpperCase()));
             if (anyMatch) {
-                String url = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename);
+                String url;
+                boolean anyVideoMatch = Arrays.stream(VIDEO_TYPE).anyMatch(s -> Objects.equals(s, FilenameUtils.getExtension(originalFilename).toUpperCase()));
+                if (anyVideoMatch) {
+                    url = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename);
+                } else {
+                    url = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename);
+                }
                 handleResult.setFileUrl(url);
                 handleResult.setDescription("操作成功");
-                videoUrlList.add(url);
+                datumUrlList.add(url);
                 successCount++;
             } else {
                 handleResult.setFileUrl("");
@@ -151,7 +156,7 @@ public class FileUploadController {
         batchUploadResVO.setSuccessCount(successCount);
         batchUploadResVO.setTotal(files.length);
         batchUploadResVO.setHandleList(handleList);
-        batchUploadResVO.setUrlList(videoUrlList);
+        batchUploadResVO.setUrlList(datumUrlList);
         return ResponseEntity.ok(batchUploadResVO);
     }
 

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

@@ -112,7 +112,7 @@ public class LearningContentController extends BaseController {
             QueryWrapper<LearningContentBoard> learningContentBoardQueryWrapper = new QueryWrapper<>();
             queryWrapper.select("max(sortorder) as sortorder");
             LearningContentBoard one = this.learningContentBoardService.getOne(learningContentBoardQueryWrapper);
-            if (one != null) {
+            if (one != null && one.getSortorder() != null) {
                 learningContentBoard.setSortorder(one.getSortorder() + 1);
             } else {
                 learningContentBoard.setSortorder(1);

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/base/BaseController.java

@@ -9,7 +9,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SimplePropertyPreFilter;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.catalina.User;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,7 +16,7 @@ import org.slf4j.LoggerFactory;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.Serializable;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -63,7 +62,7 @@ public class BaseController implements Serializable {
      * @return map
      */
     protected Map<String, Object> getResult(Object obj) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), RESPONSE_CODE_ENUM.REQUEST_SUCCESS.getResultCode());
         map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), RESPONSE_CODE_ENUM.REQUEST_SUCCESS.getMessage());
         map.put(RESULT_INFO_ENUM.RESULT_BODY.getKey(), obj);
@@ -76,7 +75,7 @@ public class BaseController implements Serializable {
      * @return map
      */
     protected Map<String, Object> getSuccessResult() {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), RESPONSE_CODE_ENUM.REQUEST_SUCCESS.getResultCode());
         map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), RESPONSE_CODE_ENUM.REQUEST_SUCCESS.getMessage());
         map.put(RESULT_INFO_ENUM.RESULT_BODY.getKey(),"");
@@ -91,7 +90,7 @@ public class BaseController implements Serializable {
      * @return map
      */
     protected Map<String, Object> getFailResult(String code, String msg) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), code);
         map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), msg);
         return map;
@@ -104,7 +103,7 @@ public class BaseController implements Serializable {
      * @return map
      */
     protected Map<String, Object> getFailResult(RESPONSE_CODE_ENUM responseCodeEnum) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), responseCodeEnum.getResultCode());
         map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), responseCodeEnum.getMessage());
         return map;
@@ -116,7 +115,7 @@ public class BaseController implements Serializable {
      * @return map
      */
     protected Map<String, Object> getFailResult() {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode());
         map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), RESPONSE_CODE_ENUM.SERVER_ERROR.getMessage());
         return map;
@@ -128,7 +127,7 @@ public class BaseController implements Serializable {
      * @return map
      */
     protected Map<String, Object> getFailResult(String msg) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new LinkedHashMap<>();
         map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode());
         map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), msg);
         return map;