From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 130 +++++++++++++++++++++++++------------------
1 files changed, 76 insertions(+), 54 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..04f9ff5 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;
@@ -44,6 +45,7 @@
import org.springblade.modules.resource.service.IAttachService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
@@ -54,6 +56,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.*;
@@ -86,6 +89,7 @@
private final ExamPaperService examPaperService;
private final ExamPaymentService examPaymentService;
+ private final MyAsyncService myAsyncService;
/**
* 创建存储桶
@@ -177,6 +181,7 @@
@PostMapping("/put-file")
public R<BladeFile> putFile(@RequestParam MultipartFile file) {
BladeFile bladeFile = ossBuilder.template().putFile(file.getOriginalFilename(), file.getInputStream());
+ bladeFile.setLink(bladeFile.getLink().replace("127.0.0.1","60.220.177.113"));
return R.data(bladeFile);
}
@@ -189,17 +194,11 @@
@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";
- String secret = "zhbapassword";
- String bucket = "zhba";
+ String url = FileConfig.apiUrl;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -227,10 +226,10 @@
in, in.available(), -1)
.headers(headers)
.build());
- InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+// InputStream inputStream = file.getInputStream();
+// FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = FileConfig.url + "/"+ FileConfig.bucket + "/" + newName;
//数据封装
Map<String, Object> map = new HashMap<>(2);
map.put("name", newName);
@@ -248,10 +247,10 @@
@PostMapping("put-file-app")
public R putFileApp(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
- String access = "zhbaadmin";
- String secret = "zhbapassword";
- String bucket = "zhba";
+ String url = FileConfig.apiUrl;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -279,10 +278,10 @@
in, in.available(), -1)
.headers(headers)
.build());
- InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+// InputStream inputStream = file.getInputStream();
+// FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = FileConfig.url + "/"+ FileConfig.bucket + "/" + newName;
return R.data(urls);
}
@@ -295,10 +294,10 @@
@PostMapping("put-files")
public R putFiles(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
- String access = "zhbaadmin";
- String secret = "zhbapassword";
- String bucket = "zhba";
+ String url = FileConfig.apiUrl;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -326,10 +325,10 @@
in, in.available(), -1)
.headers(headers)
.build());
- InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+// InputStream inputStream = file.getInputStream();
+// FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = FileConfig.url + "/"+ FileConfig.bucket + "/" + newName;
//数据封装
Map<String, Object> map = new HashMap<>(2);
map.put("name", newName);
@@ -348,10 +347,10 @@
public R putFileZip(@RequestParam MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<>(1);
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
- String access = "zhbaadmin";
- String secret = "zhbapassword";
- String bucket = "zhba";
+ String url = FileConfig.apiUrl;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -369,8 +368,6 @@
String fileType = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase(Locale.US);
//判断文件是不是zip类型
if(!fileType.equals("zip")){
-// map.put("data","上传文件类型不符!");
-// return R.data(map);
throw new ServiceException("上传文件类型不符!必须是 zip 压缩文件格式!");
}
//FileConfig.localtion是配置文件和config类生产的，测试demo可以直接把FileConfig.localtion替换成D:/test
@@ -388,7 +385,23 @@
//获取图片文件
// 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();
@@ -404,7 +417,7 @@
.headers(headers)
.build());
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = FileConfig.url + "/"+ FileConfig.bucket + "/" + newName;
//内网
String inUrl = FtpConfig.ip + "/zhba/" + newName;
//取出身份证号,查询用户信息，更新用户信息
@@ -422,12 +435,15 @@
//内网数据推送
//数据推送
- String s = "update blade_user set avatar = " + "'" + inUrl + "'" + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s);
+ String s = "update blade_user set avatar = " + "'" + inUrl +
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'" +
+ "'" + "where id = " + "'" + user.getId() + "'";
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
//文件推送
- InputStream inputStream = multipartFile.getInputStream();
- FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+// InputStream inputStream = multipartFile.getInputStream();
+// FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
}
}
@@ -437,6 +453,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);
}
@@ -451,10 +471,10 @@
public R putFileExamPaymentZip(@RequestParam MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<>(1);
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
- String access = "zhbaadmin";
- String secret = "zhbapassword";
- String bucket = "zhba";
+ String url = FileConfig.apiUrl;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -505,7 +525,7 @@
.headers(headers)
.build());
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = FileConfig.url + "/"+ FileConfig.bucket + "/" + newName;
//内网
String inUrl = FtpConfig.ip +"/zhba/"+ newName;
//取出身份证号,查询用户信息，更新用户信息
@@ -541,11 +561,12 @@
"," + "'" + examPayment.getWorkerId() + "'" +
"," + "'" + examPayment.getPaymentStatus() + "'" +
"," +"'" + inUrl + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
//文件推送
- InputStream inputStream = multipartFile.getInputStream();
- FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+// InputStream inputStream = multipartFile.getInputStream();
+// FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
}
}
@@ -568,10 +589,10 @@
@PostMapping("put-files-talk")
public R putFilestak(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
- String access = "zhbaadmin";
- String secret = "zhbapassword";
- String bucket = "zhba";
+ String url = FileConfig.apiUrl;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -601,10 +622,10 @@
.build());
//文件推送
- InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+// InputStream inputStream = file.getInputStream();
+// FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = FileConfig.url + "/"+ FileConfig.bucket + "/" + newName;
//数据封装
Map<String, Object> map = new HashMap<>(2);
map.put("name", newName);
@@ -737,7 +758,8 @@
} else {
s1 += ")";
}
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
return attach.getId();
}
--
Gitblit v1.9.3