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/service/PoleService.java | 204 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 188 insertions(+), 16 deletions(-)
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 f76390b..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,15 +28,17 @@
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;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestParam;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -56,6 +59,7 @@
private final RedisService redisService;
private final PoleBindingService poleBindingService;
+ private final PoleGroupRelationService groupRelationService;
public boolean addPole(PoleParam param) {
Pole pole = new Pole();
@@ -106,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) {
@@ -130,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());
@@ -155,6 +320,15 @@
throw new BusinessException("鏈壘鍒拌鐏潌");
}
return poleBindingService.bindPole(poleId, param);
+ }
+
+ /**
+ * 鐏潌瑙ｇ粦缁戝畾璁惧
+ *
+ * @return 鏄惁鎴愬姛
+ */
+ public boolean unBindPole(String deviceCode) {
+ return poleBindingService.unBindPole(deviceCode);
}
@@ -206,17 +380,15 @@
/**
* 缁欑伅鏉嗘敞鍐屼笁鍏冪爜
*/
-
-
public boolean setMac(String baseMac) {
- // public boolean setMac() {
+ // public boolean setMac() {
//Pole pole = getById(poleId);
/* if (pole == null) {
throw new BusinessException("鏈壘鍒拌鐏潌");
}*/
boolean setMac = false;
- //String baseMac = "baseDevice";
+ //String baseMac = "baseDevice";
A1Frame a1Frame = new A1Frame(A1OrderEnum.REQUEST_READ_DEVICE_UNIQUE_MAC.getCode(), new EmptyRequestInnerFrame());
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
.sendRRPC(baseMac, a1Frame);
@@ -340,21 +512,21 @@
* 鐢ㄦ埛缁戝畾鐏潌
*
* @param clientId 鐢ㄦ埛ID
- * @param poleIds 鐏潌ID
+ * @param poleIds 鐏潌ID
* @return
*/
public boolean ClientBindingPole(long clientId, int[] poleIds) {
- boolean r=false;
- for (int poleId:poleIds) {
+ boolean r = false;
+ for (int poleId : poleIds) {
Pole pole = getById(poleId);
if (pole == null) {
throw new BusinessException("鐏潌涓嶅瓨鍦�");
}
pole.setClientId(clientId);
- r=updateById(pole);
+ r = updateById(pole);
- if(!r){
- throw new BusinessException("鐏潌ID涓�"+poleId+"璁剧疆澶辫触,鑷姩鍋滄");
+ if (!r) {
+ throw new BusinessException("鐏潌ID涓�" + poleId + "璁剧疆澶辫触,鑷姩鍋滄");
}
}
--
Gitblit v1.9.3