From 79a8cabb198848de013978d999d337f6ce386d4d Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 19:07:15 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
index 913ed6a..4eb169c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
@@ -45,11 +45,14 @@
}
@GetMapping("/list")
- public ResponseVO<Object> listLightTask(BaseConditionVO conditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ public ResponseVO<Object> listLightTask(BaseConditionVO conditionVO,
+ @RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq) {
if (!permissionConfig.check(MenuEnum.LIGHT_TASK_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- List<LightTaskDto> taskList = lightTaskService.listLightTask(conditionVO, keyword);
+ List<LightTaskDto> taskList = lightTaskService.listLightTask(conditionVO, keyword, order, seq);
return ResponseUtil.successPage(taskList);
}
@@ -71,12 +74,22 @@
if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- boolean result = lightTaskService.updateLightTask(taskId, param);
- if (result) {
- return ResponseUtil.success("缂栬緫鎴愬姛");
- } else {
- return ResponseUtil.fail("缂栬緫澶辫触");
- }
+// int result = lightTaskService.updateLightTask(taskId, param);
+// if (result == 0) {
+// return ResponseUtil.success("鍏ㄩ儴鎴愬姛");
+// } else if (result == 1) {
+// return ResponseUtil.success("鍏ㄩ儴澶辫触");
+// } else if (result == 2) {
+// return ResponseUtil.fail("鍙湁鏃т换鍔�");
+// } else if (result == 3) {
+// return ResponseUtil.fail("閮ㄥ垎鎴愬姛锛岄儴鍒嗗け璐�");
+// } else {
+// return ResponseUtil.fail("鏈煡閿欒");
+// }
+
+ String result = lightTaskService.updateLightTask(taskId, param);
+ return ResponseUtil.success(result);
+
}
@GetMapping("/{taskId}")
--
Gitblit v1.9.3