From f8c33ad3fb09dd0f70b68b74d59ce28761142bf0 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期一, 14 十一月 2022 15:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 8cf18cb..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
@@ -14,6 +14,8 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import java.util.List;
+
@Service
@AllArgsConstructor
public class LEDProgramFileService extends BaseServiceImpl<LEDProgramFileMapper, LEDProgramFile> {
@@ -43,20 +45,20 @@
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("鏈壘鍒拌鑺傜洰");
}
/**
* 璇虹摝鏂囦欢鍒犻櫎 鏃ュ織璁板綍寮�濮�
*/
- String content = "鏂囦欢id:" + id + "鏂囦欢鍐呭:" + JSON.toJSONString(byId);
+ String content = "鏂囦欢id:" + fileIds + "鏂囦欢鍐呭:" + JSON.toJSONString(ledProgramFiles);
StoreOperationRecordsUtils.storeOperationData(null, null, "璇虹摝鏂囦欢鍒犻櫎", content);
/**
* 璇虹摝鏂囦欢鍒犻櫎 鏃ュ織璁板綍缁撴潫
*/
- return removeById(id);
+ return removeByIds(fileIds);
}
public LambdaQueryWrapper<LEDProgramFile> listFile() {
--
Gitblit v1.9.3