From 18ba7a506d4beb7a276275f75032c6c930780b75 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期六, 19 二月 2022 13:58:38 +0800
Subject: [PATCH] 预约登记修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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 be5a937..8cb6806 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
@@ -47,7 +47,7 @@
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;
}
@@ -99,8 +99,13 @@
userData.add(new URL(userAnswers.getAnswerContent()));
}
else {
- userData.add(new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg"));
- log.info(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
+ URL url=new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
+ if(url.getContent()!=null){
+ userData.add(url);
+ }
+ else {
+ userData.add(userAnswers.getAnswerContent());
+ }
}
//userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
}
@@ -109,6 +114,7 @@
}
}catch (Exception e){
userData.add(" ");
+ e.printStackTrace();
log.error("导出转换图片失败！");
}
continue;
@@ -153,10 +159,16 @@
if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
if(userAnswers.getAnswerContent().contains("_compress")){
userData.add(new URL(userAnswers.getAnswerContent()));
- log.info(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
}
else {
- userData.add(new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg"));
+ URL url=new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
+ if(url.getContent()!=null){
+ userData.add(url);
+ }
+ else {
+ userData.add(userAnswers.getAnswerContent());
+ }
+
}
//userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
}
--
Gitblit v1.7.1