From 3b8877b6d8c13e37f8c7769282a2751b0faeb499 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 16 五月 2022 18:30:54 +0800
Subject: [PATCH] 日志

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 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 a3357e5..543084d 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
@@ -1,29 +1,25 @@
 package com.sandu.ximon.admin.controller;
 
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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;
 import com.sandu.ximon.admin.security.SecurityUtils;
 import com.sandu.ximon.admin.service.PlayPlanNvService;
 import com.sandu.ximon.admin.vo.NovaPushResultVO;
-import com.sandu.ximon.dao.bo.SchedulesDTO;
-import com.sandu.ximon.dao.domain.Client;
 import com.sandu.ximon.dao.domain.PlayPlanNv;
-import com.sandu.ximon.dao.enums.AdministratorEnums;
 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;
 
 /**
  * @Author liuhaonan
@@ -39,27 +35,51 @@
 
     @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));
     }
 
     @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));
     }
 
     @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));
+    }
+
+
+    @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));
     }
 
     @GetMapping("/listPlan")
@@ -81,7 +101,8 @@
         List<PlayPlanNv> list = playPlanNvService.list(wrapper);
         list.forEach(plan -> {
 //            plan.setPlan(JSON.parseObject(plan.getSchedule(), Map.class));
-            plan.setPlan(JSON.parseArray(plan.getSchedule(), SchedulesDTO.class));
+            plan.setPlan(JSON.parseObject(plan.getSchedules(), List.class));
+//            plan.setPlan(JSON.parseArray(plan.getSchedule(), SchedulesDTO.class));
         });
         return ResponseUtil.successPage(list);
     }

--
Gitblit v1.9.3