From 33ecbd69aca2ccc58d47f467f3f7266b37fa9dfc Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 18:44:38 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java
index 616be99..c00752e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java
@@ -74,12 +74,12 @@
private final PoleMapper poleMapper;
@GetMapping("/getPoleList")
- public ResponseVO<Object> getPoleList() {
+ public ResponseVO<Object> getPoleList(@RequestParam(required = false, value = "keyword") String keyword) {
List<Pole> poleList;
if (SecurityUtils.getClientId() == null) {
- poleList = poleMapper.queryPoleOnLineStatesList(null, null, null, null, null, null);
+ poleList = poleMapper.getPoleListOnBinding(null, keyword);
} else {
- poleList = poleMapper.queryPoleOnLineStatesList(SecurityUtils.getUserId(), null, null, null, null, null);
+ poleList = poleMapper.getPoleListOnBinding(SecurityUtils.getUserId(), keyword);
}
List<Map> mapList = new ArrayList<>();
@@ -99,8 +99,8 @@
private final LightMapper lightMapper;
@GetMapping("/getLightList")
- public ResponseVO<Object> getLightList() {
- List<LightBo> listLight = lightMapper.listLight(SecurityUtils.getClientId(), null);
+ public ResponseVO<Object> getLightList(@RequestParam(required = false, value = "keyword") String keyword) {
+ List<LightBo> listLight = lightMapper.listLightOnBinding(SecurityUtils.getClientId(), keyword);
List<Map> mapList = new ArrayList<>();
@@ -120,9 +120,9 @@
* NLED鍒楄〃(璇虹摝璁惧)
*/
@GetMapping("/getLedPlayerEntityList")
- public ResponseVO<Object> getLedPlayerEntityList() {
+ public ResponseVO<Object> getLedPlayerEntityList(@RequestParam(required = false, value = "keyword") String keyword) {
List<LedPlayerEntity> list = SpringContextHolder.getBean(LedPlayerEntityService.class).
- ledPlayerEntityList(null, null, null, null);
+ ledPlayerEntityListOnBinding(keyword);
List<Map> mapList = new ArrayList<>();
Map map;
@@ -168,8 +168,8 @@
private final LEDProgramService ledProgramService;
@GetMapping("/getNledProgeamList")
- public ResponseVO<Object> getNledProgeamList() {
- List<LEDProgram> ledPrograms = ledProgramService.listProgram(null, null, null, null);
+ public ResponseVO<Object> getNledProgeamList(@RequestParam(required = false, value = "keyword") String keyword) {
+ List<LEDProgram> ledPrograms = ledProgramService.listProgramOnBinding(keyword);
List<Map> mapList = new ArrayList<>();
Map map;
for (LEDProgram bean : ledPrograms) {
@@ -190,8 +190,8 @@
private final PoleLightemitService sLedService;
@GetMapping("/getSledList")
- public ResponseVO<Object> getSledList() {
- List<PoleLightemitEntity> poleLightemitEntities = sLedService.listLed(null, null, null, false);
+ public ResponseVO<Object> getSledList(@RequestParam(required = false, value = "keyword") String keyword) {
+ List<PoleLightemitEntity> poleLightemitEntities = sLedService.listLedOnBinding(keyword);
List<Map> mapList = new ArrayList<>();
Map map;
for (PoleLightemitEntity bean : poleLightemitEntities) {
--
Gitblit v1.9.3