From 31b8c6fc8c13f6a6e04362801eec0fce85af7366 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 11 十一月 2021 08:54:04 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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..0f9c8fb 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;
@@ -95,7 +100,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 +144,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