From 5a278a0965b417e7f39e8c209e2ff401f415066a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 21 二月 2022 14:07:48 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 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 23f59d4..023efe0 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
@@ -2,7 +2,6 @@
import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
import javax.imageio.ImageIO;
import javax.xml.bind.DatatypeConverter;
@@ -41,9 +40,14 @@
Boolean isOldDuo = false;
StringBuffer sb = new StringBuffer();
if (answerContentVOList != null && answerContentVOList.size() > 0) {
+ int a=0;
for (ComActQuestnaireAnswerContentVO userAnswers : answerContentVOList) {
+ a++;
+ if(answerContentVOList.size()==26&&a==9){
+ userData.add(" ");
+ }
//判断是文字描述直接跳过
- if (userAnswers.getOptionType().equals(5) || userAnswers.getOptionType().equals(11)
+ if (userAnswers.getOptionType().equals(5)
|| (StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport))) {
continue;
}
@@ -90,7 +94,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("导出转换图片失败！");
@@ -179,19 +189,5 @@
resultList.add(userData);
}
return resultList;
- }
-
- public static File createTmpFile(InputStream inputStream, String name, String ext, File tmpDirFile) throws IOException {
- File resultFile = File.createTempFile(name, '.' + ext, tmpDirFile);
- resultFile.deleteOnExit();
- FileUtils.copyToFile(inputStream, resultFile);
- return resultFile;
- }
-
- public static File bytesToFile(byte[] bytes, String fileType) throws IOException {
- return createTmpFile(new ByteArrayInputStream(bytes),
- UUID.randomUUID().toString(),
- fileType,
- Files.createTempDirectory("tempFile").toFile());
}
}
--
Gitblit v1.7.1