From b531004a3cbd33d7bb9f5b7dce06ddd4f5e7ec9a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 18 十一月 2022 11:57:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
index b868791..346f302 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
@@ -35,6 +35,9 @@
led.setPreview(receiveParam.getPreviewUrl());
led.setWidth(receiveParam.getWidth());
led.setHeight(receiveParam.getHeight());
+ if (receiveParam.getPages() == null) {
+ throw new BusinessException("鑺傜洰鍐呭涓㈠け");
+ }
led.setPages(JSON.toJSONString(receiveParam.getPages()));
return save(led);
}
@@ -51,18 +54,21 @@
led.setPreview(receiveParam.getPreviewUrl());
led.setWidth(receiveParam.getWidth());
led.setHeight(receiveParam.getHeight());
+ if (receiveParam.getPages() == null) {
+ throw new BusinessException("鑺傜洰鍐呭涓㈠け");
+ }
led.setPages(JSON.toJSONString(receiveParam.getPages()));
return updateById(led);
}
- public boolean deleteProgram(Long id) {
- LEDProgram byId = getById(id);
- if (byId == null) {
+ public boolean deleteProgram(List<Long> pids) {
+ List<LEDProgram> ledPrograms = listByIds(pids);
+ if (ledPrograms.isEmpty()) {
throw new BusinessException("鏈壘鍒拌鑺傜洰");
}
- return removeById(id);
+ return removeByIds(pids);
}
--
Gitblit v1.9.3