From c1daa359ac79f4673463b7662b794b8da4c86e11 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 10 五月 2022 17:13:58 +0800
Subject: [PATCH] Changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 125 ++++++++++++++++++++++++++++-------------
1 files changed, 86 insertions(+), 39 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 9e7f7ac..ad814e4 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
@@ -30,6 +30,7 @@
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.LightemitUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.utils.response.VnnoxResult;
import com.sandu.ximon.admin.vo.PoleBindVO;
@@ -166,9 +167,9 @@
MonitorParam monitorParam = new MonitorParam();
monitorParam.setEquipmentState(2);
monitorParam.setBindingState(2);
- List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, monitorParam);
+ List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, monitorParam).getList();
monitorParam.setEquipmentState(1);
- List<MonitorBo> online = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, monitorParam);
+ List<MonitorBo> online = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, monitorParam).getList();
result.put("monitorOnlineCount", online.size());
result.put("monitorTotalCount", monitorBos.size());
@@ -199,7 +200,7 @@
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) {
+ if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT_STATE.getCode() + airEquipmentBo.getMac()) != null) {
number++;
}
}
@@ -209,7 +210,7 @@
number = 0;
List<AirEquipmentNongGengBo> airEquipmentNongGengBos = SpringContextHolder.getBean(AirEquipmentNongGengService.class).listAirEquipmentByKeyword(null, null);
for (AirEquipmentNongGengBo airEquipmentNongGengBo : airEquipmentNongGengBos) {
- if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT_NONG_GENG.getCode() + airEquipmentNongGengBo.getMac()) != null) {
+ if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT_NONG_GENG_STATE.getCode() + airEquipmentNongGengBo.getMac()) != null) {
number++;
}
}
@@ -316,16 +317,21 @@
}
/**
- * 璁剧疆缁戝畾璁惧鏁伴噺
+ * 鑾峰彇缁戝畾璁惧璇︽儏
*
* @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);
+ BindEquipments bindEquipments;
+ for (Pole pole : list) {
+ bindEquipments = new BindEquipments();
+ List<PoleBinding> poleBindings = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, pole.getId()));
+ pole.setBindingCount(poleBindings.size());
+ for (PoleBinding poleBinding : poleBindings) {
+ bindEquipments.setInfo(poleBinding.getDeviceType());
+ }
+ pole.setBindEquipments(bindEquipments);
}
return list;
}
@@ -797,36 +803,50 @@
public PoleBindVO getBindByPoleId(Long poleId) {
List<PoleBinding> bind = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId));
- PoleBindVO bindVO = new PoleBindVO();
- bindVO.setPole(getPoleByMac(poleId));
- bind.forEach(poleBinding -> {
- if (poleBinding.getDeviceType() == 0) {//鍗曠伅
- bindVO.setLight(SpringContextHolder.getBean(LightService.class).getLight(poleBinding.getDeviceCode()));
- } else if (poleBinding.getDeviceType() == 1) {//璇虹摝
- bindVO.setNova(SpringContextHolder.getBean(LedPlayerEntityService.class).getBySnAndPlayerSn(poleBinding.getDeviceCode()));
- } else if (poleBinding.getDeviceType() == 2) {//鍏呯數妗�
- bindVO.setC3mCharging(SpringContextHolder.getBean(C3ChargingService.class).getByC3Mac(poleBinding.getDeviceCode()));
- } 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()));
- } else if (poleBinding.getDeviceType() == 5) {//闊虫煴
- bindVO.setIpVolume(SpringContextHolder.getBean(IpVolumeService.class).getIpTerminalDetail(Integer.valueOf(poleBinding.getDeviceCode())));
- } else if (poleBinding.getDeviceType() == 6) {//LCD
- //lcd鏆傛棤
- } else if (poleBinding.getDeviceType() == 7) {//鎽勫儚澶�
- bindVO.setMonitor(SpringContextHolder.getBean(MonitorService.class).getMonitorInfo(poleBinding.getDeviceCode()));
- } else if (poleBinding.getDeviceType() == 8) {//鏉嗕綋鍊炬祴
- bindVO.setLightPoleHeeling(SpringContextHolder.getBean(LightPoleHeelingService.class).getLightPoleHeelingByMac(poleBinding.getDeviceCode()));
- } else if (poleBinding.getDeviceType() == 9) {//涓�閿眰鍔�
- //涓�閿眰鍔╂殏鏃�
- } else if (poleBinding.getDeviceType() == 10) {//鐔欒
- bindVO.setXiXun(SpringContextHolder.getBean(PoleLightemitService.class).getLedByLightControlCode(poleBinding.getDeviceCode()));
- } else {
- throw new BusinessException("鏈煡璁惧绫诲瀷");
- }
- });
- return bindVO;
+ Map<Integer, String> map = new HashMap<>();
+ for (int i = 0; i < 11; i++) {
+ map.put(i, null);
+ }
+
+ for (PoleBinding poleBinding : bind) {
+ map.put(poleBinding.getDeviceType(), poleBinding.getDeviceCode());
+ }
+
+ PoleBindVO poleBindVO = new PoleBindVO();
+// //鐏潌淇℃伅
+// poleBindVOTest.setPole(getPoleByMac(poleId));
+
+ /**
+ * 璁惧淇℃伅
+ */
+ //鍗曠伅
+ poleBindVO.getList().add(SpringContextHolder.getBean(LightService.class).getLightInfo(map.get(0)));
+ //璇虹摝
+ poleBindVO.getList().add(SpringContextHolder.getBean(LedPlayerEntityService.class).getBySnAndPlayerSnInfo(map.get(1)));
+ //鍏呯數妗�
+ poleBindVO.getList().add(SpringContextHolder.getBean(C3ChargingService.class).getByC3MacInfo(map.get(2)));
+ //澶ф皵
+ poleBindVO.getList().add(SpringContextHolder.getBean(AirEquipmentService.class).getAirEquipmentInfo(map.get(3)));
+ //姘磋川
+ poleBindVO.getList().add(SpringContextHolder.getBean(WaterQualityEquipmentService.class).getWaterQualityDataInfo(map.get(4)));
+ //闊虫煴
+ poleBindVO.getList().add(SpringContextHolder.getBean(IpVolumeService.class).getIpTerminalDetail(map.get(5)));
+
+ //LCD
+ //lcd鏆傛棤
+
+ //鎽勫儚澶�
+ poleBindVO.getList().add(SpringContextHolder.getBean(MonitorService.class).getMonitorInfo(map.get(7)));
+ //鏉嗕綋鍊炬祴
+ poleBindVO.getList().add(SpringContextHolder.getBean(LightPoleHeelingService.class).getLightPoleHeelingByMac(map.get(8)));
+
+ //涓�閿眰鍔�
+ //涓�閿眰鍔╂殏鏃�
+
+ //鐔欒
+ poleBindVO.getList().add(SpringContextHolder.getBean(PoleLightemitService.class).getLedByLightControlCodeInfo(map.get(10)));
+
+ return poleBindVO;
}
@@ -873,6 +893,12 @@
*/
public boolean pushAirDataToXiXun(Long poleId) {
Pole pole = getById(poleId);
+ //鍒ゆ柇褰掑睘鏉�
+ if (SecurityUtils.getClientId() != null) {
+ if (!pole.getClientId().equals(SecurityUtils.getUserId()) && !pole.getUserId().equals(SecurityUtils.getUserId())) {
+ throw new BusinessException("鏃犳潈闄愭搷浣�");
+ }
+ }
PoleBinding air = poleBindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId).eq(PoleBinding::getDeviceType, 3));
PoleBinding xixun = poleBindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId).eq(PoleBinding::getDeviceType, 10));
if (pole == null) {
@@ -890,6 +916,27 @@
return SpringContextHolder.getBean(XiXunPlayerService.class).pushWeather(xixun.getDeviceCode(), data, pole);
}
+
+ /**
+ * 鍏抽棴鐔欒澶ф皵鎺ㄩ��
+ */
+ public void closeXiXunAirPush(Long poleId) {
+ Pole pole = getById(poleId);
+ if (SecurityUtils.getClientId() != null) {
+ if (!pole.getClientId().equals(SecurityUtils.getUserId()) && !pole.getUserId().equals(SecurityUtils.getUserId())) {
+ throw new BusinessException("鏃犳潈闄愭搷浣�");
+ }
+ }
+ PoleBinding air = poleBindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId).eq(PoleBinding::getDeviceType, 3));
+ PoleBinding xixun = poleBindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId).eq(PoleBinding::getDeviceType, 10));
+ if (pole == null || air == null || xixun == null) {
+ throw new BusinessException("璁惧涓嶅瓨鍦�");
+ }
+ //鍏抽棴鎺ㄩ��
+ SpringContextHolder.getBean(LightemitUtils.class).clear(xixun.getDeviceCode());
+
+ }
+
/**
* 鎺ㄩ�佸ぇ姘旂洃娴嬫暟鎹埌novaLED
*/
--
Gitblit v1.9.3