From 93c4a7420a87b7d7e2bbeeef8e6ccff0a8909a9d Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 06 五月 2022 11:42:06 +0800
Subject: [PATCH] Changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 6f3c548..a3357e5 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
@@ -9,11 +9,15 @@
import com.sandu.common.object.BaseConditionVO;
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.*;
@@ -31,6 +35,7 @@
@RequestMapping("/v1/ledPlan")
public class PlayPlanNvController {
private final PlayPlanNvService playPlanNvService;
+ private PermissionConfig permissionConfig;
@PostMapping("/add")
public ResponseVO<Object> addLEDPlan(@RequestBody @Validated PlayPlanParam param) {
@@ -53,25 +58,30 @@
}
@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) {
return ResponseUtil.success(playPlanNvService.pushToLed(plianId, playerIds));
}
@GetMapping("/listPlan")
public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- LambdaQueryWrapper<PlayPlanNv> wrapper = new LambdaQueryWrapper<>();//
- if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
- wrapper = Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getUserId, SecurityUtils.getUserId());
+ if (!permissionConfig.check(MenuEnum.PLAYPLAN_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- wrapper = Wrappers.lambdaQuery(PlayPlanNv.class);
- if (StrUtil.isNotBlank(keyword)) {
- wrapper.like(PlayPlanNv::getName, keyword);
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ LambdaQueryWrapper<PlayPlanNv> wrapper = Wrappers.lambdaQuery(PlayPlanNv.class);
+
+ if (SecurityUtils.getClientId() != null) {
+ wrapper = wrapper.eq(PlayPlanNv::getUserId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(PlayPlanNv::getClientId, SecurityUtils.getUserId());
+ });
+ }
+ if (keyword != null && !keyword.isEmpty()) {
+ wrapper = wrapper.like(PlayPlanNv::getName, keyword);
}
List<PlayPlanNv> list = playPlanNvService.list(wrapper);
- //PlayPlanParam param=new PlayPlanParam();
list.forEach(plan -> {
- plan.setPlan(JSON.parseObject(plan.getSchedule(), Map.class));
+// plan.setPlan(JSON.parseObject(plan.getSchedule(), Map.class));
+ plan.setPlan(JSON.parseArray(plan.getSchedule(), SchedulesDTO.class));
});
return ResponseUtil.successPage(list);
}
--
Gitblit v1.9.3