From 313a83d090e83bf7d2f8f7c9c70807a6486bc690 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 26 八月 2022 14:52:56 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 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 b54b5cb..0c9c0fe 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
@@ -2,6 +2,7 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.LightTaskDto;
import com.sandu.ximon.admin.param.LightTaskDelParam;
@@ -36,20 +37,19 @@
if (!permissionConfig.check(MenuEnum.LIGHT_TASK_ADD.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- boolean result = lightTaskService.addLightTask(param);
- if (result) {
- return ResponseUtil.success("鏂板鎴愬姛");
- } else {
- return ResponseUtil.fail("鏂板澶辫触");
- }
+ return ResponseUtil.success(lightTaskService.newAddLightTask(param));
}
+
@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,24 +71,26 @@
if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
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);
}
+
+ /**
+ * 娓呴櫎浠诲姟
+ * @param
+ * @return
+ */
+ @PostMapping("/clear")
+ public ResponseVO<Object> clearLightTask(@RequestBody List<Long> poleIds) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ boolean result = lightTaskService.clearLightTask(poleIds);
+ return ResponseUtil.success(result);
+ }
+
@GetMapping("/{taskId}")
public ResponseVO<Object> detailLightTask(@PathVariable Long taskId) {
if (!permissionConfig.check(MenuEnum.LIGHT_TASK_DETAIL.getCode())) {
--
Gitblit v1.9.3