From 3eda4de769e0852dd051182efe74c2a49865fa84 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 06 六月 2022 18:46:32 +0800
Subject: [PATCH] 灯杆倾斜处理
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java | 16 ++++++++--------
1 files changed, 8 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..1830111 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,9 @@
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("缂栬緫澶辫触");
- }
+ String result = lightTaskService.updateLightTask(taskId, param);
+ return ResponseUtil.success(result);
+
}
@GetMapping("/{taskId}")
--
Gitblit v1.9.3