From d49863c81167ceb4b66c69c8be0e87319149c3b9 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 27 五月 2022 17:22:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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..383d07a 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
@@ -114,7 +114,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 +161,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 +183,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 +191,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 +211,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