From 7327c2b113573bccaeef5b3fc5c82011abc00cd8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 15:58:03 +0800
Subject: [PATCH] 设备，车辆接口修改
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 59 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 21 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 be1683f..4997f72 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -30,6 +30,7 @@
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
+import org.springblade.common.constant.FtpConstant;
import org.springblade.common.utils.arg;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.oss.model.BladeFile;
@@ -180,8 +181,8 @@
/**
- *
* app 文件上传
+ *
* @param file 图片对象
*/
@PostMapping("put-file-app")
@@ -224,8 +225,8 @@
/**
- *
* 文件上传,自定义上传
+ *
* @param file 图片对象
*/
@PostMapping("put-files")
@@ -251,6 +252,7 @@
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);
//添加自定义内容类型
@@ -261,20 +263,21 @@
in, in.available(), -1)
.headers(headers)
.build());
+ FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], in);
in.close();
String urls = "http://223.82.109.183:2081/zhba/" + newName;
//数据封装
Map<String, Object> map = new HashMap<>(2);
- map.put("name",newName);
- map.put("url",urls);
+ map.put("name", newName);
+ map.put("url", urls);
//返回
return R.data(map);
}
/**
- *
* 文件上传,自定义上传
+ *
* @param file 图片对象
*/
@PostMapping("put-files-talk")
@@ -316,8 +319,8 @@
String urls = "http://223.82.109.183:2081/zhba/" + newName;
//数据封装
Map<String, Object> map = new HashMap<>(2);
- map.put("name",newName);
- map.put("url",urls);
+ map.put("name", newName);
+ map.put("url", urls);
//返回
return R.data(map);
}
@@ -344,10 +347,11 @@
*/
@SneakyThrows
@PostMapping("/put-file-attach")
- public R<BladeFile> putFileAttach(@RequestParam MultipartFile file,String deptid,String type,Long noticeId,String cardid) {
+ public R<BladeFile> putFileAttach(@RequestParam MultipartFile file, String deptid, String type, Long noticeId, String cardid) {
String fileName = file.getOriginalFilename();
BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
- Long attachId = buildAttach(fileName, file.getSize(), bladeFile,deptid,type,noticeId,cardid);
+ InputStream inputStream = file.getInputStream();
+ Long attachId = buildAttach(fileName, file.getSize(), bladeFile, deptid, type, noticeId, cardid, inputStream);
bladeFile.setAttachId(attachId);
return R.data(bladeFile);
}
@@ -361,9 +365,9 @@
*/
@SneakyThrows
@PostMapping("/put-file-attach-by-name")
- public R<BladeFile> putFileAttach(@RequestParam String fileName, @RequestParam MultipartFile file,String deptid,String type,Long noticeId,String cardid) {
+ public R<BladeFile> putFileAttach(@RequestParam String fileName, @RequestParam MultipartFile file, String deptid, String type, Long noticeId, String cardid) {
BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
- Long attachId = buildAttach(fileName, file.getSize(), bladeFile,deptid,type,noticeId,cardid);
+ Long attachId = buildAttach(fileName, file.getSize(), bladeFile, deptid, type, noticeId, cardid, file.getInputStream());
bladeFile.setAttachId(attachId);
return R.data(bladeFile);
}
@@ -376,7 +380,7 @@
* @param bladeFile 对象存储文件
* @return attachId
*/
- private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile,String deptid,String type,Long noticeId,String cardid) throws Exception {
+ private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile, String deptid, String type, Long noticeId, String cardid, InputStream in) throws Exception {
//BladeUser user = AuthUtil.getUser();
String fileExtension = FileUtil.getFileExtension(fileName);
Attach attach = new Attach();
@@ -389,32 +393,45 @@
attach.setDeptid(deptid);
attach.setCardid(cardid);
attach.setType(type);
- if (null!=noticeId){
+ if (null != noticeId) {
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,deptid,type,notice_id,cardid) " +
+ "create_time,update_user,update_time,status,is_deleted,type,cardid";
+ if (noticeId != null) {
+ s1 += ",notice_id";
+ } else {
+ s1 += ") " +
"values(" + "'" + attach.getId() + "'" + "," +
"'" + attach.getTenantId() + "'" + "," +
- "'" + attach.getLink() + "'" + "," +
- "'" + attach.getDomain() + "'" + "," +
- "'" + attach.getName() + "'" + "," +
+ "'" + 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()) + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'" + "," +
"'" + attach.getUpdateUser() + "'" + "," +
- "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'" + "," +
"'" + attach.getStatus() + "'" + "," +
"'" + attach.getIsDeleted() + "'" + "," +
"'" + attach.getType() + "'" + "," +
- "'" + attach.getNoticeId() + "'" + "," +
- "'" +attach.getCardid() + "'" + ")";
+ "'" + cardid + "'";
+ }
+ if (noticeId != null) {
+ s1 += "'" + noticeId + "'" + ")";
+ } else {
+ s1 += ")";
+ }
FtpUtil.sqlFileUpload(s1);
return attach.getId();
}
--
Gitblit v1.9.3