From 35b68d05c92ae1eab2e409529a070a217ba492ae Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 25 四月 2022 09:53:23 +0800
Subject: [PATCH] fix 客户列表bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 207 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 189 insertions(+), 18 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 8e72e1e..5e8e708 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
@@ -13,6 +13,7 @@
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.dto.DeviceStatus;
+import com.sandu.ximon.admin.dto.WaterQualityDataDto;
import com.sandu.ximon.admin.manager.iot.frame.A1Frame;
import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
@@ -23,20 +24,16 @@
import com.sandu.ximon.admin.manager.iot.frame.inner.response.A1TernaryCodeRespInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.WrapResponseCommonFrame;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.A1OrderEnum;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.A2OrderEnum;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.DeviceStateEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.*;
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.param.*;
import com.sandu.ximon.admin.redis.LightKey;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.vo.PoleBindVO;
-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.bo.*;
+import com.sandu.ximon.dao.domain.*;
+import com.sandu.ximon.dao.mapper.MonitorMapper;
import com.sandu.ximon.dao.mapper.PoleMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -44,10 +41,7 @@
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -64,11 +58,13 @@
private final PoleBindingService poleBindingService;
private final PoleGroupRelationService groupRelationService;
private final ClientService clientService;
+ private final PoleMapper poleMapper;
public boolean addPole(PoleParam param) {
Pole pole = new Pole();
BeanUtils.copyProperties(param, pole);
pole.setPoleCode(generatePoleCode());
+ pole.setDeviceType(-1);
return save(pole);
}
@@ -91,6 +87,8 @@
if (pole == null) {
throw new BusinessException("鏈壘鍒拌鐏潌");
}
+ // 鍒犻櫎鐏潌缁戝畾鍏崇郴
+ poleBindingService.remove(Wrappers.<PoleBinding>lambdaQuery().eq(PoleBinding::getPoleId, poleId));
return removeById(poleId);
}
@@ -114,15 +112,148 @@
}
+ /**
+ * 缁熻鍦ㄧ嚎鐏潌鏁伴噺
+ *
+ * @return
+ */
+ public Map<String, Integer> poleCount() {
+ Map<String, Integer> result = new HashMap<>();
+ 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()).or(
+ w -> {
+ w.eq(Pole::getUserId, SecurityUtils.getUserId());
+ });
+ }
+ //鐏潌
+ List<Pole> list = list(wrapper);
+ List<Pole> poles = isOnLine(list);
+ result.put("poleOnlineCount", poles.size());
+ result.put("poleTotalCount", list.size());
+
+ //璇虹摝
+ List<LedPlayerEntity> ledPlayerEntities = SpringContextHolder.getBean(LedPlayerEntityService.class).ledPlayerEntityList(null, null);
+ int number = 0;
+ for (LedPlayerEntity bean : ledPlayerEntities) {
+ if (bean.getOnlineStatus() == 1) {
+ number++;
+ }
+ }
+ result.put("novaOnlineCount", number);
+ result.put("novaTotalCount", ledPlayerEntities.size());
+
+ //ip闊虫煴
+ number = 0;
+ BroadcastTerminalV2Param broadcastTerminalV2Param = new BroadcastTerminalV2Param();
+ broadcastTerminalV2Param.setBindingState(2);
+ broadcastTerminalV2Param.setWorkState(2);
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalList
+ = SpringContextHolder.getBean(IpVolumeService.class).getBroadcastTerminalList(null, broadcastTerminalV2Param);
+ for (BroadcastTerminalV2EntityBo bean : broadcastTerminalList) {
+ if (bean.getStatus() == 1 || bean.getStatus() == 0) {
+ number++;
+ }
+ }
+ result.put("broadcastOnlineCount", number);
+ result.put("broadcastTotalCount", broadcastTerminalList.size());
+
+ //鎽勫儚澶�
+ number = 0;
+ MonitorParam monitorParam = new MonitorParam();
+ monitorParam.setEquipmentState(2);
+ monitorParam.setBindingState(2);
+ List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, monitorParam);
+ monitorParam.setEquipmentState(1);
+ List<MonitorBo> online = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, monitorParam);
+ result.put("monitorOnlineCount", online.size());
+ result.put("monitorTotalCount", monitorBos.size());
+
+ //鍗曠伅
+ number = 0;
+ List<Light> lights = SpringContextHolder.getBean(LightService.class).listLight();
+ for (Light light : lights) {
+ if (light.getOnlineStatus() == 1) {
+ number++;
+ }
+ }
+ result.put("LightOnlineCount", number);
+ result.put("LightTotalCount", lights.size());
+
+ //鍏呯數妗�
+ number = 0;
+ List<C3ChargingBo> c3mChargings = SpringContextHolder.getBean(C3ChargingService.class).getC3ChargingListByKeyword(null, null);
+ for (C3ChargingBo c3ChargingBo : c3mChargings) {
+ if (c3ChargingBo.getStatusBit() != 0) {
+ number++;
+ }
+ }
+ result.put("C3ChargingOnlineCount", number);
+ result.put("C3ChargingTotalCount", c3mChargings.size());
+
+
+ //澶ф皵
+ number = 0;
+ List<AirEquipmentBo> airEquipments = SpringContextHolder.getBean(AirEquipmentService.class).listAirEquipmentByKeyword(null, null);
+ for (AirEquipmentBo airEquipmentBo : airEquipments) {
+ if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + airEquipmentBo.getMac()) != null) {
+ number++;
+ }
+ }
+ result.put("AirEquipmentOnlineCount", number);
+ result.put("AirEquipmentTotalCount", airEquipments.size());
+ //姘磋川
+ number = 0;
+ List<WaterQualityEquipmentBo> waterQualityEquipments
+ = SpringContextHolder.getBean(WaterQualityEquipmentService.class).listWaterQualityEquipmentByKeyword(null, null);
+
+ for (WaterQualityEquipmentBo waterQualityEquipmentBo : waterQualityEquipments) {
+ WaterQualityDataDto waterQualityDataDto
+ = SpringContextHolder.getBean(WaterQualityDataService.class).getWaterQualityDataInfo(waterQualityEquipmentBo.getWaterQualityEquipmentCode());
+ if (waterQualityDataDto != null) {
+ number++;
+ }
+ }
+ result.put("WaterQualityEquipmentOnlineCount", number);
+ result.put("WaterQualityEquipmentTotalCount", waterQualityEquipments.size());
+ //鐏潌鍊炬枩
+ number = 0;
+ List<LightPoleHeeling> lightPoleHeelings
+ = SpringContextHolder.getBean(LightPoleHeelingService.class).listLightPoleHeelingByKeyword(null, null);
+
+ for (LightPoleHeeling lightPoleHeeling : lightPoleHeelings) {
+ if (RedisUtils.getBean().get(LightPoleHeelingEnum.LIGHT_POLE_HEELING_STATE.getCode() + lightPoleHeeling.getMac()) != null) {
+ number++;
+ }
+ }
+ result.put("LightPoleHeelingOnlineCount", number);
+ result.put("LightPoleHeelingTotalCount", lightPoleHeelings.size());
+
+ //鐔欒
+ List<PoleLightemitEntity> poleLightemitEntities = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, false);
+ List<PoleLightemitEntity> poleLightemitEntityOnlineList = SpringContextHolder.getBean(PoleLightemitService.class).ledOnline(poleLightemitEntities);
+
+ result.put("XiXunOnlineCount", poleLightemitEntityOnlineList.size());
+ result.put("XiXunTotalCount", poleLightemitEntities.size());
+
+ return result;
+ }
+
public List<Pole> queryAllStatesAndList(Integer pageNo, Integer pageSize, PoleStatesParam param) {
+
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());
+ wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId()).or(
+ w -> {
+ w.eq(Pole::getUserId, SecurityUtils.getUserId());
+ });
}
- if (!param.getKeyword().isEmpty()) {
+ if (param.getKeyword() != null && !param.getKeyword().isEmpty()) {
wrapper.like(Pole::getPoleCode, param.getKeyword()).or(
wrappers -> {
wrappers.like(Pole::getPoleName, param.getKeyword());
@@ -130,6 +261,7 @@
);
}
+ PageHelper.startPage(pageNo, pageSize);
list = list(wrapper);
if (param.getGroupid() != null) {
// List<Long> poleIds = new ArrayList<>();
@@ -215,6 +347,26 @@
return offline;
}
return list;
+ }
+
+
+ /**
+ * 鍦ㄧ嚎鐏潌
+ *
+ * @param list
+ * @param
+ * @return
+ */
+ public List<Pole> isOnLine(List<Pole> list) {
+ setOnline(list);
+ List<Pole> online = new ArrayList<>();//鍦ㄧ嚎
+ list.forEach(onLinePole -> {
+ if (("ONLINE").equals(onLinePole.getOnLineState())) {
+ online.add(onLinePole);
+ }
+ });
+
+ return online;
}
/**
@@ -646,7 +798,7 @@
} else if (poleBinding.getDeviceType() == 3) {//澶ф皵
bindVO.setAirMonitoring(SpringContextHolder.getBean(AirEquipmentService.class).getAirEquipment(poleBinding.getDeviceCode()));
} else if (poleBinding.getDeviceType() == 4) {//姘磋川
- bindVO.setWaterMonitoring(SpringContextHolder.getBean(WaterQualityDataService.class).getWaterQualityDataInfo(poleBinding.getDeviceCode()));
+ bindVO.setWaterMonitoring(SpringContextHolder.getBean(WaterQualityDataService.class).getWaterQualityDataInfo(poleBinding.getDeviceCode()));
} else if (poleBinding.getDeviceType() == 5) {//闊虫煴
bindVO.setIpVolume(SpringContextHolder.getBean(IpVolumeService.class).getIpTerminalDetail(Integer.valueOf(poleBinding.getDeviceCode())));
} else if (poleBinding.getDeviceType() == 6) {//LCD
@@ -670,9 +822,12 @@
public Pole getPoleByMac(Long poleId) {
Pole one = getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, poleId));
ArrayList<String> macs = new ArrayList<>();
+
macs.add(one.getDeviceCode());
List<DeviceStatus> deviceStatuses = listStatusByDeviceCode(macs);
- if (deviceStatuses.get(0).getStatus() == 0) {
+ if (one.getDeviceCode() == null || one.getDeviceType() == null || one.getDeviceType() == -1) {
+ one.setOnLineState("铏氭嫙鐏潌");
+ } else if (deviceStatuses.get(0).getStatus() == 0) {
one.setOnLineState("绂荤嚎");
} else if (deviceStatuses.get(0).getStatus() == 1) {
one.setOnLineState("鍦ㄧ嚎");
@@ -685,4 +840,20 @@
}
return one;
}
+
+// /**
+// * 鐢ㄦ埛鎬诲崟鐏妭鑳界巼
+// */
+// public Double getPoleEnergy() {
+// Double energy = 0.0;
+//
+//
+// return energy;
+// }
+
+
+ public boolean updateDeviceCode(Long poleId) {
+ return poleMapper.updateDeviceCode(poleId);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3