From 9dd4f3549911f1253ccd9b934e8a5a90a7b2ce8c Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 28 四月 2022 18:24:56 +0800
Subject: [PATCH] 大气数据推送到LED

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 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 fbcd48e..27e5a79 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
@@ -3,15 +3,20 @@
 import com.sandu.common.domain.ResponseVO;
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
+import com.sandu.ximon.admin.dto.LightTaskDto;
 import com.sandu.ximon.admin.param.LightTaskDelParam;
+import com.sandu.ximon.admin.param.LightTaskIssueParam;
 import com.sandu.ximon.admin.param.LightTaskParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
 import com.sandu.ximon.admin.service.LightTaskService;
 import com.sandu.ximon.dao.domain.LightTask;
+import com.sandu.ximon.dao.enums.MenuEnum;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 璺伅浠诲姟鐩稿叧鎺у埗绫�
@@ -24,7 +29,7 @@
 public class LightTaskController {
 
     private final LightTaskService lightTaskService;
-
+    private PermissionConfig permissionConfig;
 
     @PostMapping("/add")
     public ResponseVO<Object> addLightTask(@RequestBody @Validated LightTaskParam param) {
@@ -38,7 +43,10 @@
 
     @GetMapping("/list")
     public ResponseVO<Object> listLightTask(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword) {
-        List<LightTask> taskList = lightTaskService.listLightTask(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword);
+        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+        List<LightTaskDto> taskList = lightTaskService.listLightTask(conditionVO, keyword);
         return ResponseUtil.successPage(taskList);
     }
 
@@ -61,4 +69,20 @@
             return ResponseUtil.fail("缂栬緫澶辫触");
         }
     }
+
+    @GetMapping("/{taskId}")
+    public ResponseVO<Object> detailLightTask(@PathVariable Long taskId) {
+        Map<Object, Object> objectObjectMap = lightTaskService.detailLightTask(taskId);
+        return ResponseUtil.success(objectObjectMap);
+    }
+
+    @PostMapping("/issue")
+    public ResponseVO<Object> issueLightTask(@RequestBody @Validated LightTaskIssueParam param) {
+        boolean result = lightTaskService.issueLightTask(param);
+        if (result) {
+            return ResponseUtil.success("涓嬪彂鎴愬姛");
+        } else {
+            return ResponseUtil.fail("涓嬪彂澶辫触");
+        }
+    }
 }

--
Gitblit v1.9.3