From 3075910e10bb60fa2775afb4dbad8d5dba488abb Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 七月 2022 09:56:36 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 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 7047ab3..8cf18cb 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,11 +1,13 @@
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;
@@ -22,13 +24,22 @@
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);
}
@@ -37,13 +48,23 @@
if (byId == null) {
throw new BusinessException("鏈壘鍒拌鑺傜洰");
}
+ /**
+ * 璇虹摝鏂囦欢鍒犻櫎 鏃ュ織璁板綍寮�濮�
+ */
+ String content = "鏂囦欢id:" + id + "鏂囦欢鍐呭:" + JSON.toJSONString(byId);
+ StoreOperationRecordsUtils.storeOperationData(null, null, "璇虹摝鏂囦欢鍒犻櫎", content);
+ /**
+ * 璇虹摝鏂囦欢鍒犻櫎 鏃ュ織璁板綍缁撴潫
+ */
return removeById(id);
}
public LambdaQueryWrapper<LEDProgramFile> listFile() {
LambdaQueryWrapper<LEDProgramFile> ledProgramFileLambdaQueryWrapper = Wrappers.lambdaQuery(LEDProgramFile.class);
if (SecurityUtils.getClientId() != null) {
- return ledProgramFileLambdaQueryWrapper.eq(LEDProgramFile::getUserId, SecurityUtils.getUserId());
+ return ledProgramFileLambdaQueryWrapper.eq(LEDProgramFile::getUserId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(LEDProgramFile::getClientId, SecurityUtils.getUserId());
+ });
} else {
return ledProgramFileLambdaQueryWrapper;
}
--
Gitblit v1.9.3