From f04802851ffecf0e85b30f4ea7b73da5fbdbf188 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 27 五月 2022 15:52:23 +0800
Subject: [PATCH] 排序
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java | 219 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 155 insertions(+), 64 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 50b4fa7..930b884 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
@@ -9,12 +9,12 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
+import com.sandu.ximon.dao.bo.LightBo;
import com.sandu.ximon.dao.bo.MonitorBo;
-import com.sandu.ximon.dao.domain.Client;
-import com.sandu.ximon.dao.domain.IpVolumeFile;
-import com.sandu.ximon.dao.domain.LEDProgram;
-import com.sandu.ximon.dao.domain.PoleLightemitEntity;
+import com.sandu.ximon.dao.domain.*;
+import com.sandu.ximon.dao.mapper.LightMapper;
import com.sandu.ximon.dao.mapper.MonitorMapper;
+import com.sandu.ximon.dao.mapper.PoleMapper;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -60,95 +60,127 @@
return ResponseUtil.success(mapList);
}
-
/**
- * 鎽勫儚澶村垪琛�
- *
- * @return
+ * 鐏潌鍒楄〃
*/
- private final MonitorMapper monitorMapper;
+ private final PoleMapper poleMapper;
- @GetMapping("/getMonitorList")
- public ResponseVO<Object> getMonitorList() {
- List<MonitorBo> monitorBos;
- //瓒呯
+ @GetMapping("/getPoleList")
+ public ResponseVO<Object> getPoleList() {
+ List<Pole> poleList;
if (SecurityUtils.getClientId() == null) {
- monitorBos = monitorMapper.listMonitorDeviceSerial1(null, null, 2);
+ poleList = poleMapper.queryPoleOnLineStatesList(null, null, null, null, null);
} else {
- monitorBos = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), null, 2);
+ poleList = poleMapper.queryPoleOnLineStatesList(SecurityUtils.getUserId(), null, null, null, null);
}
+
List<Map> mapList = new ArrayList<>();
Map map;
- for (MonitorBo bean : monitorBos) {
+ for (Pole bean : poleList) {
map = new LinkedHashMap();
map.put("id", bean.getId());
- map.put("deviceSerial", bean.getDeviceSerial());
+ map.put("poleName", bean.getPoleName());
+ mapList.add(map);
+ }
+ return ResponseUtil.success(mapList);
+ }
+
+ /**
+ * 璺伅鍒楄〃
+ */
+ private final LightMapper lightMapper;
+
+ @GetMapping("/getLightList")
+ public ResponseVO<Object> getLightList() {
+ List<LightBo> listLight = lightMapper.listLight(SecurityUtils.getClientId(), null);
+
+
+ List<Map> mapList = new ArrayList<>();
+ Map map;
+ for (LightBo bean : listLight) {
+ map = new LinkedHashMap();
+ map.put("id", bean.getLightId());
+ map.put("deviceCode", bean.getDeviceCode());
map.put("poleId", bean.getPoleId());
map.put("poleName", bean.getPoleName());
- map.put("note", bean.getNote());
mapList.add(map);
}
return ResponseUtil.success(mapList);
}
-
- private final IpVolumeFileService ipVolumeFileService;
-
/**
- * 闊虫煴骞挎挱绱犳潗鍒楄〃
- *
- * @return
+ * NLED鍒楄〃(璇虹摝璁惧)
*/
- @GetMapping("/getIpFileList")
- public ResponseVO<Object> getIpFileList() {
- List<IpVolumeFile> ipVolumeFiles = ipVolumeFileService.listFiles();
+ @GetMapping("/getLedPlayerEntityList")
+ public ResponseVO<Object> getLedPlayerEntityList() {
+ List<LedPlayerEntity> list = SpringContextHolder.getBean(LedPlayerEntityService.class).
+ ledPlayerEntityList(null, null);
+
List<Map> mapList = new ArrayList<>();
Map map;
- for (IpVolumeFile bean : ipVolumeFiles) {
+ for (LedPlayerEntity bean : list) {
map = new LinkedHashMap();
map.put("id", bean.getId());
- map.put("fileName", bean.getFileName());
- mapList.add(map);
- }
- return ResponseUtil.success(mapList);
- }
-
- private final IpVolumeService ipVolumeService;
-
- /**
- * 闊虫煴鍒楄〃
- *
- * @return
- */
- @GetMapping("/getIpVolumeList")
- public ResponseVO<Object> getIpVolumeList() {
- BroadcastTerminalV2Param param = new BroadcastTerminalV2Param();
- param.setBindingState(2);
- param.setKeyword(null);
- param.setWorkState(2);
- List<BroadcastTerminalV2EntityBo> broadcastTerminalList = ipVolumeService.getBroadcastTerminalList(null, param);
- List<Map> mapList = new ArrayList<>();
- Map map;
- for (BroadcastTerminalV2EntityBo bean : broadcastTerminalList) {
- map = new LinkedHashMap();
- map.put("id", bean.getId());
- map.put("terminalName", bean.getTerminalName());
- map.put("status", bean.getStatus());
+ map.put("name", bean.getName());
+ map.put("playerName", bean.getPlayerName());
+ map.put("sn", bean.getSn());
map.put("poleId", bean.getPoleId());
- map.put("PoleName", bean.getPoleName());
+ map.put("poleName", bean.getPoleName());
+ map.put("onlineStatus", bean.getOnlineStatus());
mapList.add(map);
}
return ResponseUtil.success(mapList);
}
+ /**
+ * NLED鏂囦欢鍒楄〃
+ */
+ @GetMapping("/getLedFilesList")
+ public ResponseVO<Object> getLedFilesList() {
+ List<LedSFile> list = SpringContextHolder.getBean(LedSFileService.class).list();
- private final PoleLightemitService sLedService;
+ List<Map> mapList = new ArrayList<>();
+ Map map;
+ for (LedSFile bean : list) {
+ map = new LinkedHashMap();
+ map.put("fileId", bean.getFileId());
+ map.put("fileType", bean.getFileType());
+ map.put("fileUrl", bean.getFileUrl());
+ map.put("fileSize", bean.getFileSize());
+ mapList.add(map);
+ }
+ return ResponseUtil.success(mapList);
+ }
+
+ /**
+ * NLED鑺傜洰鍒楄〃
+ *
+ * @return
+ */
+ private final LEDProgramService ledProgramService;
+
+ @GetMapping("/getNledProgeamList")
+ public ResponseVO<Object> getNledProgeamList() {
+ List<LEDProgram> ledPrograms = ledProgramService.listProgram(null, null);
+ List<Map> mapList = new ArrayList<>();
+ Map map;
+ for (LEDProgram bean : ledPrograms) {
+ map = new LinkedHashMap();
+ map.put("id", bean.getId());
+ map.put("name", bean.getName());
+ mapList.add(map);
+ }
+ return ResponseUtil.success(mapList);
+ }
+
/**
* SLED鍒楄〃
*
* @return
*/
+ private final PoleLightemitService sLedService;
+
@GetMapping("/getSledList")
public ResponseVO<Object> getSledList() {
List<PoleLightemitEntity> poleLightemitEntities = sLedService.listLed(null, false);
@@ -166,24 +198,83 @@
return ResponseUtil.success(mapList);
}
- private final LEDProgramService ledProgramService;
/**
- * NLED鑺傜洰鍒楄〃
+ * 鎽勫儚澶村垪琛�
+ *
* @return
*/
- @GetMapping("/getNledProgeamList")
- public ResponseVO<Object> getNledProgeamList() {
- List<LEDProgram> ledPrograms = ledProgramService.listProgram(null, null);
+ private final MonitorMapper monitorMapper;
+
+ @GetMapping("/getMonitorList")
+ public ResponseVO<Object> getMonitorList() {
+ List<MonitorBo> monitorBos;
+ //瓒呯
+ if (SecurityUtils.getClientId() == null) {
+ monitorBos = monitorMapper.listMonitorDeviceSerial1(null, null, 2,null);
+ } else {
+ monitorBos = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), null, 2,null);
+ }
List<Map> mapList = new ArrayList<>();
Map map;
- for (LEDProgram bean : ledPrograms) {
+ for (MonitorBo bean : monitorBos) {
map = new LinkedHashMap();
map.put("id", bean.getId());
- map.put("name", bean.getName());
+ map.put("deviceSerial", bean.getDeviceSerial());
+ map.put("poleId", bean.getPoleId());
+ map.put("poleName", bean.getPoleName());
+ map.put("note", bean.getNote());
mapList.add(map);
}
return ResponseUtil.success(mapList);
}
+
+ /**
+ * 闊虫煴鍒楄〃
+ */
+ private final IpVolumeService ipVolumeService;
+
+ @GetMapping("/getIpVolumeList")
+ public ResponseVO<Object> getIpVolumeList() {
+ BroadcastTerminalV2Param param = new BroadcastTerminalV2Param();
+ param.setBindingState(2);
+ param.setKeyword(null);
+ param.setWorkState(2);
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalList = ipVolumeService.getBroadcastTerminalList(null, null, null, param);
+ List<Map> mapList = new ArrayList<>();
+ Map map;
+ for (BroadcastTerminalV2EntityBo bean : broadcastTerminalList) {
+ map = new LinkedHashMap();
+ map.put("id", bean.getId());
+ map.put("terminalName", bean.getTerminalName());
+ map.put("status", bean.getStatus());
+ map.put("poleId", bean.getPoleId());
+ map.put("PoleName", bean.getPoleName());
+ mapList.add(map);
+ }
+ return ResponseUtil.success(mapList);
+ }
+
+
+ /**
+ * 闊虫煴骞挎挱绱犳潗鍒楄〃
+ */
+ private final IpVolumeFileService ipVolumeFileService;
+
+ @GetMapping("/getIpFileList")
+ public ResponseVO<Object> getIpFileList() {
+ List<IpVolumeFile> ipVolumeFiles = ipVolumeFileService.listFiles();
+ List<Map> mapList = new ArrayList<>();
+ Map map;
+ for (IpVolumeFile bean : ipVolumeFiles) {
+ map = new LinkedHashMap();
+ map.put("id", bean.getId());
+ map.put("fileName", bean.getFileName());
+ mapList.add(map);
+ }
+ return ResponseUtil.success(mapList);
+ }
+
+
}
--
Gitblit v1.9.3