From 7a76e94050d7b1db77b06db5cc48be3fd6240be8 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期五, 17 二月 2023 17:19:38 +0800
Subject: [PATCH] 华为
---
src/main/java/com/qxueyou/scc/user/service/impl/UserService.java | 4 +++-
src/main/java/com/qxueyou/scc/teach/res/service/impl/HweiYunOBSServiceImpl.java | 8 ++++++--
src/main/java/com/qxueyou/scc/controller/ResController.java | 8 +++-----
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/controller/ResController.java b/src/main/java/com/qxueyou/scc/controller/ResController.java
index 89e1119..2fc0d31 100644
--- a/src/main/java/com/qxueyou/scc/controller/ResController.java
+++ b/src/main/java/com/qxueyou/scc/controller/ResController.java
@@ -14,6 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -207,14 +208,11 @@
* @param id 璧勬簮id
*/
@GetMapping(value = "getResDetail")
- public Result getResDetail(String id) {
-
+ public Result getResDetail(String id,HttpServletResponse response) {
Res res = resService.read(id);
Result pathResult = resService.readAccessPath(id, null);
-
return new Result(true, "success", CollectionUtils.newObjectMap("type", res.getType(), "name", res.getName(),
"coverUrl", res.getCoverPageUrl(), "remark", res.getRemark(), "fullPath", pathResult.getDataT("path")));
}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/qxueyou/scc/teach/res/service/impl/HweiYunOBSServiceImpl.java b/src/main/java/com/qxueyou/scc/teach/res/service/impl/HweiYunOBSServiceImpl.java
index 7343731..8589af1 100644
--- a/src/main/java/com/qxueyou/scc/teach/res/service/impl/HweiYunOBSServiceImpl.java
+++ b/src/main/java/com/qxueyou/scc/teach/res/service/impl/HweiYunOBSServiceImpl.java
@@ -23,6 +23,7 @@
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
@@ -105,6 +106,7 @@
return false;
}
+
@Override
public List<FileMeta> fileUpload(MultipartFile uploadFile, String objectKey) {
ObsClient obsClient = null;
@@ -125,17 +127,19 @@
}
InputStream inputStream = uploadFile.getInputStream();
long available = inputStream.available();
-// PutObjectRequest request = new PutObjectRequest(bucketName,objectKey,inputStream);
PutObjectRequest request = new PutObjectRequest(bucketName,destPath,inputStream);
ObjectMetadata objectMetadata = new ObjectMetadata();
objectMetadata.setContentLength(available);
request.setMetadata(objectMetadata);
-// request.
// 璁剧疆瀵硅薄璁块棶鏉冮檺涓哄叕鍏辫
request.setAcl(AccessControlList.REST_CANNED_PUBLIC_READ);
PutObjectResult result = obsClient.putObject(request);
fileMeta = new FileMeta();
ResFile file = fileService.insertFileToDBTwo(objectKey, uploadFile.getSize(), result.getObjectUrl(), uploadFile.getContentType());
+// SetObjectMetadataRequest ObjectMetadataRequest = new SetObjectMetadataRequest(bucketName, destPath);
+// ObjectMetadataRequest.setContentDisposition("inline");
+// obsClient.setObjectMetadata(ObjectMetadataRequest);
+
fileMeta.setFileId(file.getFileId());
fileMeta.setPath(result.getObjectUrl());
fileMeta.setFileSize(uploadFile.getSize() / 1024 + "kb");
diff --git a/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java b/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
index ceac340..3610bfb 100644
--- a/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
+++ b/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
@@ -60,6 +60,9 @@
// System.out.println(user.getUserId());
// System.out.println(user.getOrganizationId());
// System.out.println(StuStudent.STATUS_ACTIVE);
+ System.out.println(user.getOrganizationId());
+ System.out.println(user.getUserId());
+
ClsClass objClsClass = this.findUnique("select c from StuStudent t,"
+ " ClsClass c where c.classId = t.classId "
+ " and c.orgId = ? and t.userId = ? and t.status = ? order by t.createTime desc", CollectionUtils.newList(user.getOrganizationId(), user.getUserId(), StuStudent.STATUS_ACTIVE), ClsClass.class);
@@ -67,7 +70,6 @@
wrapper.setOrg(org);
wrapper.setClass(objClsClass);
wrapper.setLoginInfo(param.getCacheIpFlag(), param.getIp(), param.getPlatForm());
- System.out.println("aaa"+user.getUserId());
session.setAttribute(UserInfoWrapper.INF_USER_ID,user.getUserId());
session.setAttribute(UserInfoWrapper.INF_USER_NAME,user.getName());
if(objClsClass!=null){
--
Gitblit v1.8.0