From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 446 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 287 insertions(+), 159 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 5035912..eb4258a 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -16,16 +16,18 @@
*/
package org.springblade.modules.resource.endpoint;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import io.minio.*;
import io.minio.errors.*;
import io.swagger.annotations.Api;
-import javafx.scene.Parent;
import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.common.config.FileConfig;
-import org.springblade.common.constant.FtpConstant;
+import org.springblade.common.config.FtpConfig;
import org.springblade.common.utils.FileUtil;
import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.oss.model.OssFile;
import org.springblade.core.secure.annotation.PreAuth;
@@ -43,7 +45,10 @@
import org.springblade.modules.resource.entity.Attach;
import org.springblade.modules.resource.service.IAttachService;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.entity.UserDetailEntity;
+import org.springblade.modules.system.service.IUserDetailService;
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,9 +59,9 @@
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.constant.FtpConstant.*;
+import static org.springblade.common.config.FtpConfig.*;
/**
* 对象存储端点
@@ -83,10 +88,13 @@
private final IUserService userService;
+ private final IUserDetailService userDetailService;
+
private final ExamPaperService examPaperService;
private final ExamPaymentService examPaymentService;
+ private final MyAsyncService myAsyncService;
/**
* 创建存储桶
@@ -178,22 +186,24 @@
@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);
}
-
/**
- * app 文件上传
+ * 上传文件
*
- * @param file 图片对象
+ * @param file 文件
+ * @return ObjectStat
*/
- @PostMapping("put-file-app")
- public R putFileApp(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
+ @SneakyThrows
+ @PostMapping("/put-file-user-avatar")
+ public R putFileUserAvatar(@RequestParam MultipartFile file) {
//填写你文件上传的地址以及相应信息
- 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)
@@ -221,10 +231,62 @@
in, in.available(), -1)
.headers(headers)
.build());
- InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, 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);
+ map.put("url", urls);
+ //返回
+ return R.data(map);
+ }
+
+
+ /**
+ * app 文件上传
+ *
+ * @param file 图片对象
+ */
+ @PostMapping("put-file-app")
+ public R putFileApp(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
+ //填写你文件上传的地址以及相应信息
+ String url = FileConfig.apiUrl;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
+ MinioClient minioClient =
+ MinioClient.builder()
+ .endpoint(url)
+ .credentials(access, secret)
+ .build();
+ // 检查存储桶是否已经存在
+ boolean isExist = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucket).build());
+ if (!isExist) {
+ // 创建一个名为zip的存储桶，用于zip文件。
+ minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucket).build());
+ minioClient.setBucketPolicy(SetBucketPolicyArgs.builder().bucket(bucket).build());
+ }
+ String fileName = file.getOriginalFilename();
+ String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "")
+ + fileName.substring(fileName.lastIndexOf("."));
+ InputStream in = file.getInputStream();
+ String[] split = newName.split("/");
+ //创建头部信息
+ Map<String, String> headers = new HashMap<>(1 << 2);
+ //添加自定义内容类型
+ headers.put("Content-Type", "application/octet-stream");
+ //上传
+ minioClient.putObject(
+ PutObjectArgs.builder().bucket(bucket).object(newName).stream(
+ in, in.available(), -1)
+ .headers(headers)
+ .build());
+// InputStream inputStream = file.getInputStream();
+// FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ in.close();
+ String urls = FileConfig.url + "/"+ FileConfig.bucket + "/" + newName;
return R.data(urls);
}
@@ -237,10 +299,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)
@@ -268,10 +330,10 @@
in, in.available(), -1)
.headers(headers)
.build());
- InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, 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);
@@ -285,15 +347,166 @@
* 文件上传,zip
*
* @param file 图片对象
+ * @param type 1:个人头像上传 2：健康状况图片(健康证) 3:无犯罪记录图片
*/
@PostMapping("put-file-zip")
- public R putFileZip(@RequestParam MultipartFile file) throws Exception {
+ public R putFileZip(@RequestParam MultipartFile file,@RequestParam Integer type) throws Exception {
Map<String, Object> map = new HashMap<>(1);
+ // 自定义上传配置设置
+ MinioClient minioClient = myUploadConfigSet();
+ //FileConfig.localtion是配置文件和config类生产的，测试demo可以直接把FileConfig.localtion替换成D:/test
+ String desPath = getDesPath();
+ // 获取文件集合
+ List<MultipartFile> fileList = getFileList(file,desPath);
+ //将不能导入的保安员账号存起来
+ List<String> errorList = new ArrayList<>();
+ //导入状态，默认为true ,如果有一个出现问题则为 false
+ AtomicBoolean status = new AtomicBoolean(true);
+ //遍历
+ for (MultipartFile multipartFile : fileList){
+ // 文件大小校验
+ fileSizeCheck(errorList, status, multipartFile);
+ 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("."));
+ User user = getUserInfo(multipartFile, minioClient,newName);
+ //设置用户头像url
+ if (null!=user){
+ String urls = FileConfig.url + "/"+ FileConfig.bucket + "/" + newName;
+ if (type==1) {
+ user.setAvatar(urls);
+ //更新用户信息
+ userService.updateById(user);
+ }
+ if (type==2) {
+ // 健康状况图片(健康证)
+ // 更新详情信息
+ UpdateWrapper<UserDetailEntity> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.in("user_id",user.getId()).set("health_certificate_url",urls);
+ userDetailService.update(updateWrapper);
+ }
+ if (type==3) {
+ // 无犯罪记录图片
+ // 更新详情信息
+ UpdateWrapper<UserDetailEntity> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.in("user_id",user.getId()).set("no_criminal_record_prove_url",urls);
+ userDetailService.update(updateWrapper);
+ }
+ }
+ }
+ }
+ //最后要删除文件
+ FileUtil.clearFiles(FileConfig.localtion + File.separator + file.getOriginalFilename());
+ 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);
+ }
+
+ /**
+ * 获取临时路径
+ * @return
+ */
+ public String getDesPath() {
+ String uuid = UUID.randomUUID().toString();
+ // String desPath = "D:/test" + File.separator + uuid.replaceAll("-", "");
+ return FileConfig.localtion + File.separator + uuid.replaceAll("-", "");
+ }
+
+ /**
+ * 获取文件集合
+ * @param file
+ * @param desPath
+ * @return
+ */
+ public List<MultipartFile> getFileList(MultipartFile file,String desPath){
+ String fileName = file.getOriginalFilename();
+ String fileType = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase(Locale.US);
+ //判断文件是不是zip类型
+ if(!fileType.equals("zip")){
+ throw new ServiceException("上传文件类型不符!必须是 zip 压缩文件格式!");
+ }
+ //遗漏了这个代码，在本地测试环境不会出问题，在服务器上一定会报没有找到文件的错误
+ String savePath = FileConfig.localtion + File.separator;
+ FileUtil fileUtil = new FileUtil();
+ //解压zip文件
+ try {
+ FileUtil.unZip(file, desPath,savePath);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ List<MultipartFile> fileList = new ArrayList<>();
+ //获取图片文件并返回
+// fileList = fileUtil.getSubFiles(desPath+File.separator+namePath,fileList);
+ return fileUtil.getSubFiles(desPath,fileList);
+ }
+
+ /**
+ * 获取用户信息
+ * @param multipartFile
+ * @param minioClient
+ * @param newName
+ * @return
+ * @throws Exception
+ */
+ public User getUserInfo(MultipartFile multipartFile,MinioClient minioClient,String newName) throws Exception{
+ InputStream in = multipartFile.getInputStream();
+ //创建头部信息
+ Map<String, String> headers = new HashMap<>(1 << 2);
+ //添加自定义内容类型
+ headers.put("Content-Type", "application/octet-stream");
+ //上传
+ minioClient.putObject(
+ PutObjectArgs.builder().bucket(FileConfig.bucket).object(newName).stream(
+ in, in.available(), -1)
+ .headers(headers)
+ .build());
+ //取出身份证号,查询用户信息，更新用户信息
+ String pictrueName = multipartFile.getName().substring(0, multipartFile.getName().lastIndexOf("."));
+// String regex ="([1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx])|([1-9]\\d{5}\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3})";
+ String regex ="[\u4e00-\u9fa5]";
+ Pattern compile = Pattern.compile(regex);
+ String idCardNo = compile.matcher(pictrueName).replaceAll("");
+ in.close();
+ // 查询并返回用户数据
+ return userService.getUserInfoByIdCardNo(idCardNo);
+ }
+
+ /**
+ * 文件大小校验
+ * @param errorList
+ * @param status
+ * @param multipartFile
+ */
+ public void fileSizeCheck(List<String> errorList, AtomicBoolean status, MultipartFile multipartFile) {
+ long size = multipartFile.getSize();
+ if (size<30*1024 || size>500*1024){
+ status.set(false);
+ //取出身份证号,查询用户信息，更新用户信息
+ String pictureName = multipartFile.getName().substring(0, multipartFile.getName().lastIndexOf("."));
+ String regex ="[\u4e00-\u9fa5]";
+ Pattern compile = Pattern.compile(regex);
+ String idCardNo = compile.matcher(pictureName).replaceAll("");
+ //加入集合
+ errorList.add(idCardNo);
+ }
+ }
+
+ /**
+ * 自定义上传配置设置
+ */
+ public MinioClient myUploadConfigSet() throws Exception {
//填写你文件上传的地址以及相应信息
- 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)
@@ -306,79 +519,7 @@
minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucket).build());
minioClient.setBucketPolicy(SetBucketPolicyArgs.builder().bucket(bucket).build());
}
- String fileName = file.getOriginalFilename();
- String namePath = fileName.substring(0,fileName.lastIndexOf("."));
- String fileType = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase(Locale.US);
- //判断文件是不是zip类型
- if(!fileType.equals("zip")){
- map.put("data","上传文件类型不符!");
- return R.data(map);
- }
- //FileConfig.localtion是配置文件和config类生产的，测试demo可以直接把FileConfig.localtion替换成D:/test
- String uuid = UUID.randomUUID().toString();
- String desPath = FileConfig.localtion + File.separator + uuid.replaceAll("-", "");
-// String desPath = "D:/test" + File.separator + uuid.replaceAll("-", "");
-
- //遗漏了这个代码，在本地测试环境不会出问题，在服务器上一定会报没有找到文件的错误
- String savePath = FileConfig.localtion + File.separator;
- FileUtil fileUtil = new FileUtil();
- //解压zip文件
- FileUtil.unZip(file, desPath,savePath);
-
- List<MultipartFile> fileList = new ArrayList<>();
- //获取图片文件
- fileList = fileUtil.getSubFiles(desPath+File.separator+namePath,fileList);
- for (MultipartFile multipartFile : fileList){
- 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();
- String[] split = newName.split("/");
- //创建头部信息
- Map<String, String> headers = new HashMap<>(1 << 2);
- //添加自定义内容类型
- headers.put("Content-Type", "application/octet-stream");
- //上传
- minioClient.putObject(
- PutObjectArgs.builder().bucket(bucket).object(newName).stream(
- in, in.available(), -1)
- .headers(headers)
- .build());
-
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
- //内网
- String inUrl = ip + newName;
- //取出身份证号,查询用户信息，更新用户信息
- String pictrueName = multipartFile.getName().substring(0, multipartFile.getName().lastIndexOf("."));
-// String regex ="([1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx])|([1-9]\\d{5}\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3})";
- String regex ="[\u4e00-\u9fa5]";
- Pattern compile = Pattern.compile(regex);
- String idCardNo = compile.matcher(pictrueName).replaceAll("");
- User user = userService.getUserInfoByIdCardNo(idCardNo);
- //设置用户头像url
- if (null!=user){
- user.setAvatar(urls);
- //更新用户信息
- userService.updateById(user);
-
- //内网数据推送
- //数据推送
- String s = "update blade_user set avatar = " + "'" + inUrl + "'" + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s);
-
- //文件推送
- InputStream inputStream = multipartFile.getInputStream();
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
- in.close();
- }
- }
- }
- //最后要删除文件
- FileUtil.clearFiles(FileConfig.localtion + File.separator + file.getOriginalFilename());
- FileUtil.clearFiles(desPath);
- //数据封装
- map.put("data", "上传成功!");
- //返回
- return R.data(map);
+ return minioClient;
}
@@ -390,34 +531,16 @@
@PostMapping("put-file-exam-payment-zip")
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";
- MinioClient minioClient =
- MinioClient.builder()
- .endpoint(url)
- .credentials(access, secret)
- .build();
- // 检查存储桶是否已经存在
- boolean isExist = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucket).build());
- if (!isExist) {
- // 创建一个名为zip的存储桶，用于zip文件。
- minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucket).build());
- minioClient.setBucketPolicy(SetBucketPolicyArgs.builder().bucket(bucket).build());
- }
+ MinioClient minioClient = myUploadConfigSet();
String fileName = file.getOriginalFilename();
String namePath = fileName.substring(0,fileName.lastIndexOf("."));
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
- String uuid = UUID.randomUUID().toString();
- String desPath = FileConfig.localtion + File.separator + uuid.replaceAll("-", "");
+ String desPath = getDesPath();
//遗漏了这个代码，在本地测试环境不会出问题，在服务器上一定会报没有找到文件的错误
String savePath = FileConfig.localtion + File.separator;
@@ -427,7 +550,7 @@
List<MultipartFile> fileList = new ArrayList<>();
//获取图片文件
- fileList = fileUtil.getSubFiles(desPath+File.separator+namePath,fileList);
+ fileList = fileUtil.getSubFiles(desPath,fileList);
for (MultipartFile multipartFile : fileList){
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("."));
@@ -439,14 +562,14 @@
headers.put("Content-Type", "application/octet-stream");
//上传
minioClient.putObject(
- PutObjectArgs.builder().bucket(bucket).object(newName).stream(
+ PutObjectArgs.builder().bucket(FileConfig.bucket).object(newName).stream(
in, in.available(), -1)
.headers(headers)
.build());
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = FileConfig.url + "/"+ FileConfig.bucket + "/" + newName;
//内网
- String inUrl = ip + newName;
+ String inUrl = FtpConfig.ip +"/zhba/"+ newName;
//取出身份证号,查询用户信息，更新用户信息
String pictrueName = multipartFile.getName().substring(0, multipartFile.getName().lastIndexOf("."));
// String regex ="([1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx])|([1-9]\\d{5}\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3})";
@@ -458,6 +581,7 @@
if (null!=user){
ExamPayment examPayment = new ExamPayment();
examPayment.setWorkerId(user.getId().toString());
+ examPayment.setPaymentStatus(3);
examPayment.setCertificateUrl(urls);
examPayment.setType(1);
examPayment.setPaymentTime(new Date());
@@ -472,18 +596,19 @@
//数据推送
String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPayment.getPaymentTime());
- String s = "insert into sys_apply(id,type,payment_time,worker_id,apply_code,certificate_url) " +
+ String s = "insert into sys_exam_payment(id,type,payment_time,worker_id,payment_status,certificate_url) " +
"values(" + "'" + examPayment.getId() + "'" +
"," + "'" + examPayment.getType() + "'" +
"," + "'" + formatStr + "'" +
"," + "'" + examPayment.getWorkerId() + "'" +
- "," + "'" + examPayment.getApplyCode() + "'" +
- "," +"'" + examPayment.getCertificateUrl() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ "," + "'" + examPayment.getPaymentStatus() + "'" +
+ "," +"'" + inUrl + "'" + ")";
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
//文件推送
- InputStream inputStream = multipartFile.getInputStream();
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+// InputStream inputStream = multipartFile.getInputStream();
+// FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
}
}
@@ -504,24 +629,8 @@
* @param file 图片对象
*/
@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";
- MinioClient minioClient =
- MinioClient.builder()
- .endpoint(url)
- .credentials(access, secret)
- .build();
- // 检查存储桶是否已经存在
- boolean isExist = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucket).build());
- if (!isExist) {
- // 创建一个名为zip的存储桶，用于zip文件。
- minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucket).build());
- minioClient.setBucketPolicy(SetBucketPolicyArgs.builder().bucket(bucket).build());
- }
+ public R putFilestak(@RequestParam MultipartFile file) throws Exception {
+ MinioClient minioClient = myUploadConfigSet();
String fileName = file.getOriginalFilename();
String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "")
+ fileName.substring(fileName.lastIndexOf("."));
@@ -533,14 +642,16 @@
headers.put("Content-Type", "application/octet-stream");
//上传
minioClient.putObject(
- PutObjectArgs.builder().bucket(bucket).object(newName).stream(
+ PutObjectArgs.builder().bucket(FileConfig.bucket).object(newName).stream(
in, in.available(), -1)
.headers(headers)
.build());
- InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, 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);
@@ -623,15 +734,31 @@
}
attachService.save(attach);
String[] split = bladeFile.getName().split("/");
- String ip = FtpConstant.ip+"/zhba/upload/picture/";
+ String ip = FtpConfig.ip+"/zhba/upload/picture/";
String imgurl = ip + split[2];
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], in);
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], in);
//数据同步
String s1 =
"insert into blade_attach(id,tenant_id,link,domain,name,original_name,extension,attach_size,create_user,deptid," +
"create_time,update_user,update_time,status,is_deleted,type,cardid";
if (noticeId != null) {
- s1 += ",notice_id";
+ s1 += ",notice_id"+")" +"values(" + "'" + attach.getId() + "'" + "," +
+ "'" + attach.getTenantId() + "'" + "," +
+ "'" + imgurl + "'" + "," +
+ "'" + ip + "'" + "," +
+ "'" + split[2] + "'" + "," +
+ "'" + attach.getOriginalName() + "'" + "," +
+ "'" + attach.getExtension() + "'" + "," +
+ "'" + attach.getAttachSize() + "'" + "," +
+ "'" + attach.getCreateUser() + "'" + "," +
+ "'" + attach.getDeptid() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'" + "," +
+ "'" + attach.getUpdateUser() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'" + "," +
+ "'" + attach.getStatus() + "'" + "," +
+ "'" + attach.getIsDeleted() + "'" + "," +
+ "'" + attach.getType() + "'" + "," +
+ "'" + cardid + "'";
} else {
s1 += ") " +
"values(" + "'" + attach.getId() + "'" + "," +
@@ -653,11 +780,12 @@
"'" + cardid + "'";
}
if (noticeId != null) {
- s1 += "'" + noticeId + "'" + ")";
+ s1 += ","+"'" + noticeId + "'" + ")";
} else {
s1 += ")";
}
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
return attach.getId();
}
--
Gitblit v1.9.3