From 52eb3f0befcb397d2fdd645c8d7471d6ee477f87 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 09 五月 2022 16:36:38 +0800
Subject: [PATCH] 权限
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java
index 378dc64..33e6d89 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java
@@ -6,9 +6,8 @@
import com.sandu.common.file.FileUploadDto;
import com.sandu.common.file.impl.AliOssFileServiceImpl;
import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.ximon.admin.param.LEDProgramFileParam;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.dao.domain.LEDProgramFile;
+import com.sandu.ximon.dao.domain.FileOperationRecord;
import com.sandu.ximon.dao.domain.LedSFile;
import com.sandu.ximon.dao.mapper.LedSFileMapper;
import lombok.AllArgsConstructor;
@@ -26,18 +25,31 @@
public class LedSFileService extends BaseServiceImpl<LedSFileMapper, LedSFile> {
private final LedSFileMapper ledSFileMapper;
private final AliOssFileServiceImpl aliOssFileService;
+ private final FileOperationRecordService fileOperationRecordService;
+ private final ClientService clientService;
- public FileUploadDto addProgramFile(MultipartFile file) {
+ public boolean addProgramFile(MultipartFile file) {
FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
+ if ("mp4".equals(fileUploadDto.getFileType())) {
+ fileUploadDto.setScreenShot(fileUploadDto.getFileUrl() + "?x-oss-process=video/snapshot,t_10000,m_fast");
+ }
+ FileOperationRecord fileOperationRecord = new FileOperationRecord();
+ if ("mp4".equals(fileUploadDto.getFileType())) {
+ fileOperationRecord.setScreenShot(fileUploadDto.getFileUrl() + "?x-oss-process=video/snapshot,t_10000,m_fast");
+ }
+ BeanUtils.copyProperties(fileUploadDto, fileOperationRecord);
+ fileOperationRecordService.save(fileOperationRecord);
LedSFile sFile = new LedSFile();
BeanUtils.copyProperties(fileUploadDto, sFile);
sFile.setCilentId(SecurityUtils.getClientId());
if (SecurityUtils.getClientId() != null) {
+ sFile.setUserId(SecurityUtils.getUserId());
sFile.setUserName(SecurityUtils.getUsername());
+ if (clientService.findClientId()) {
+ sFile.setCilentId(clientService.getClientId());
+ }
}
- save(sFile);
-// return save(sFile);
- return fileUploadDto;
+ return save(sFile);
}
public boolean deleteFile(Long id) {
@@ -48,11 +60,13 @@
return removeById(id);
}
- public LambdaQueryWrapper<LedSFile> listFile(){
+ public LambdaQueryWrapper<LedSFile> listFile() {
LambdaQueryWrapper<LedSFile> ledProgramFileLambdaQueryWrapper = Wrappers.lambdaQuery(LedSFile.class);
- if(SecurityUtils.getClientId()!=null){
- return ledProgramFileLambdaQueryWrapper.eq(LedSFile::getCilentId,SecurityUtils.getUserId());
- }else {
+ if (SecurityUtils.getClientId() != null) {
+ return ledProgramFileLambdaQueryWrapper.eq(LedSFile::getCilentId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(LedSFile::getUserId, SecurityUtils.getUserId());
+ });
+ } else {
return ledProgramFileLambdaQueryWrapper;
}
--
Gitblit v1.9.3