From f2032d8331cd8939bb8dd4ef372033a2dcdbc850 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Thu, 17 Feb 2022 16:10:55 +0800
Subject: [PATCH] +添加法人变更，以及跨区域备案字段更改
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
index c7ea9d5..d786a15 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -21,6 +21,7 @@
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.common.config.FileConfig;
import org.springblade.common.config.FtpConfig;
import org.springblade.common.utils.FileUtil;
@@ -54,6 +55,7 @@
import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.regex.Pattern;
import static org.springblade.common.config.FtpConfig.*;
@@ -189,12 +191,6 @@
@SneakyThrows
@PostMapping("/put-file-user-avatar")
public R putFileUserAvatar(@RequestParam MultipartFile file) {
- long sizeL = file.getSize();
- double size = sizeL/1024;
-
- if (size<=30){
- throw new ServiceException("图片大小不能低于30KB");
- }
//填写你文件上传的地址以及相应信息
String url = "http://223.82.109.183:2081";
String access = "zhbaadmin";
@@ -388,7 +384,24 @@
//获取图片文件
// fileList = fileUtil.getSubFiles(desPath+File.separator+namePath,fileList);
fileList = fileUtil.getSubFiles(desPath,fileList);
+ //将不能导入的保安员账号存起来
+ List<String> errorList = new ArrayList<>();
+ //导入状态，默认为true ,如果有一个出现问题则为 false
+ AtomicBoolean status = new AtomicBoolean(true);
+ //遍历
for (MultipartFile multipartFile : fileList){
+ long size = multipartFile.getSize();
+ if (size<30*1024 || size>500*1024){
+ status.set(false);
+ //取出身份证号,查询用户信息，更新用户信息
+ String pictrueName = multipartFile.getName().substring(0, multipartFile.getName().lastIndexOf("."));
+ String regex ="[\u4e00-\u9fa5]";
+ Pattern compile = Pattern.compile(regex);
+ String idCardNo = compile.matcher(pictrueName).replaceAll("");
+ //加入集合
+ errorList.add(idCardNo);
+
+ }
if(multipartFile.getName().toLowerCase().endsWith(".png") || multipartFile.getName().toLowerCase().endsWith(".jpg")) {
String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "") + multipartFile.getName().substring(multipartFile.getName().lastIndexOf("."));
InputStream in = multipartFile.getInputStream();
@@ -437,6 +450,10 @@
FileUtil.clearFiles(desPath);
//数据封装
map.put("data", "上传成功!");
+ if (!status.get()) {
+ String errorAccount = StringUtils.join(errorList, "\\\n");
+ throw new ServiceException("用户:[" + errorAccount + "]照片导入失败!照片不能小于30KB,且不能大于500KB!!");
+ }
//返回
return R.data(map);
}
--
Gitblit v1.9.3