From b0625931bc528429d592f642bdd759e7dbdfb1c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 19 Oct 2021 22:21:07 +0800
Subject: [PATCH] 1.保安员新增接口修改，单个新增保安员默认密码为身份证号后6位，账号为身份证号， 2.考试成绩可以按天导出 3.个人图片批量导入接口修改 4.保安员批量导入修改，如有重复的账号导入的跳过，导入完成后返回提示信息
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 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 888ecc4..5489e74 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -19,11 +19,10 @@
import io.minio.*;
import io.minio.errors.*;
import io.swagger.annotations.Api;
-import javafx.scene.Parent;
import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
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.oss.model.BladeFile;
@@ -55,8 +54,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.regex.Pattern;
-
-import static org.springblade.common.constant.FtpConstant.*;
+import static org.springblade.common.config.FtpConfig.*;
/**
* 对象存储端点
@@ -222,7 +220,7 @@
.headers(headers)
.build());
InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
String urls = "http://223.82.109.183:2081/zhba/" + newName;
return R.data(urls);
@@ -269,7 +267,7 @@
.headers(headers)
.build());
InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
String urls = "http://223.82.109.183:2081/zhba/" + newName;
//数据封装
@@ -327,7 +325,8 @@
List<MultipartFile> fileList = new ArrayList<>();
//获取图片文件
- fileList = fileUtil.getSubFiles(desPath+File.separator+namePath,fileList);
+// 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("."));
@@ -346,7 +345,7 @@
String urls = "http://223.82.109.183:2081/zhba/" + 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})";
@@ -367,7 +366,7 @@
//文件推送
InputStream inputStream = multipartFile.getInputStream();
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
}
}
@@ -427,7 +426,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("."));
@@ -446,7 +445,7 @@
String urls = "http://223.82.109.183:2081/zhba/" + 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})";
@@ -479,12 +478,12 @@
"," + "'" + formatStr + "'" +
"," + "'" + examPayment.getWorkerId() + "'" +
"," + "'" + examPayment.getPaymentStatus() + "'" +
- "," +"'" + examPayment.getCertificateUrl() + "'" + ")";
+ "," +"'" + inUrl + "'" + ")";
FtpUtil.sqlFileUpload(s);
//文件推送
InputStream inputStream = multipartFile.getInputStream();
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
}
}
@@ -538,8 +537,10 @@
in, in.available(), -1)
.headers(headers)
.build());
+
+ //文件推送
InputStream inputStream = file.getInputStream();
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
String urls = "http://223.82.109.183:2081/zhba/" + newName;
//数据封装
@@ -624,9 +625,9 @@
}
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," +
--
Gitblit v1.9.3