From 14ce780fb9977acad2b6dabf9033635b076f590b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期六, 07 五月 2022 14:49:12 +0800
Subject: [PATCH] Changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java | 15 ++++++++-------
1 files changed, 8 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..0cce77d 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,26 @@
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.bo.SchedulesDTO;
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
@@ -55,8 +54,9 @@
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) {
return ResponseUtil.success(playPlanNvService.pushToLed(plianId, playerIds));
}
@@ -73,12 +73,13 @@
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.parseArray(plan.getSchedule(), SchedulesDTO.class));
});
return ResponseUtil.successPage(list);
}
--
Gitblit v1.9.3