Merge remote-tracking branch 'origin/meiteng' into meiteng

# Conflicts:
#	src/main/java/org/rcisoft/core/util/FileReadableUtil.java

src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java

@@ -39,6 +39,7 @@ import org.rcisoft.core.result.ResultServiceEnums;
 import org.rcisoft.core.util.*;
 import org.rcisoft.sys.user.bean.CurUser;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -90,6 +91,14 @@ public class BChapterServiceImpl implements BChapterService {
     @Autowired
     BLessonServiceImpl bLessonServiceImpl;
 
+
+    @Value("${upload.fileMaxSize:100}")
+    private  Long fileMaxSize;
+
+    @Value("${upload.fileMaxPages:100}")
+    private  Integer fileMaxPages;
+
+
     @Override
     public BChapter selectOne(String businessId) {
         BChapter result = bChapterRepository.selectByPrimaryKey(businessId);
@@ -636,7 +645,7 @@ public class BChapterServiceImpl implements BChapterService {
             LogUtil.fileChangeLog("------------------下载-------------------------" + fileOld);
             String downLoadName = downLoadFile(bFile, file, filePath);
             LogUtil.fileChangeLog("------------------判断可读-------------------------" + fileOld);
-            FileReadableUtil.fileReadable(filePath + File.separator + downLoadName);
+            FileReadableUtil.fileReadable(filePath + File.separator + downLoadName,fileMaxSize,fileMaxPages);
         }
         return flag;
     }
@@ -686,7 +695,7 @@ public class BChapterServiceImpl implements BChapterService {
                 return returnBasePath + File.separator + name;
             } else {
                 String downLoadName = downLoadFile(bFile, file, filePath);
-                FileReadableUtil.fileReadable(filePath + File.separator + downLoadName);
+                FileReadableUtil.fileReadable(filePath + File.separator + downLoadName,fileMaxSize,fileMaxPages);
                 LogUtil.fileChangeLog("------------------返回下载后路径-----------------------------" + downLoadName);
                 return returnBasePath + File.separator + downLoadName;
             }
@@ -705,7 +714,7 @@ public class BChapterServiceImpl implements BChapterService {
 
                 //判断文件是否可读
                 LogUtil.fileChangeLog("------------------判断文件是否可读-----------------------------" + filePath + File.separator + name);
-                FileReadableUtil.fileReadable(filePath + File.separator + downLoadFileName);
+                FileReadableUtil.fileReadable(filePath + File.separator + downLoadFileName,fileMaxSize,fileMaxPages);
                 LogUtil.fileChangeLog("-----------------------------------------------downLoadFileUrl：" + filePath + File.separator + downLoadFileName);
                 LogUtil.fileChangeLog("-----------------------------------------------filePath：" + filePath + File.separator + newName);
                 int result = officeToPdf.transformToPdf(filePath + File.separator + downLoadFileName, filePath + File.separator + newName);

src/main/java/org/rcisoft/business/blesson/entity/BLesson.java

@@ -257,6 +257,10 @@ public class BLesson extends IdEntity<BLesson> {
     @Transient
     private String lecturerDeptName;
 
+    @ApiModelProperty(value = "讲师头像")
+    @Transient
+    private String lecturerPic;
+
     @ApiModelProperty(value = "登录人是否为讲师0 不是 1 是")
     @Transient
     private String userIsLecturer;

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

@@ -1313,6 +1313,7 @@ public class BLessonServiceImpl implements BLessonService {
                 if (mtUserInfoRspDTO.getDepts() != null && mtUserInfoRspDTO.getDepts().size() > 0 && mtUserInfoRspDTO.getId().equals(bLesson.getLecturerId())) {
                     //设置部门名
                     bLesson.setLecturerDeptName(mtUserInfoRspDTO.getDepts().get(0).getName());
+                    bLesson.setLecturerPic(mtUserInfoRspDTO.getAvatar());
                 }
             });
         }

src/main/java/org/rcisoft/core/result/ResultServiceEnums.java

@@ -253,6 +253,8 @@ public enum ResultServiceEnums {
     TRAIN_SIGNED(153,"您已签到，请勿重复签到"),
     FILE_UNREADABLE(154,"该文件无法识别，可能已加密或损坏，请修正当前文件或上传其他文件"),
     DUP_FILE(155,"文件重复"),
+    FILE_OVER_SIZE(156,"文件超过规定大小"),
+    FILE_OVER_PAGES(157,"文件页数超过规定个数"),
     ;
 
     private Integer code;

src/main/java/org/rcisoft/core/util/FileReadableUtil.java

@@ -2,67 +2,77 @@ package org.rcisoft.core.util;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
-import org.apache.pdfbox.io.RandomAccessBuffer;
-import org.apache.pdfbox.pdfparser.PDFParser;
+import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.poi.POIXMLDocument;
 import org.apache.poi.hslf.usermodel.HSLFSlideShow;
 import org.apache.poi.hwpf.extractor.WordExtractor;
 import org.apache.poi.openxml4j.opc.OPCPackage;
+import org.apache.poi.xslf.usermodel.XMLSlideShow;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.result.ResultServiceEnums;
 
+
 import java.io.*;
 
 @Slf4j
 public class FileReadableUtil {
+
     public static void main(String[] args)  {
-         String filePath = "F:\\桌面整理\\文件归纳\\测试资料\\05.pdf";
-        fileReadable(filePath);
+         String filePath = "C:\\Users\\三\\Desktop\\素材\\加密-pdf.pdf";
+        fileReadable(filePath,(long)100,100);
     }
 
-    public static void fileReadable(String path) {
+    public static void fileReadable(String path,Long fileMaxSize,Integer fileMaxPages) {
         LogUtil.fileChangeLog("-----------FileReadableUtil-路径------------"+path);
         File file = new File(path);
         InputStream is = null;
         HSLFSlideShow slideShow = null;
-        WordExtractor ex = null;
-        RandomAccessBuffer randomAccessBuffer = null;
+//        RandomAccessBuffer randomAccessBuffer = null;
+        PDDocument doc = null;
         OPCPackage opcPackage = null;
+        Long size = file.length();
+        if (size > (long)(1024 * 1024 * fileMaxSize)){
+            throw new ServiceException(ResultServiceEnums.FILE_OVER_SIZE);
+        }
+
+        int pages = -1;
+
         try {
             if (path.endsWith(".doc")) {
                 is = new FileInputStream(new File(path));
-                ex = new WordExtractor(is);
+                WordExtractor ex = new WordExtractor(is);
+                pages = ex.getSummaryInformation().getPageCount();//总页数
             }else if (path.endsWith("ppt")) {
                 is =new FileInputStream(file);
                 slideShow = new HSLFSlideShow(is);
+                pages = slideShow.getSlides().size();
             } else if (path.endsWith("pdf")) {
-                is = new FileInputStream(file);
-                randomAccessBuffer = new RandomAccessBuffer(is);
-                PDFParser parser = new PDFParser(randomAccessBuffer);
-                parser.parse();
-            }else if (path.endsWith("docx") || path.endsWith("pptx")) {
+                doc = PDDocument.load(file);
+                pages = doc.getDocumentCatalog().getPages().getCount();
+            }else if (path.endsWith("docx")) {
+                opcPackage = POIXMLDocument.openPackage(path);
+                XWPFDocument docx = new XWPFDocument(opcPackage);
+                pages = docx.getProperties().getExtendedProperties().getUnderlyingProperties().getPages();
+            }else if (path.endsWith("pptx")){
                 opcPackage = POIXMLDocument.openPackage(path);
+                XMLSlideShow pptxfile = new XMLSlideShow(opcPackage);
+                pages = pptxfile.getSlides().size();
             }
 
         } catch (Exception e) {
             log.error("文件不可读---"+e);
             throw new ServiceException(ResultServiceEnums.FILE_UNREADABLE);
         }finally {
-            }
-            try{
-                if(ex != null){
-                    ex.close();
-                }
-            }catch(Exception e){
-                log.error("关闭 WordExtractor 输出流错误！", e);
-            }
+
             try{
-                if(randomAccessBuffer != null){
-                    randomAccessBuffer.close();
+                if(doc != null){
+                    doc.close();
                 }
             }catch(Exception e){
-                log.error("关闭 RandomAccessBuffer 输出流错误！", e);
+                log.error("关闭 PDDocument 输出流错误！", e);
             }
+
             try{
                 if(opcPackage != null){
                     opcPackage.close();
@@ -84,6 +94,10 @@ public class FileReadableUtil {
             }catch(Exception e){
                 log.error("关闭 InputStream 输出流错误！", e);
             }
+        }
+        if (pages != -1 && pages > fileMaxPages)  {
+            throw new ServiceException(ResultServiceEnums.FILE_OVER_PAGES);
+        }
 
 
         if (!CheckFileHeaderUtil.toCheck(path)){

src/main/resources/application-mt.yml

@@ -130,3 +130,8 @@ notice:
 appId:
   globalAppId: 1
   noticeAppId: 9
+  
+upload:
+  fileMaxSize: 100
+  fileMaxPages: 100
+