Merge remote-tracking branch 'origin/dev0918_nikang' into chuanyin-v2.0.2

Conflicts:
	stmms-ms-collect/src/main/java/cn/com/qmth/stmms/ms/collect/api/CollectApi.java

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/service/DataUploadService.java

@@ -216,6 +216,7 @@ public class DataUploadService {
             paper = new Paper(student.getWorkId(), null, subject, examQuestion, student, isManual);
         }
         paper.setUploadedOn(new Date());
+        paper.setManual(isManual);
         paperRepo.save(paper);
         synchronized (this) {
             String uploadStatus = student.getUploadStatus();

stmms-ms-collect/src/main/java/cn/com/qmth/stmms/ms/collect/api/CollectApi.java

@@ -165,6 +165,10 @@ public class CollectApi {
 
         paper.setSliceMD5(sliceMD5);
     	paperRepo.save(paper);
+
+//        ImageCompression.imageThumbnail(outFile,new File(thumbFileName),compressionConfig);
+
+
     }
 
 	private File saveImage(Student student, InputStream inputStream,

stmms-ms-commons/src/main/java/cn/com/qmth/stmms/ms/commons/utils/image/ImageCompression.java

@@ -32,7 +32,7 @@ public class ImageCompression {
         int sizeHeight = config.getMinHeight();
 
         if (config.getPercent() != null && config.getPercent() > 0 && config.getPercent() <= 100) {
-            float percent = config.getPercent() / 100;
+            float percent = (float)config.getPercent() / 100;
             sizeWidth = (int) (sizeWidth * percent);
             sizeHeight = (int) (sizeHeight * percent);
             if (sizeWidth < config.getMinWith()) {
@@ -53,6 +53,7 @@ public class ImageCompression {
         }
         return Thumbnails.of(image)
                 .size(width, height)
+                .outputQuality(1f)
                 .outputFormat("jpg")
                 .asBufferedImage();
     }
@@ -61,4 +62,23 @@ public class ImageCompression {
         BufferedImage image = ImageIO.read(in);
         Thumbnails.of(image).scale(1f).rotate(degree).toFile(out);
     }
+
+    public static void imageThumbnail(File in,File out,ImageCompressionConfig config) throws IOException{
+        if(config == null){
+            Thumbnails.of(in).scale(1f).outputQuality(1f).outputFormat("jpg").toFile(out);
+            return;
+        }
+        BufferedImage image = ImageIO.read(in);
+        int originWidth = image.getWidth();
+        int originHeight = image.getHeight();
+        int sizeWidth = config.getMinWith();
+        int sizeHeight = config.getMinHeight();
+        int width = sizeWidth;
+        int height = sizeHeight;
+        if (originWidth < originHeight) {
+            width = sizeHeight;
+            height = sizeWidth;
+        }
+        Thumbnails.of(in).size(width,height).outputQuality(1f).outputFormat("jpg").toFile(out);
+    }
 }