From c88f44a7d604bf91e22a5cb076018884a01a6261 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期六, 19 十一月 2022 15:11:17 +0800
Subject: [PATCH] 替换阿里oss为本地minio,关闭对时存在定时任务时睡眠10min
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
index c2207e4..060437d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
@@ -11,6 +11,8 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
/**
* LED鑺傜洰澶勭悊
*/
@@ -46,21 +48,24 @@
}
- @PostMapping("/delete/{pid}")
- public ResponseVO<Object> deleteLEDProgram(@PathVariable Long pid) {
+ @PostMapping("/delete")
+ public ResponseVO<Object> deleteLEDProgram(@RequestBody List<Long> pids) {
if (!permissionConfig.check(MenuEnum.LED_N_DELETE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.success(ledProgramService.deleteProgram(pid));
+ return ResponseUtil.success(ledProgramService.deleteProgram(pids));
}
@GetMapping("/list")
- public ResponseVO<Object> listProgram(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ public ResponseVO<Object> listProgram(BaseConditionVO baseConditionVO,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq,
+ @RequestParam(value = "keyword", required = false) String keyword) {
if (!permissionConfig.check(MenuEnum.LED_PROGRAM_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.successPage(ledProgramService.listProgram(baseConditionVO, keyword));
+ return ResponseUtil.successPage(ledProgramService.listProgram(baseConditionVO, order, seq, keyword));
}
}
--
Gitblit v1.9.3