From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 171 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 134 insertions(+), 37 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 158c772..424e4af 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -34,6 +34,10 @@
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
+import org.springblade.modules.apply.entity.Apply;
+import org.springblade.modules.apply.entity.ExamPayment;
+import org.springblade.modules.apply.service.ExamPaymentService;
+import org.springblade.modules.exam.service.ExamPaperService;
import org.springblade.modules.resource.builder.oss.OssBuilder;
import org.springblade.modules.resource.entity.Attach;
import org.springblade.modules.resource.service.IAttachService;
@@ -77,6 +81,10 @@
private final IUserService userService;
+
+ private final ExamPaperService examPaperService;
+
+ private final ExamPaymentService examPaymentService;
/**
* 创建存储桶
@@ -335,6 +343,8 @@
.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})";
@@ -350,7 +360,7 @@
//内网数据推送
//数据推送
- String s = "update blade_user set avatar = " + "'" + urls + "'" + "where id = " + "'" + user.getId() + "'";
+ String s = "update blade_user set avatar = " + "'" + inUrl + "'" + "where id = " + "'" + user.getId() + "'";
FtpUtil.sqlFileUpload(s);
//文件推送
@@ -361,6 +371,123 @@
}
}
//最后要删除文件
+ FileUtil.clearFiles(FileConfig.localtion + File.separator + file.getOriginalFilename());
+ FileUtil.clearFiles(desPath);
+ //数据封装
+ map.put("data", "上传成功!");
+ //返回
+ return R.data(map);
+ }
+
+
+ /**
+ * 文件上传,zip , 缴费凭证
+ *
+ * @param file 图片对象
+ */
+ @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());
+ }
+ 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 savePath = FileConfig.localtion + File.separator;
+ FileUtil fileUtil = new FileUtil();
+ //解压zip文件
+ FileUtil.unZip(file, desPath,savePath);
+
+ List<MultipartFile> fileList = new ArrayList<>();
+ //获取图片文件
+ 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("."));
+ 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){
+ ExamPayment examPayment = new ExamPayment();
+ examPayment.setWorkerId(user.getId().toString());
+ examPayment.setCertificateUrl(urls);
+ examPayment.setType(1);
+ examPayment.setPaymentTime(new Date());
+ //查询当前人员的报名信息
+ List<Apply> applyList = examPaperService.getApplyDetail(user.getId().toString());
+ //有且只有一条信息
+ if (applyList.size()==1){
+ examPayment.setApplyCode(applyList.get(0).getId().toString());
+ }
+ //新增
+ examPaymentService.save(examPayment);
+
+ //数据推送
+ 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) " +
+ "values(" + "'" + examPayment.getId() + "'" +
+ "," + "'" + examPayment.getType() + "'" +
+ "," + "'" + formatStr + "'" +
+ "," + "'" + examPayment.getWorkerId() + "'" +
+ "," + "'" + examPayment.getApplyCode() + "'" +
+ "," +"'" + examPayment.getCertificateUrl() + "'" + ")";
+ 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", "上传成功!");
@@ -480,6 +607,7 @@
String fileExtension = org.springblade.core.tool.utils.FileUtil.getFileExtension(fileName);
Attach attach = new Attach();
attach.setDomain(bladeFile.getDomain());
+ attach.setTenantId("000000");
attach.setLink(bladeFile.getLink());
attach.setName(bladeFile.getName());
attach.setOriginalName(bladeFile.getOriginalName());
@@ -492,42 +620,11 @@
attach.setNoticeId(noticeId);
}
attachService.save(attach);
- String[] split = bladeFile.getName().split("/");
- String ip = FtpConstant.ip+"/zhba/picture/";
- String imgurl = ip + split[2];
- FtpUtil.uploadFile(ftpHost_dev, ftpPort, 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,create_dept," +
- "create_time,update_user,update_time,status,is_deleted,type,cardid";
- if (noticeId != null) {
- s1 += ",notice_id";
- } else {
- s1 += ") " +
- "values(" + "'" + attach.getId() + "'" + "," +
- "'" + attach.getTenantId() + "'" + "," +
- "'" + imgurl + "'" + "," +
- "'" + ip + "'" + "," +
- "'" + split[2] + "'" + "," +
- "'" + attach.getOriginalName() + "'" + "," +
- "'" + attach.getExtension() + "'" + "," +
- "'" + attach.getAttachSize() + "'" + "," +
- "'" + attach.getCreateUser() + "'" + "," +
- "'" + attach.getCreateDept() + "'" + "," +
- "'" + 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 + "'";
- }
- if (noticeId != null) {
- s1 += "'" + noticeId + "'" + ")";
- } else {
- s1 += ")";
- }
- FtpUtil.sqlFileUpload(s1);
+ //String[] split = bladeFile.getName().split("/");
+ //String ip = FtpConstant.ip+"/zhba/upload/picture/";
+ //String imgurl = ip + split[2];
+ //FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], in);
+ //FtpUtil.sqlFileUpload(s1);
return attach.getId();
}
--
Gitblit v1.9.3