|
|
@@ -1315,6 +1315,7 @@ public class CollectApi {
|
|
|
|
|
|
String outFile = expSj.toString() + File.separator + outFileName + suffix;
|
|
|
File expFile = null;
|
|
|
+ float outputQuality = Objects.equals("1", imageType) ? 0.98f : Objects.equals("2", imageType) ? 0.99f : 1f;
|
|
|
if (imageServerConfig.isAliyunOss()) {
|
|
|
StringJoiner ossSavePath = new StringJoiner("/").add(imageServerConfig.getDir()).add(dir.replace("\\", "/")).add(String.valueOf(workId)).add(subject).add(areaCode);
|
|
|
String saveFileName = fileName + suffix;
|
|
|
@@ -1335,7 +1336,7 @@ public class CollectApi {
|
|
|
long s3 = System.currentTimeMillis();
|
|
|
LOGGER.info("【{}，{}】加水印开始，总耗时：{}秒", examNumber, studentName, (s3 - s2) / 1000);
|
|
|
BufferedImage watermarkImage = createWaterImage(score.intValue() + "分");
|
|
|
- Thumbnails.of(sheetFileTemp).scale(1f).outputQuality(0.98f).watermark(Positions.BOTTOM_CENTER, watermarkImage, 0.8f).toFile(expFile);
|
|
|
+ Thumbnails.of(sheetFileTemp).scale(1f).outputQuality(outputQuality).watermark(Positions.BOTTOM_CENTER, watermarkImage, 0.8f).toFile(expFile);
|
|
|
long s4 = System.currentTimeMillis();
|
|
|
LOGGER.info("【{}，{}】加水印结束，总耗时：{}秒", examNumber, studentName, (s4 - s3) / 1000);
|
|
|
sheetFileTemp.delete();
|
|
|
@@ -1360,7 +1361,7 @@ public class CollectApi {
|
|
|
if (Objects.equals("1", isWatermark)) {
|
|
|
//生成分数水印图片
|
|
|
BufferedImage watermarkImage = createWaterImage(score.intValue() + "分");
|
|
|
- Thumbnails.of(file).scale(1f).outputQuality(0.98f).watermark(Positions.BOTTOM_CENTER, watermarkImage, 1f).toFile(expFile);
|
|
|
+ Thumbnails.of(file).scale(1f).outputQuality(outputQuality).watermark(Positions.BOTTOM_CENTER, watermarkImage, 1f).toFile(expFile);
|
|
|
}
|
|
|
}
|
|
|
//返回
|
xiaof