From 2c52eaf28f9b8a666547e1307a76c3032598e57f Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 11 五月 2022 16:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 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 14351f3..2290424 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,27 +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.dao.domain.Client;
+import com.sandu.ximon.admin.vo.NovaPushResultVO;
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
@@ -35,31 +33,60 @@
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<String> playerIds) {
+ 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())) {
@@ -73,12 +100,14 @@
w.eq(PlayPlanNv::getClientId, SecurityUtils.getUserId());
});
}
- if (!keyword.isEmpty()) {
+ if (keyword != null && !keyword.isEmpty()) {
wrapper = wrapper.like(PlayPlanNv::getName, keyword);
}
List<PlayPlanNv> list = playPlanNvService.list(wrapper);
list.forEach(plan -> {
- plan.setPlan(JSON.parseObject(plan.getSchedule(), Map.class));
+// plan.setPlan(JSON.parseObject(plan.getSchedule(), Map.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