bug fixed

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

@@ -34,7 +34,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
     @Select("SELECT t.* FROM " +
             "(" +
 
-            "SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name FROM learning_content_board lcb, learning_content lc, exhibition_board eb, video_content vc, asset a "
+            "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 "
@@ -42,7 +42,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
             + "and lc.applicable_scope = 'THIS_ORGAN' "
             + "and lc.organ_code = #{organCode} "
             + "UNION ALL "
-            + "SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+            + "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 "
@@ -52,7 +52,9 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
             + "and lc.organ_code = #{organCode} "
 
             + "UNION "
-            + "SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name FROM learning_content_board lcb, learning_content lc, exhibition_board eb, video_content vc, asset a "
+
+            + "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 "
@@ -60,7 +62,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
             + "and lc.applicable_scope = 'THIS_ORGAN_SUB'"
             + "and lc.organ_code like CONCAT(#{organCode},'%') "
             + "UNION ALL "
-            + "SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+            + "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 "
@@ -70,14 +72,16 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
             + "and lc.organ_code = #{organCode} "
 
             + "UNION "
-            + "SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name FROM learning_content_board lcb, learning_content lc, exhibition_board eb, video_content vc, asset a "
+
+            + "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.applicable_scope = 'ALL_PLAT'"
             + "UNION ALL "
-            + "SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+            + "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 "

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

@@ -93,4 +93,8 @@ public class Asset implements Serializable {
     @TableField(exist = false)
     private String exhibitionBoardName;
 
+    @ApiModelProperty("展板图片")
+    @TableField(exist = false)
+    private String exhibitionBoardCover;
+
 }

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

@@ -370,7 +370,7 @@ public class ChinaMobileRestApiController extends BaseController {
         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")

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

@@ -46,7 +46,7 @@ public class FileUploadController extends BaseController {
     private static final String[] IMAGE_TYPE = new String[]{"JPG", "JPEG", "PNG", "BMP", "WBMP"};
     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", "TXT", "DOC", "DOCX", "PPT", "PPTX", "XLS", "XLSX"};
+    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);
 
     @Resource
@@ -151,7 +151,7 @@ public class FileUploadController extends BaseController {
                     language = LanguageEnum.UYG.name();
                 }
                 final FileInfo fileInfo = FastDFSUtils.getFileInfo(fileUrl);
-                final LocalDateTime createTime = TimeUtils.getDateTimeOfTimestamp(fileInfo.getCreateTime());
+                final LocalDateTime createTime = TimeUtils.getDateTimeOfTimestamp(fileInfo.getCreateTime() * 1000);
                 asset.setFileSize(fileInfo.getFileSize());
                 asset.setFileUrl(fileUrl);
                 asset.setFileCat(FileCatEnum.EXHIBITION_BOARD_DATUM.name());
@@ -295,7 +295,7 @@ public class FileUploadController extends BaseController {
                 }
                 String fileUrl = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename, metaDataSet);
                 final FileInfo fileInfo = FastDFSUtils.getFileInfo(fileUrl);
-                final LocalDateTime createTime = TimeUtils.getDateTimeOfTimestamp(fileInfo.getCreateTime());
+                final LocalDateTime createTime = TimeUtils.getDateTimeOfTimestamp(fileInfo.getCreateTime() * 1000);
                 final long fileSize = fileInfo.getFileSize();
                 final Asset asset = Asset.builder()
                         .fileName(originalFilename)