From bd8da139decc60e8c7765e375ffda037f5209e3a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 18 五月 2022 14:32:13 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 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 64204b4..ae34cb4 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
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.service;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
@@ -7,6 +8,7 @@
import com.sandu.common.file.impl.AliOssFileServiceImpl;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.domain.FileOperationRecord;
import com.sandu.ximon.dao.domain.LedSFile;
import com.sandu.ximon.dao.mapper.LedSFileMapper;
@@ -26,12 +28,16 @@
private final LedSFileMapper ledSFileMapper;
private final AliOssFileServiceImpl aliOssFileService;
private final FileOperationRecordService fileOperationRecordService;
+ private final ClientService clientService;
public boolean addProgramFile(MultipartFile file) {
FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
- FileOperationRecord fileOperationRecord=new FileOperationRecord();
- if("mp4".equals(fileUploadDto.getFileType())){
- fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
+ 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);
@@ -39,11 +45,21 @@
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);
+ /**
+ * 鐔欐睕鏂囦欢涓婁紶 鏃ュ織璁板綍寮�濮�
+ */
+ String content = "鏂囦欢鍐呭:"+ JSON.toJSONString(fileUploadDto);
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕鏂囦欢涓婁紶", content);
+ /**
+ * 鐔欐睕鏂囦欢涓婁紶 鏃ュ織璁板綍缁撴潫
+ */
return save(sFile);
-// return fileUploadDto;
}
public boolean deleteFile(Long id) {
@@ -51,14 +67,25 @@
if (byId == null) {
throw new BusinessException("鏈壘鍒拌鑺傜洰");
}
+
+ /**
+ * 鐔欐睕鏂囦欢鍒犻櫎 鏃ュ織璁板綍寮�濮�
+ */
+ String content = "鏂囦欢鍐呭id:"+ id+"鏂囦欢鍐呭:"+ JSON.toJSONString(byId);
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕鏂囦欢鍒犻櫎", content);
+ /**
+ * 鐔欐睕鏂囦欢鍒犻櫎 鏃ュ織璁板綍缁撴潫
+ */
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