From c3c43488d9f1cfa125171a50be79a3ee4081a2c5 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 19 五月 2022 17:47:46 +0800
Subject: [PATCH] 排序

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 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 a705fca..7fe4172 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
@@ -33,6 +33,9 @@
 
     @PostMapping("/add")
     public ResponseVO<Object> addLightTask(@RequestBody @Validated LightTaskParam param) {
+        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_ADD.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         boolean result = lightTaskService.addLightTask(param);
         if (result) {
             return ResponseUtil.success("鏂板鎴愬姛");
@@ -42,16 +45,19 @@
     }
 
     @GetMapping("/list")
-    public ResponseVO<Object> listLightTask(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword) {
+    public ResponseVO<Object> listLightTask(BaseConditionVO conditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
         if (!permissionConfig.check(MenuEnum.LIGHT_TASK_LIST.getCode())) {
             return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
         }
-        List<LightTaskDto> taskList = lightTaskService.listLightTask(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword);
+        List<LightTaskDto> taskList = lightTaskService.listLightTask(conditionVO, keyword);
         return ResponseUtil.successPage(taskList);
     }
 
     @PostMapping("/del")
     public ResponseVO<Object> delLightTask(@RequestBody @Validated LightTaskDelParam param) {
+        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_DELETE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         boolean result = lightTaskService.delLightTask(param.getTaskIdList());
         if (result) {
             return ResponseUtil.success("鍒犻櫎鎴愬姛");
@@ -62,6 +68,9 @@
 
     @PostMapping("/update/{taskId}")
     public ResponseVO<Object> updateLightTask(@PathVariable Long taskId, @RequestBody @Validated LightTaskParam param) {
+        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         boolean result = lightTaskService.updateLightTask(taskId, param);
         if (result) {
             return ResponseUtil.success("缂栬緫鎴愬姛");
@@ -72,12 +81,24 @@
 
     @GetMapping("/{taskId}")
     public ResponseVO<Object> detailLightTask(@PathVariable Long taskId) {
+        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_DETAIL.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         Map<Object, Object> objectObjectMap = lightTaskService.detailLightTask(taskId);
         return ResponseUtil.success(objectObjectMap);
     }
 
+    /**
+     * 鍗曠伅涓嬪彂
+     *
+     * @param param
+     * @return
+     */
     @PostMapping("/issue")
     public ResponseVO<Object> issueLightTask(@RequestBody @Validated LightTaskIssueParam param) {
+        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_ISSUE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         boolean result = lightTaskService.issueLightTask(param);
         if (result) {
             return ResponseUtil.success("涓嬪彂鎴愬姛");

--
Gitblit v1.9.3