From 1c14c842ef028c9c1d9d27ed458a7311ba55af9d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 25 Apr 2021 14:57:21 +0800
Subject: [PATCH] 1.用户详情 2.反馈图片地址调整
---
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java | 9 +++++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java | 6 ++++--
2 files changed, 13 insertions(+), 2 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 ca9d573..6aa795b 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
@@ -246,7 +246,7 @@
}
/**
- *警单反馈图片,视频
+ *APP警单反馈图片,视频
* @param file
*/
@PostMapping("put-objects")
@@ -262,7 +262,9 @@
minioClient.putObject("jfpt", newName, inputStream, "application/octet-stream");//上传
inputStream.close();
String url = minioClient.getObjectUrl("jfpt", newName); //文件访问路径
- return R.data(url);
+ String substring = url.substring(25, url.length());
+ String urls="https://web.byisf.com/minio"+substring;
+ return R.data(urls);
}
/**
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
index 1447fc2..cc9d7d5 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
@@ -343,4 +343,13 @@
return R.data(userService.selectSecurityUserList(Condition.getPage(query),user));
}
+ /**
+ * 查询单条
+ */
+ @PostMapping("/details")
+ public R<UserVO> details(User user) {
+ User detail = userService.getOne(Condition.getQueryWrapper(user));
+ return R.data(UserWrapper.build().entityVO(detail));
+ }
+
}
--
Gitblit v1.9.3