From b34d941094d11e21e21a2ceead8a9fdeee640e2d Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 27 五月 2022 11:20:55 +0800
Subject: [PATCH] 列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java | 101 +++++++++++++++++++++++++++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java | 16 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java | 10 ---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java | 18 ++++++
4 files changed, 133 insertions(+), 12 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 d6a1395..50b4fa7 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
@@ -5,10 +5,15 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.common.util.SpringContextHolder;
+import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.admin.service.ClientService;
+import com.sandu.ximon.admin.service.*;
+import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
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.mapper.MonitorMapper;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
@@ -87,4 +92,98 @@
}
+ private final IpVolumeFileService ipVolumeFileService;
+
+ /**
+ * 闊虫煴骞挎挱绱犳潗鍒楄〃
+ *
+ * @return
+ */
+ @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);
+ }
+
+ 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("poleId", bean.getPoleId());
+ map.put("PoleName", bean.getPoleName());
+ mapList.add(map);
+ }
+ return ResponseUtil.success(mapList);
+ }
+
+
+ private final PoleLightemitService sLedService;
+
+ /**
+ * SLED鍒楄〃
+ *
+ * @return
+ */
+ @GetMapping("/getSledList")
+ public ResponseVO<Object> getSledList() {
+ List<PoleLightemitEntity> poleLightemitEntities = sLedService.listLed(null, false);
+ List<Map> mapList = new ArrayList<>();
+ Map map;
+ for (PoleLightemitEntity bean : poleLightemitEntities) {
+ map = new LinkedHashMap();
+ 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());
+ mapList.add(map);
+ }
+ return ResponseUtil.success(mapList);
+ }
+
+ private final LEDProgramService ledProgramService;
+
+ /**
+ * NLED鑺傜洰鍒楄〃
+ * @return
+ */
+ @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);
+ }
+
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
index cc8f0ff..c2207e4 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
@@ -1,14 +1,11 @@
package com.sandu.ximon.admin.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.LEDProgramParam;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.LEDProgramService;
-import com.sandu.ximon.dao.domain.LEDProgram;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -63,12 +60,7 @@
if (!permissionConfig.check(MenuEnum.LED_PROGRAM_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- LambdaQueryWrapper<LEDProgram> wrapper = ledProgramService.listProgram();
- if (keyword != null && !keyword.isEmpty()) {
- wrapper.like(LEDProgram::getName, keyword);
- }
- return ResponseUtil.successPage(ledProgramService.list(wrapper));
+ return ResponseUtil.successPage(ledProgramService.listProgram(baseConditionVO, keyword));
}
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
index eed7f5a..36561b4 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
@@ -21,6 +21,8 @@
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
+import java.util.List;
+
/**
* @Author liuhaonan
* @Date 2021/12/16 10:48
@@ -107,6 +109,22 @@
return wrapper;
}
+ public List<IpVolumeFile> listFiles() {
+ LambdaQueryWrapper<IpVolumeFile> wrapper = Wrappers.lambdaQuery(IpVolumeFile.class);
+
+ //涓嶆槸瓒呯
+ if (SecurityUtils.getClientId() != null) {
+ wrapper = wrapper.eq(IpVolumeFile::getClientId, SecurityUtils.getUserId())
+ .or(file -> {
+ file.eq(IpVolumeFile::getUserId, SecurityUtils.getUserId());
+ });
+ }
+ return list(wrapper);
+ }
+
+
+
+
/**
* 鏂囦欢涓婁紶
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
index ee80711..7fab106 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
@@ -3,7 +3,9 @@
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.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.LEDProgramParam;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -12,7 +14,6 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
import java.util.List;
@Service
@@ -79,8 +80,19 @@
return param;
}
+ public List<LEDProgram> listProgram(BaseConditionVO baseConditionVO, String keyword) {
+ LambdaQueryWrapper<LEDProgram> wrapper = listPrograms();
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
+ if (keyword != null && !keyword.isEmpty()) {
+ wrapper.like(LEDProgram::getName, keyword);
+ }
+ return list(wrapper);
+ }
- public LambdaQueryWrapper<LEDProgram> listProgram() {
+
+ public LambdaQueryWrapper<LEDProgram> listPrograms() {
if (SecurityUtils.getClientId() == null) {
return Wrappers.lambdaQuery(LEDProgram.class);
} else {
--
Gitblit v1.9.3