From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java | 51 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
index f8da784..e108534 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
@@ -1,16 +1,20 @@
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;
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.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.domain.LEDProgramFile;
import com.sandu.ximon.dao.mapper.LEDProgramFileMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service
@AllArgsConstructor
@@ -22,29 +26,48 @@
public boolean addProgramFile(LEDProgramFileParam param) {
LEDProgramFile file = new LEDProgramFile();
BeanUtils.copyProperties(param, file);
- file.setUserId(SecurityUtils.getClientId());
- if (SecurityUtils.getClientId() != null) {
- file.setUserName(SecurityUtils.getUsername());
+
+ file.setUserId(SecurityUtils.getUserId());
+ file.setUserName(SecurityUtils.getUsername());
+ if (clientService.findClientId()) {
+ file.setClientId(clientService.getClientId());
}
-// if("mp4".equals(fileUploadDto.getFileType())){
-// fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
-// }
+
+
+ /**
+ * 璇虹摝鏂囦欢鏂板 鏃ュ織璁板綍寮�濮�
+ */
+ String content = "鏂囦欢鍐呭:" + JSON.toJSONString(file);
+ StoreOperationRecordsUtils.storeOperationData(null, null, "璇虹摝鏂囦欢鏂板", content);
+ /**
+ * 璇虹摝鏂囦欢鏂板 鏃ュ織璁板綍缁撴潫
+ */
return save(file);
}
- public boolean deleteFile(Long id) {
- LEDProgramFile byId = getById(id);
- if (byId == null) {
+ public boolean deleteFile(List<Long> fileIds) {
+ List<LEDProgramFile> ledProgramFiles = listByIds(fileIds);
+ if (ledProgramFiles.isEmpty()) {
throw new BusinessException("鏈壘鍒拌鑺傜洰");
}
- return removeById(id);
+ /**
+ * 璇虹摝鏂囦欢鍒犻櫎 鏃ュ織璁板綍寮�濮�
+ */
+ String content = "鏂囦欢id:" + fileIds + "鏂囦欢鍐呭:" + JSON.toJSONString(ledProgramFiles);
+ StoreOperationRecordsUtils.storeOperationData(null, null, "璇虹摝鏂囦欢鍒犻櫎", content);
+ /**
+ * 璇虹摝鏂囦欢鍒犻櫎 鏃ュ織璁板綍缁撴潫
+ */
+ return removeByIds(fileIds);
}
- public LambdaQueryWrapper<LEDProgramFile> listFile(){
+ public LambdaQueryWrapper<LEDProgramFile> listFile() {
LambdaQueryWrapper<LEDProgramFile> ledProgramFileLambdaQueryWrapper = Wrappers.lambdaQuery(LEDProgramFile.class);
- if(SecurityUtils.getClientId()!=null){
- return ledProgramFileLambdaQueryWrapper.eq(LEDProgramFile::getUserId,SecurityUtils.getUserId());
- }else {
+ if (SecurityUtils.getClientId() != null) {
+ return ledProgramFileLambdaQueryWrapper.eq(LEDProgramFile::getUserId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(LEDProgramFile::getClientId, SecurityUtils.getUserId());
+ });
+ } else {
return ledProgramFileLambdaQueryWrapper;
}
--
Gitblit v1.9.3