From 2bc2f7c95c837864bdd249aa4f00dcc7ed123f0b Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 15 二月 2022 10:51:44 +0800
Subject: [PATCH] 图片压缩功能提交
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java
index 1db88f6..92853d5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java
@@ -3,11 +3,16 @@
import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
import lombok.extern.slf4j.Slf4j;
+import javax.imageio.ImageIO;
import javax.xml.bind.DatatypeConverter;
-import java.io.ByteArrayInputStream;
+import java.awt.image.BufferedImage;
+import java.io.*;
import java.net.URL;
+import java.nio.file.Files;
import java.util.ArrayList;
+import java.util.Base64;
import java.util.List;
+import java.util.UUID;
/**
* @author lyq
@@ -28,7 +33,7 @@
//构建单个用户数据
List<Object> userData = new ArrayList<>();
- String noExport = "以上信息仅用于疫苗防控";
+ String noExport = "以上信息仅用于";
//遍历答案列表
Long reserveRecordId = 0L;
Long reserveSubId = 0L;
@@ -37,7 +42,7 @@
if (answerContentVOList != null && answerContentVOList.size() > 0) {
for (ComActQuestnaireAnswerContentVO userAnswers : answerContentVOList) {
//判断是文字描述直接跳过
- if (userAnswers.getOptionType().equals(5) || userAnswers.getOptionType().equals(11)
+ if (userAnswers.getOptionType().equals(5)
|| (StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport))) {
continue;
}
@@ -84,7 +89,13 @@
if(userAnswers.getOptionType().equals(11)){
reserveSubId = userAnswers.getReserveSubId();
try {
- userData.add(new URL(userAnswers.getAnswerContent()));
+ if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
+ userData.add(new URL(userAnswers.getAnswerContent()));
+ //userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
+ }
+ else {
+ userData.add(" ");
+ }
}catch (Exception e){
userData.add(" ");
log.error("导出转换图片失败！");
@@ -95,7 +106,7 @@
if(userAnswers.getOptionType().equals(12)){
reserveSubId = userAnswers.getReserveSubId();
try {
- userData.add(new ByteArrayInputStream(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("，")+ 1))));
+ userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
}catch (Exception e){
userData.add(" ");
log.error("导出转换图片失败！");
@@ -139,7 +150,8 @@
if(userAnswers.getOptionType().equals(12)){
reserveSubId = userAnswers.getReserveSubId();
try {
- userData.add(new ByteArrayInputStream(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("，")+ 1))));
+ //userData.add(new URL("http://image.panzhihua.nhys.cdnhxx.com//idcard/967dbdef3ef3465a9169fbea204f9aa7.jpg"));
+ userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
}catch (Exception e){
userData.add(" ");
log.error("导出转换图片失败！");
--
Gitblit v1.7.1