From f736df1648a4d9bb8620d38cf4421cf36eacdfc0 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 04 三月 2022 14:37:39 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java | 5
ximon-admin/src/main/java/com/sandu/ximon/admin/param/PoleStatesParam.java | 36 +++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java | 25 +++-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 176 ++++++++++++++++++++++++++++++++++-
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 24 +---
6 files changed, 238 insertions(+), 30 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
index 59bfa62..aaeb3d5 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
@@ -38,8 +38,8 @@
@GetMapping("/list")
public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword){
- // PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
LambdaQueryWrapper<IpVolumeFile> wrapper = ipVolumeFileService.listFile(baseConditionVO, keyword);
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
/* if (null != keyword) {
wrapper.like(IpVolumeFile::getFileName, keyword);
}*/
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
index d6cf828..5bfeea4 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
@@ -13,6 +13,7 @@
import com.sandu.ximon.admin.param.PoleBindParam;
import com.sandu.ximon.admin.param.PoleBindingParam;
import com.sandu.ximon.admin.param.PoleParam;
+import com.sandu.ximon.admin.param.PoleStatesParam;
import com.sandu.ximon.admin.service.AirEquipmentService;
import com.sandu.ximon.admin.service.MonitorService;
import com.sandu.ximon.admin.service.PoleService;
@@ -55,25 +56,18 @@
return ResponseUtil.success(poleService.deletePole(poleId));
}
- @GetMapping("/list")
- public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ @GetMapping("/listPoleAndState")//鍙互鏁村悎//宸叉暣鍚� 寮冪敤
+ public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO, @RequestBody PoleStatesParam param) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- LambdaQueryWrapper<Pole> wrapper = Wrappers.lambdaQuery(Pole.class).orderByDesc(Pole::getId);
- if (StrUtil.isNotBlank(keyword)) {
- wrapper.like(Pole::getPoleCode, keyword)
- .or(lampPostLambdaQueryWrapper -> {
- lampPostLambdaQueryWrapper.like(Pole::getPoleName, keyword);
- });
- }
- List<Pole> list = poleService.list(wrapper);
- return ResponseUtil.successPage(list);
+ List<Pole> poles = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(),param);
+ return ResponseUtil.success(poles);
}
- @GetMapping("/listPoleAndState")
- public ResponseVO<Object> listPoleAndState(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ @GetMapping("/list")
+ public ResponseVO<Object> listPoleAndState(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "groupid", required = false) Long groupid) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
-
- List<Pole> poles = poleService.queryStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ List<Pole> poles = poleService.queryStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(),keyword,groupid);
return ResponseUtil.successPage(poles);
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java
index 04365ab..63f3cbf 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java
@@ -41,9 +41,10 @@
}
@GetMapping("/list")
- public ResponseVO<Object> listGroup(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ public ResponseVO<Object> listGroup(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "groupid", required = false) Long groupid) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- return ResponseUtil.success(poleGroupService.groupList(baseConditionVO,keyword));
+ return ResponseUtil.success(poleGroupService.groupList(baseConditionVO,keyword,groupid));
}
@PostMapping("/bind/{groupId}")
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/PoleStatesParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/PoleStatesParam.java
new file mode 100644
index 0000000..621127d
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/PoleStatesParam.java
@@ -0,0 +1,36 @@
+package com.sandu.ximon.admin.param;
+
+import lombok.Data;
+
+/**
+ * @Author liuhaonan
+ * @Date 2022/3/3 17:50
+ * @Version 1.0
+ */
+@Data
+public class PoleStatesParam {
+
+ /**
+ * 鍒嗙粍id
+ */
+ private Long groupid;
+
+ private String keyword;
+
+ /**
+ * 鍦ㄧ嚎鐘舵�� 0鍦ㄧ嚎/1绂荤嚎/2鍏ㄩ儴
+ */
+ private Integer onLineStates;
+
+ /**
+ * 缁戝畾鐘舵�� 0宸茬粦瀹�/1鏈粦瀹�/2鍏ㄩ儴
+ */
+ private Integer bingStates;
+
+ /**
+ * 鐏潌灞炴�� 0瀹炰綋鐏潌/1铏氭嫙鐏潌/2鍏ㄩ儴
+ */
+ private Integer isTrue;
+
+
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java
index f230f0a..5717982 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.service;
+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;
@@ -8,10 +9,12 @@
import com.sandu.ximon.admin.param.PoleGroupParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.PoleGroup;
+import com.sandu.ximon.dao.domain.PoleGroupRelation;
import com.sandu.ximon.dao.mapper.PoleGroupMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -27,10 +30,9 @@
public boolean addGroup(PoleGroupParam param) {
PoleGroup group = new PoleGroup();
- if(SecurityUtils.getClientId()!=null){
+ if (SecurityUtils.getClientId() != null) {
group.setClientId(SecurityUtils.getUserId());
}
-
group.setGroupName(param.getGroupName());
return save(group);
}
@@ -54,24 +56,33 @@
return removeById(groupId);
}
- public List<PoleGroup> groupList(BaseConditionVO baseConditionVO,String keyword) {
+ public List<PoleGroup> groupList(BaseConditionVO baseConditionVO, String keyword, Long groupid) {
Long clientId = SecurityUtils.getClientId();
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+
+// LambdaQueryWrapper<PoleGroup> wrapper = new LambdaQueryWrapper<>();
+ List<PoleGroup> list = new ArrayList<>();
if (clientId == null) {
- return list(Wrappers.lambdaQuery(PoleGroup.class).like(PoleGroup::getGroupName,keyword));
+ list = list(Wrappers.lambdaQuery(PoleGroup.class).like(PoleGroup::getGroupName, keyword));
+
} else {
- return list(Wrappers.lambdaQuery(PoleGroup.class).eq(PoleGroup::getClientId, clientId).like(PoleGroup::getGroupName,keyword));
+ list = list(Wrappers.lambdaQuery(PoleGroup.class).eq(PoleGroup::getClientId, clientId).like(PoleGroup::getGroupName, keyword));
}
+ list.forEach(poleGroup -> {
+// int size = poleGroupRelationService.list(Wrappers.lambdaQuery(PoleGroupRelation.class).eq(PoleGroupRelation::getPoleGroupId, poleGroup.getGroupId())).size();
+ poleGroup.setPoleCount(poleGroupRelationService.list(Wrappers.lambdaQuery(PoleGroupRelation.class).eq(PoleGroupRelation::getPoleGroupId, poleGroup.getGroupId())).size());
+ });
+ return list;
}
/**
* 缁戝畾鐏潌
*/
- public boolean bindPole(Long groupId,List<Long> poleIdList) {
+ public boolean bindPole(Long groupId, List<Long> poleIdList) {
PoleGroup poleGroup = getById(groupId);
if (poleGroup == null) {
throw new BusinessException("鏈壘鍒拌鍒嗙粍");
}
- return poleGroupRelationService.saveBinding(groupId,poleIdList);
+ return poleGroupRelationService.saveBinding(groupId, poleIdList);
}
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index b64c155..8a50bbb 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -4,6 +4,7 @@
import cn.hutool.core.util.StrUtil;
import com.aliyuncs.iot.model.v20180120.BatchGetDeviceStateResponse;
import com.aliyuncs.iot.model.v20180120.QueryDeviceDetailResponse;
+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;
@@ -27,9 +28,12 @@
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.PoleBindingParam;
import com.sandu.ximon.admin.param.PoleParam;
+import com.sandu.ximon.admin.param.PoleStatesParam;
import com.sandu.ximon.admin.redis.LightKey;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.Pole;
+import com.sandu.ximon.dao.domain.PoleBinding;
+import com.sandu.ximon.dao.domain.PoleGroupRelation;
import com.sandu.ximon.dao.mapper.PoleMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -55,6 +59,7 @@
private final RedisService redisService;
private final PoleBindingService poleBindingService;
+ private final PoleGroupRelationService groupRelationService;
public boolean addPole(PoleParam param) {
Pole pole = new Pole();
@@ -105,22 +110,178 @@
}
+ public List<Pole> queryAllStatesAndList(Integer pageNo, Integer pageSize, PoleStatesParam param) {
+ // List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class).eq(LampPost::getClientId, SecurityUtils.getUserId()));
+ //List<Pole> list = list(Wrappers.lambdaQuery(Pole.class));
+// PageHelper.startPage(pageNo, pageSize);
+ List<Pole> list = new ArrayList<>();
+ LambdaQueryWrapper<Pole> wrapper = new LambdaQueryWrapper<>();
+ if (SecurityUtils.getClientId() == null) {
+ wrapper = Wrappers.lambdaQuery(Pole.class);
+ } else {
+ wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId());
+ }
+ if (!param.getKeyword().isEmpty()) {
+ wrapper.like(Pole::getPoleCode, param.getKeyword()).or(
+ wrappers -> {
+ wrappers.like(Pole::getPoleName, param.getKeyword());
+ }
+ );
+ }
+
+ list = list(wrapper);
+ List<Pole> bindList = new ArrayList<>();//宸茬粦瀹氬鎴�
+ List<Pole> unbindList = new ArrayList<>();//鏈粦瀹氬鎴�
+ List<Pole> isTrue = new ArrayList<>();//瀹炰綋鐏潌
+ List<Pole> isFalse = new ArrayList<>();//铏氭嫙鐏潌
+ List<Pole> online = new ArrayList<>();//鍦ㄧ嚎
+ List<Pole> offline = new ArrayList<>();//绂荤嚎
+ if (param.getGroupid() != null) {
+ // List<Long> poleIds = new ArrayList<>();
+ List<Pole> pole = new ArrayList<>();
+ List<PoleGroupRelation> relations = groupRelationService.list(Wrappers.lambdaQuery(PoleGroupRelation.class)
+ .eq(PoleGroupRelation::getPoleGroupId, param.getGroupid()));
+ relations.forEach(relation -> {
+ pole.add(getById(relation.getPoleId()));
+ }
+ );
+ list = pole;
+ }
+
+ list.forEach(bindwarpper -> {
+// Long clientId = bindwarpper.getClientId();
+ if (bindwarpper.getClientId() == null) {//鍒ゆ柇鏄惁缁戝畾
+ unbindList.add(bindwarpper);
+ if (bindwarpper.getDeviceCode() == null) {//鍒ゆ柇鐏潌绫诲瀷
+ isFalse.add(bindwarpper);
+ } else {
+ isTrue.add(bindwarpper);
+ }
+ } else {
+ bindList.add(bindwarpper);
+ if (bindwarpper.getDeviceCode() == null) {
+ isFalse.add(bindwarpper);
+ } else {
+ isTrue.add(bindwarpper);
+ }
+ }
+ });
+ if (param.getBingStates() == 1) { //鏈粦瀹�
+ list = unbindList;
+ } else if (param.getBingStates() == 0) {//宸茬粦瀹�
+ list = bindList;
+ }// else {//鍏ㄩ儴
+// list = list(wrapper);
+// }
+
+ setOnline(list);
+ if (param.getIsTrue() == 1) { //铏氭嫙鐏潌
+ list = isFalse;
+ } else if (param.getIsTrue() == 0) {//瀹炰綋鐏潌
+ list = isTrue;
+ list.forEach(onLinePole -> {
+// System.out.println("online-----------------------"+onLinePole.getOnLineState());
+ if (("ONLINAE").equals(onLinePole.getOnLineState())) {
+ online.add(onLinePole);
+ } else if (("OFFLINE").equals(onLinePole.getOnLineState())) {
+ offline.add(onLinePole);
+ }
+ });
+ } else {//鍏ㄩ儴
+ // setOnline(list);
+ list.forEach(onLinePole -> {
+// System.out.println("online-----------------------"+onLinePole.getOnLineState());
+ if (("ONLINE").equals(onLinePole.getOnLineState())) {
+ online.add(onLinePole);
+ } else if (("OFFLINE").equals(onLinePole.getOnLineState())) {
+ offline.add(onLinePole);
+ }
+ });
+ }
+
+ if (param.getOnLineStates() == 1) { //绂荤嚎
+ list = offline;
+ } else if (param.getOnLineStates() == 0) {//鍦ㄧ嚎
+ list = online;
+ }
+ setCount(list);
+ return list;
+ }
+
+ /**
+ * 璁剧疆缁戝畾璁惧鏁伴噺
+ * @param list
+ * @return
+ */
+ public List<Pole> setCount(List<Pole> list) {
+ for (Pole post : list) {
+ int size = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, post.getId())).size();
+// System.out.println("size:----------------------"+size);
+ post.setBindingCount(size);
+ }
+ return list;
+ }
+
+ /**
+ * 璁剧疆鍦ㄧ嚎鐘舵��
+ * @param list
+ * @return
+ */
+ public List<Pole> setOnline(List<Pole> list) {
+
+ List<String> MacCodes = new ArrayList<>();
+
+ for (Pole post : list) {
+ if (post.getDeviceCode() != null) {
+ MacCodes.add(post.getDeviceCode());
+ }
+ }
+//
+ List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses = MainBoardInvokeSyncService.getInstance().batchGetDeviceState(MacCodes);
+ if (deviceStatuses != null) {
+ for (Pole post : list) {
+ for (BatchGetDeviceStateResponse.DeviceStatus deviceStatus : deviceStatuses) {
+// System.out.println("DeviceCode:---------------------"+post.getDeviceCode());
+// System.out.println("DeviceName:---------------------"+deviceStatus.getDeviceName());
+ if (post.getDeviceCode() != null && post.getDeviceCode().equals(deviceStatus.getDeviceName())) {
+ post.setOnLineState(deviceStatus.getStatus());
+// int size = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, post.getId())).size();
+//// System.out.println("size:----------------------"+size);
+// post.setBindingCount(size);
+ }
+ }
+ // MacCodes.add(post.getDeviceCode());
+ }
+ }
+
+ return list;
+ }
+
+
/**
* 鏌ヨ鐏潌鐨勫湪绾跨姸鎬佸苟璧嬪��
*
* @return
*/
- public List<Pole> queryStatesAndList(Integer pageNo, Integer pageSize) {
+ public List<Pole> queryStatesAndList(Integer pageNo, Integer pageSize, String keyword, Long groupid) {
// List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class).eq(LampPost::getClientId, SecurityUtils.getUserId()));
//List<Pole> list = list(Wrappers.lambdaQuery(Pole.class));
PageHelper.startPage(pageNo, pageSize);
List<Pole> list = new ArrayList<>();
+ LambdaQueryWrapper<Pole> wrapper = new LambdaQueryWrapper<>();
if (SecurityUtils.getClientId() == null) {
- list = list(Wrappers.lambdaQuery(Pole.class));
+ wrapper = Wrappers.lambdaQuery(Pole.class);
} else {
- list = list(Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId()));
+ wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId());
}
-
+ if (!keyword.isEmpty()) {
+ wrapper.like(Pole::getPoleCode, keyword).or(
+ wrappers -> {
+ wrappers.like(Pole::getPoleName, keyword);
+ }
+ );
+ }
+ list = list(wrapper);
List<String> MacCodes = new ArrayList<>();
for (Pole post : list) {
@@ -129,8 +290,13 @@
List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses = MainBoardInvokeSyncService.getInstance().batchGetDeviceState(MacCodes);
for (Pole post : list) {
for (BatchGetDeviceStateResponse.DeviceStatus deviceStatus : deviceStatuses) {
- if (post.getDeviceCode().equals(deviceStatus.getDeviceName())) {
+// System.out.println("DeviceCode:---------------------"+post.getDeviceCode());
+// System.out.println("DeviceName:---------------------"+deviceStatus.getDeviceName());
+ if (post.getDeviceCode() != null && post.getDeviceCode().equals(deviceStatus.getDeviceName())) {
post.setOnLineState(deviceStatus.getStatus());
+ int size = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, post.getId())).size();
+// System.out.println("size:----------------------"+size);
+ post.setBindingCount(size);
}
}
// MacCodes.add(post.getDeviceCode());
--
Gitblit v1.9.3