From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java | 67 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 13 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..a97bcfa 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,12 +1,16 @@
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.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.file.FileUploadDto;
import com.sandu.common.file.impl.AliOssFileServiceImpl;
+import com.sandu.common.object.BaseConditionVO;
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;
@@ -14,6 +18,8 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
/**
* @Author liuhaonan
@@ -26,24 +32,36 @@
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);
LedSFile sFile = new LedSFile();
BeanUtils.copyProperties(fileUploadDto, sFile);
sFile.setCilentId(SecurityUtils.getClientId());
- if (SecurityUtils.getClientId() != null) {
- sFile.setUserName(SecurityUtils.getUsername());
+ 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,17 +69,40 @@
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(){
- LambdaQueryWrapper<LedSFile> ledProgramFileLambdaQueryWrapper = Wrappers.lambdaQuery(LedSFile.class);
- if(SecurityUtils.getClientId()!=null){
- return ledProgramFileLambdaQueryWrapper.eq(LedSFile::getCilentId,SecurityUtils.getUserId());
- }else {
- return ledProgramFileLambdaQueryWrapper;
+
+ /**
+ * 鍒楄〃
+ *
+ * @param baseConditionVO
+ * @param keyword
+ * @return
+ */
+ public List<LedSFile> listfile(BaseConditionVO baseConditionVO, String keyword) {
+ LambdaQueryWrapper<LedSFile> wrapper = Wrappers.lambdaQuery(LedSFile.class);
+ if (SecurityUtils.getClientId() != null) {
+ wrapper.eq(LedSFile::getCilentId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(LedSFile::getUserId, SecurityUtils.getUserId());
+ });
}
+ if (keyword != null && !keyword.isEmpty()) {
+ wrapper.like(LedSFile::getOriginName, keyword);
+ }
+
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ return list(wrapper);
}
}
--
Gitblit v1.9.3