From e3ed5208484774c297c0278b4310dc0038d21559 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 18:21:12 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 40e45de..bdbb614 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
@@ -1,7 +1,9 @@
package com.sandu.ximon.admin.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.util.StringUtil;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.common.util.SpringContextHolder;
@@ -18,6 +20,7 @@
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
@@ -40,11 +43,16 @@
* 瀹㈡埛鍒楄〃
*/
@GetMapping("/getClientList")
- public ResponseVO<Object> getClientList() {
+ public ResponseVO<Object> getClientList(@RequestParam(required = false, value = "keyword") String keyword) {
LambdaQueryWrapper<Client> wrapper = Wrappers.lambdaQuery(Client.class);
//闈炶秴绠″彧鑳界湅鍒拌嚜宸变笅灞炵殑瀹㈡埛淇℃伅
if (SecurityUtils.getClientId() != null) {
wrapper.eq(Client::getSuperiorId, SecurityUtils.getUserId());
+ }
+ if (!StringUtil.isEmpty(keyword)) {
+ wrapper.eq(Client::getId, keyword).or(w -> {
+ w.eq(Client::getClientName, keyword);
+ });
}
List<Client> list = SpringContextHolder.getBean(ClientService.class).list(wrapper);
@@ -114,7 +122,7 @@
@GetMapping("/getLedPlayerEntityList")
public ResponseVO<Object> getLedPlayerEntityList() {
List<LedPlayerEntity> list = SpringContextHolder.getBean(LedPlayerEntityService.class).
- ledPlayerEntityList(null, null);
+ ledPlayerEntityList(null, null, null, null);
List<Map> mapList = new ArrayList<>();
Map map;
@@ -161,7 +169,7 @@
@GetMapping("/getNledProgeamList")
public ResponseVO<Object> getNledProgeamList() {
- List<LEDProgram> ledPrograms = ledProgramService.listProgram(null, null);
+ List<LEDProgram> ledPrograms = ledProgramService.listProgram(null, null, null, null);
List<Map> mapList = new ArrayList<>();
Map map;
for (LEDProgram bean : ledPrograms) {
@@ -183,7 +191,7 @@
@GetMapping("/getSledList")
public ResponseVO<Object> getSledList() {
- List<PoleLightemitEntity> poleLightemitEntities = sLedService.listLed(null, false);
+ List<PoleLightemitEntity> poleLightemitEntities = sLedService.listLed(null, null, null, false);
List<Map> mapList = new ArrayList<>();
Map map;
for (PoleLightemitEntity bean : poleLightemitEntities) {
@@ -191,8 +199,8 @@
map.put("lightemitName", bean.getLightemitName());
map.put("lightemitControlCode", bean.getLightemitControlCode());
map.put("isOnLine", bean.isOnLine());
- map.put("streetlightId", bean.getPoleId());
- map.put("streetlightName", bean.getPoleName());
+ map.put("streetlightId", bean.getStreetlightId());
+ map.put("streetlightName", bean.getStreetlightName());
mapList.add(map);
}
return ResponseUtil.success(mapList);
@@ -211,9 +219,9 @@
List<MonitorBo> monitorBos;
//瓒呯
if (SecurityUtils.getClientId() == null) {
- monitorBos = monitorMapper.listMonitorDeviceSerial1(null, null, 2,null);
+ monitorBos = monitorMapper.listMonitorDeviceSerial1(null, null, 2, null);
} else {
- monitorBos = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), null, 2,null);
+ monitorBos = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), null, 2, null);
}
List<Map> mapList = new ArrayList<>();
Map map;
--
Gitblit v1.9.3