From d76c9f4e730422cbe43496adfc57a6e3d36577ab Mon Sep 17 00:00:00 2001
From: luoyuanqiao <2376770955@qq.com>
Date: 星期二, 01 三月 2022 13:54:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into partyBuilding_lyq
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 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 eb24549..722fa99 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,9 +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.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
@@ -26,14 +33,19 @@
//构建单个用户数据
List<Object> userData = new ArrayList<>();
- String noExport = "以上信息仅用于疫苗防控";
+ String noExport = "以上信息仅用于";
//遍历答案列表
Long reserveRecordId = 0L;
Long reserveSubId = 0L;
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)
|| (StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport))) {
@@ -89,6 +101,17 @@
}
continue;
}
+ //判断当前组件类型是否签名
+ if(userAnswers.getOptionType().equals(12)){
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
+ }catch (Exception e){
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
if(userAnswers.getOptionType().equals(1)){
isOldDuo = true;
@@ -122,6 +145,18 @@
}
continue;
}
+ //判断当前组件类型是否签名
+ if(userAnswers.getOptionType().equals(12)){
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ //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("导出转换图片失败！");
+ }
+ continue;
+ }
if(userAnswers.getOptionType().equals(1)){
isOldDuo = true;
sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
--
Gitblit v1.7.1