From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java
index 8d22bd7..ca9d573 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java
@@ -33,6 +33,8 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.jfpt.alarm.service.IAlarmService;
+import org.springblade.jfpt.avideo.entity.Avideo;
+import org.springblade.jfpt.avideo.service.IAvideoService;
import org.springblade.jfpt.wj.entity.Wj;
import org.springblade.jfpt.wj.service.IWjService;
import org.springblade.jfpt.xlfeedback.entity.Xlfeedback;
@@ -73,6 +75,7 @@
private IWjService iWjService;
private MinioTemplate minioTemplate;
private final IAlarmService alarmService;
+ private final IAvideoService iAvideoService;
/**
* 详情
@@ -243,17 +246,17 @@
}
/**
- *
+ *警单反馈图片,视频
* @param file
*/
@PostMapping("put-objects")
public R put(@RequestParam MultipartFile file) throws InvalidPortException, InvalidEndpointException, IOException, XmlPullParserException, NoSuchAlgorithmException, InvalidKeyException, InvalidArgumentException, InternalException, NoResponseException, InvalidBucketNameException, InsufficientDataException, ErrorResponseException, RegionConflictException {
- MinioClient minioClient = new MinioClient("http://36.134.81.48:9000","adminminio","adminminio");
+ MinioClient minioClient = new MinioClient("http://web.byisf.com:9000","adminminio","adminminio");
if (!minioClient.bucketExists("jfpt")) { //是否存在名为“test”的bucket
minioClient.makeBucket("jfpt");
}
String fileName = file.getOriginalFilename();
- String newName ="upload/"+UUID.randomUUID().toString().replaceAll("-", "")
+ String newName ="upload/fk/"+UUID.randomUUID().toString().replaceAll("-", "")
+ fileName.substring(fileName.lastIndexOf("."));
InputStream inputStream = file.getInputStream(); //获取file的inputStream
minioClient.putObject("jfpt", newName, inputStream, "application/octet-stream");//上传
@@ -280,9 +283,16 @@
String url = minioClient.getObjectUrl("jfpt", newName); //文件访问路径
String substring = url.substring(25, url.length());
String urls="https://web.byisf.com/minio"+substring;
- alarmService.updateAaddress(url,jid);
- return R.data(url);
+ //alarmService.updateAaddress(urls,jid);
+ Avideo avideo = new Avideo();
+ avideo.setJid(jid);
+ avideo.setAddress(urls);
+ Date dd = new Date();
+ SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String time = sim.format(dd);
+ avideo.setRtime(time);
+ iAvideoService.save(avideo);
+ return R.data(urls);
}
-
}
--
Gitblit v1.9.3