From 10c4bb6cd7ca168872638d7630f3d885edd34500 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 15 六月 2022 17:34:42 +0800
Subject: [PATCH] 大气数据历史

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java |   68 ++++++++++++++++++++++++++++-----
 1 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
index 6734851..5dfd343 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
@@ -6,7 +6,6 @@
 import com.github.pagehelper.PageHelper;
 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.param.PlayPlanParam;
 import com.sandu.ximon.admin.security.PermissionConfig;
@@ -14,6 +13,8 @@
 import com.sandu.ximon.admin.service.PlayPlanNvService;
 import com.sandu.ximon.admin.vo.NovaPushResultVO;
 import com.sandu.ximon.dao.domain.PlayPlanNv;
+import com.sandu.ximon.dao.enums.MenuEnum;
+import com.sandu.ximon.dao.enums.OrderByEnums;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -32,48 +33,93 @@
     private final PlayPlanNvService playPlanNvService;
     private PermissionConfig permissionConfig;
 
-    @AnonymousAccess
     @PostMapping("/add")
     public ResponseVO<Object> addLEDPlan(@RequestBody @Validated PlayPlanParam param) {
+        if (!permissionConfig.check(MenuEnum.LED_N_PLAY_PLAN_ADD.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(playPlanNvService.addPlan(param));
     }
 
-    @AnonymousAccess
     @GetMapping("/getByPlanId/{planId}")
     public ResponseVO<Object> getPlan(@PathVariable Long planId) {
+        if (!permissionConfig.check(MenuEnum.LED_N_PLAY_PLAN_DETAIL.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(playPlanNvService.getByPlanId(planId));
     }
 
     @PostMapping("/update/{planId}")
     public ResponseVO<Object> updateLEDPlan(@PathVariable Long planId, @RequestBody @Validated PlayPlanParam param) {
+        if (!permissionConfig.check(MenuEnum.LED_N_PLAY_PLAN_UPDATE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(playPlanNvService.updatePlan(planId, param));
     }
 
     @PostMapping("/delete")
     public ResponseVO<Object> deleteLEDPlan(@RequestBody List<Long> plianIds) {
+        if (!permissionConfig.check(MenuEnum.LED_N_PLAY_PLAN_DETELE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(playPlanNvService.deletePlan(plianIds));
     }
 
-    @AnonymousAccess
     @PostMapping(value = "/push/{plianId}", produces = "application/json;charset=UTF-8")
     public ResponseVO<Object> pushToLed(@PathVariable Long plianId, @RequestBody List<NovaPushResultVO> playerIds) {
+        if (!permissionConfig.check(MenuEnum.LED_N_PLAY_PLAN_PUSH.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(playPlanNvService.pushToLed(plianId, playerIds));
     }
 
 
-    @AnonymousAccess
     @PostMapping(value = "/pushSchedule/{planId}", produces = "application/json;charset=UTF-8")
     public ResponseVO<Object> pushSchedule(@PathVariable Long planId, @RequestBody List<NovaPushResultVO> playerIds) {
+        if (!permissionConfig.check(MenuEnum.LED_N_PLAY_PLAN_PUSH_SCHEDULE.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
         return ResponseUtil.success(playPlanNvService.pushSchedule(planId, playerIds));
     }
 
-    @AnonymousAccess
     @GetMapping("/listPlan")
-    public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
-//        if (!permissionConfig.check(MenuEnum.PLAYPLAN_LIST.getCode())) {
-//            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
-//        }
-        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+    public ResponseVO<Object> list(BaseConditionVO baseConditionVO,
+                                   @RequestParam(value = "order", required = false) Integer order,
+                                   @RequestParam(value = "seq", required = false) Integer seq,
+                                   @RequestParam(value = "keyword", required = false) String keyword) {
+        if (!permissionConfig.check(MenuEnum.PLAYPLAN_LIST.getCode())) {
+            return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+        }
+        //鎺掑簭瀛楁
+        String orderByResult = "id";
+        //姝e簭銆佸�掑彊
+        String orderBySeq = OrderByEnums.ASC.getCode();
+        if (order != null) {
+            switch (order) {
+                case 1:
+                    orderByResult = OrderByEnums.LED_N_PLAY_PLAN_CREATE_TIME.getCode();
+                    break;
+                default:
+            }
+        }
+        if (seq != null) {
+            switch (seq) {
+                case 1:
+                    orderBySeq = " ASC";
+                    break;
+                case 2:
+                    orderBySeq = " DESC";
+                    break;
+                default:
+                    break;
+            }
+        }
+        //鎺掑簭鏂瑰紡
+        String orderBy = orderByResult + " " + orderBySeq;
+
+        if (baseConditionVO != null) {
+            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+        }
         LambdaQueryWrapper<PlayPlanNv> wrapper = Wrappers.lambdaQuery(PlayPlanNv.class);
 
         if (SecurityUtils.getClientId() != null) {

--
Gitblit v1.9.3