From 6971c195601ecc91b2b7b52af83efed9956dcfe0 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 09 Apr 2021 09:22:49 +0800
Subject: [PATCH] 接口提供：根据设备编码
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java | 66 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 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 a322d93..dc270d6 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
@@ -18,15 +18,21 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.minio.MinioClient;
+import io.minio.errors.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import lombok.SneakyThrows;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.oss.minio.MinioTemplate;
+import org.springblade.core.oss.model.BladeFile;
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.wj.entity.Wj;
import org.springblade.jfpt.wj.service.IWjService;
import org.springblade.jfpt.xlfeedback.entity.Xlfeedback;
@@ -35,11 +41,16 @@
import org.springblade.jfpt.xlfeedback.wrapper.XlfeedbackWrapper;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import org.xmlpull.v1.XmlPullParserException;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
@@ -60,6 +71,8 @@
private final IXlfeedbackService xlfeedbackService;
private IWjService iWjService;
+ private MinioTemplate minioTemplate;
+ private final IAlarmService alarmService;
/**
* 详情
@@ -219,4 +232,57 @@
}
return R.success("删除成功");
}
+
+ @SneakyThrows
+ @PostMapping("put-object")
+ public R<String> put(@RequestParam MultipartFile file,@RequestParam String buckeName){
+ BladeFile bladeFile=minioTemplate.putFile(buckeName,file.getOriginalFilename(),file.getInputStream());
+ String link=bladeFile.getLink();
+ return R.data(link);
+
+ }
+
+ /**
+ *
+ * @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");
+ if (!minioClient.bucketExists("jfpt")) { //是否存在名为“test”的bucket
+ minioClient.makeBucket("jfpt");
+ }
+ String fileName = file.getOriginalFilename();
+ String newName ="upload/"+UUID.randomUUID().toString().replaceAll("-", "")
+ + fileName.substring(fileName.lastIndexOf("."));
+ InputStream inputStream = file.getInputStream(); //获取file的inputStream
+ minioClient.putObject("jfpt", newName, inputStream, "application/octet-stream");//上传
+ inputStream.close();
+ String url = minioClient.getObjectUrl("jfpt", newName); //文件访问路径
+ return R.data(url);
+ }
+
+ /**
+ * @param file
+ */
+ @PostMapping("put-objecty")
+ public R puty(@RequestParam MultipartFile file,String jid) throws InvalidPortException, InvalidEndpointException, IOException, XmlPullParserException, NoSuchAlgorithmException, InvalidKeyException, InvalidArgumentException, InternalException, NoResponseException, InvalidBucketNameException, InsufficientDataException, ErrorResponseException, RegionConflictException {
+ 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/avoid/"+UUID.randomUUID().toString().replaceAll("-", "")
+ + fileName.substring(fileName.lastIndexOf("."));
+ InputStream inputStream = file.getInputStream(); //获取file的inputStream
+ minioClient.putObject("jfpt", newName, inputStream, "application/octet-stream");//上传
+ inputStream.close();
+ 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);
+ }
+
+
}
--
Gitblit v1.9.3