From d938c951a1669b4df877ffc6521aef17f0fac809 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 28 十月 2022 17:53:05 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 1179 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 906 insertions(+), 273 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 ea064f6..e112f59 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
@@ -2,11 +2,13 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
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.domain.CommonPage;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.redis.RedisService;
@@ -16,36 +18,46 @@
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;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.A1TernaryCodeReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.A5LightResetReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.EmptyRequestInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.response.A1DeviceMacRespInnerFrame;
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.*;
+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.PushAirDataToNovaParam;
+import com.sandu.ximon.admin.redis.DeviceRedisKey;
import com.sandu.ximon.admin.redis.LightKey;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.*;
+import com.sandu.ximon.admin.utils.response.VnnoxResult;
+import com.sandu.ximon.admin.vo.DeviceOnLineCountVO;
+import com.sandu.ximon.admin.vo.OnLineCountVO;
import com.sandu.ximon.admin.vo.PoleBindVO;
-import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
-import com.sandu.ximon.dao.bo.MonitorBo;
-import com.sandu.ximon.dao.domain.LedPlayerEntity;
-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.admin.vo.RedisDeviceStatus;
+import com.sandu.ximon.dao.bo.*;
+import com.sandu.ximon.dao.domain.*;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.PoleMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.RandomStringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -62,12 +74,27 @@
private final PoleBindingService poleBindingService;
private final PoleGroupRelationService groupRelationService;
private final ClientService clientService;
+ private final PoleMapper poleMapper;
+ private final RedisUtils redisUtils;
+ private final CountDownLatchUtil countDownLatchUtil;
public boolean addPole(PoleParam param) {
Pole pole = new Pole();
BeanUtils.copyProperties(param, pole);
pole.setPoleCode(generatePoleCode());
- return save(pole);
+ pole.setDeviceType(-1);
+ pole.setCentre(1);
+ boolean save = save(pole);
+
+ /**
+ * 鏂板铏氭嫙鐏潌鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鐏潌ID锛�" + pole.getId() + "锛� 鐏潌鍚嶏細" + param.getPoleName() + "}";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鏂板铏氭嫙鐏潌", content);
+ /**
+ * 鏂板铏氭嫙鐏潌鏃ュ織璁板綍缁撴潫
+ */
+ return save;
}
public boolean updatePole(Long poleId, PoleParam param) {
@@ -75,9 +102,27 @@
if (pole == null) {
throw new BusinessException("鏈壘鍒拌鐏潌");
}
+ Long clientId = SecurityUtils.getClientId();
+ //闈炶秴绠�
+ if (clientId != null) {
+ if (!Objects.equals(SecurityUtils.getUserId(), pole.getUserId()) && !Objects.equals(SecurityUtils.getUserId(), pole.getClientId())) {
+ throw new BusinessException("璇ョ伅鏉嗕笉灞炰簬鎮�");
+ }
+ }
Pole update = new Pole();
BeanUtils.copyProperties(param, update);
update.setId(poleId);
+ if (param.getIsCenter() != null) {
+ update.setCentre(param.getIsCenter());
+ }
+ /**
+ * 淇敼鐏潌鏃ュ織璁板綍寮�濮�
+ */
+ String content = "缂栬緫鐏潌锛�" + poleId;
+ StoreOperationRecordsUtils.storeOperationData(null, null, "缂栬緫鐏潌", content);
+ /**
+ * 淇敼鐏潌鏃ュ織璁板綍缁撴潫
+ */
return updateById(update);
}
@@ -91,6 +136,18 @@
}
// 鍒犻櫎鐏潌缁戝畾鍏崇郴
poleBindingService.remove(Wrappers.<PoleBinding>lambdaQuery().eq(PoleBinding::getPoleId, poleId));
+ SpringContextHolder.getBean(LightTaskPoleRelationService.class)
+ .remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, poleId));
+
+ /**
+ * 鍒犻櫎鐏潌鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鐏潌Code锛�" + pole.getDeviceCode() + "锛� 鐏潌鍚嶇О锛�" + pole.getPoleName() + " }";
+
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鍒犻櫎鐏潌", content);
+ /**
+ * 鍒犻櫎鐏潌鏃ュ織璁板綍缁撴潫
+ */
return removeById(poleId);
}
@@ -102,7 +159,7 @@
StringBuilder sb = new StringBuilder();
String date = new SimpleDateFormat("yyMMdd").format(new Date());
sb.append(date);
- String key = LightKey.POLE_SN.key(null);
+ String key = LightKey.POLE_SN.key(date);
Long increment = redisService.incr(key, 1);
String incrementStr = increment.toString();
if (incrementStr.length() <= 4) {
@@ -119,140 +176,498 @@
*
* @return
*/
- public Map<String, Integer> poleCount() {
+ public Map<String, Integer> poleCount1() {
Map<String, Integer> result = new HashMap<>();
- List<Pole> list = new ArrayList<>();
- LambdaQueryWrapper<Pole> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<Pole> wrapper;
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());
- });
+ wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(Pole::getUserId, SecurityUtils.getUserId());
+ });
}
+
//鐏潌
- list = list(wrapper);
- List<Pole> poles = isOnLine(list);
- result.put("poleOnlineCount", poles.size());
+ List<Pole> list = list(wrapper);
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);
+ List<LedPlayerEntity> ledPlayerEntities = SpringContextHolder.getBean(LedPlayerEntityService.class).ledPlayerEntityListOnHome();
result.put("novaTotalCount", ledPlayerEntities.size());
//ip闊虫煴
- BroadcastTerminalV2Param broadcastTerminalV2Param = new BroadcastTerminalV2Param();
- broadcastTerminalV2Param.setBindingState(2);
- broadcastTerminalV2Param.setWorkState(-1);
- List<BroadcastTerminalV2EntityBo> broadcastTerminalList = SpringContextHolder.getBean(IpVolumeService.class).getBroadcastTerminalList(null, broadcastTerminalV2Param);
- number = 0;
- for (BroadcastTerminalV2EntityBo bean : broadcastTerminalList) {
- if (bean.getStatus() == 1 || bean.getStatus() == 0) {
- number++;
- }
- }
- result.put("broadcastOnlineCount", number);
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalList = SpringContextHolder.getBean(IpVolumeService.class).getBroadcastTerminalListOnHome();
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());
+
+ List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorOnHome();
result.put("monitorTotalCount", monitorBos.size());
//鍗曠伅
+ List<LightBo> lights = SpringContextHolder.getBean(LightService.class).listLightOnHome();
+ result.put("LightTotalCount", lights.size());
+ //鍏呯數妗�
+ List<C3ChargingBo> c3mChargings = SpringContextHolder.getBean(C3ChargingService.class).getC3ChargingList();
+ result.put("C3ChargingTotalCount", c3mChargings.size());
+ //澶ф皵
+ List<AirEquipmentBo> airEquipments = SpringContextHolder.getBean(AirEquipmentService.class).listAirEquipmentOnHome();
+ result.put("AirEquipmentTotalCount", airEquipments.size());
+ //澶ф皵(鍐滆��)
+ List<AirEquipmentNongGengBo> airEquipmentNongGengBos = SpringContextHolder.getBean(AirEquipmentNongGengService.class).listAirEquipmentOnHome();
+ result.put("AirEquipmentNongGengTotalCount", airEquipmentNongGengBos.size());
+
+ //姘磋川
+ List<WaterQualityEquipmentBo> waterQualityEquipments = SpringContextHolder.getBean(WaterQualityEquipmentService.class).listWaterQualityEquipmentByKeyword(null, null);
+ result.put("WaterQualityEquipmentTotalCount", waterQualityEquipments.size());
+
+ //鐏潌鍊炬枩
+ List<LightPoleHeelingEquipmentBo> lightPoleHeelingEquipmentBos = SpringContextHolder.getBean(LightPoleHeelingEquipmentService.class).LightPoleHeelingEquipmentListOnHome();
+ result.put("LightPoleHeelingTotalCount", lightPoleHeelingEquipmentBos.size());
+
+ //鐔欒
+ List<PoleLightemitEntity> poleLightemitEntities = SpringContextHolder.getBean(PoleLightemitService.class).listLedOnHome();
+ 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<>();
+
+ /**
+ * 缁熻鍦ㄧ嚎鐏潌鏁伴噺
+ *
+ * @return
+ */
+ public OnLineCountVO poleCount() {
+ System.out.println("璇锋眰鏃堕棿: " + LocalDateTime.now());
+ OnLineCountVO onLineCountVO = new OnLineCountVO();
+ CountDownLatch countDownLatch = new CountDownLatch(9);//todo
+ //鑾峰彇涓�涓�7浣嶉殢鏈烘暟
+ String str = RandomStringUtils.randomAlphanumeric(7);
+ countDownLatchUtil.push(str, countDownLatch);
+ //璇虹摝
+ List<LedPlayerEntity> ledPlayerEntities = SpringContextHolder.getBean(LedPlayerEntityService.class).ledPlayerEntityListOnHome();
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ AtomicInteger onLine = new AtomicInteger(0);
+ AtomicInteger offLine = new AtomicInteger(0);
+
+
+ //ip闊虫煴
+
+ DeviceOnLineCountVO ledNova = new DeviceOnLineCountVO();
+ ledPlayerEntities.forEach(
+ Volume -> {
+ String s = redisUtils.get(DeviceRedisKey.NOVA + Volume.getId());
+ if (s != null) {
+ RedisDeviceStatus redisDeviceStatus = JSON.parseObject(s, RedisDeviceStatus.class);
+ if (redisDeviceStatus.getStatus() == 0) {
+ //鍦ㄧ嚎
+ onLine.getAndIncrement();
+ } else {
+ //绂荤嚎
+ offLine.getAndIncrement();
+ }
+ } else {
+ offLine.getAndIncrement();
+ }
+ }
+ );
+
+ ledNova.setTotalCount(ledPlayerEntities.size());
+ ledNova.setOnlineCount(onLine.get());
+ ledNova.setOfflineCount(offLine.get());
+
+ onLineCountVO.setLedNova(ledNova);
+ System.out.println("璇虹摝鎵ц鏃堕棿: " + LocalDateTime.now());
+ countDownLatchUtil.countDown(str);
+ }
+ }).start();
+
+ //闊虫煴
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalList = SpringContextHolder.getBean(IpVolumeService.class).getBroadcastTerminalListOnHome();
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ AtomicInteger onLine = new AtomicInteger(0);
+ AtomicInteger offLine = new AtomicInteger(0);
+
+
+ //ip闊虫煴
+
+ DeviceOnLineCountVO ipVolume = new DeviceOnLineCountVO();
+ broadcastTerminalList.forEach(
+ Volume -> {
+ String s = redisUtils.get(DeviceRedisKey.IP_BROADCAST + Volume.getId());
+ if (s != null) {
+ RedisDeviceStatus redisDeviceStatus = JSON.parseObject(s, RedisDeviceStatus.class);
+ if (redisDeviceStatus.getStatus() == 0) {
+ //鍦ㄧ嚎
+ onLine.getAndIncrement();
+ } else {
+ //绂荤嚎
+ offLine.getAndIncrement();
+ }
+ } else {
+ offLine.getAndIncrement();
+ }
+ }
+ );
+
+ ipVolume.setTotalCount(broadcastTerminalList.size());
+ ipVolume.setOnlineCount(onLine.get());
+ ipVolume.setOfflineCount(offLine.get());
+
+ onLineCountVO.setBroadcast(ipVolume);
+ System.out.println("闊虫煴鎵ц鏃堕棿: " + LocalDateTime.now());
+ countDownLatchUtil.countDown(str);
+ }
+ }).start();
+
+ //鎽勫儚澶�
+ List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorOnHome();
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+
+ AtomicInteger onLine = new AtomicInteger(0);
+ AtomicInteger offLine = new AtomicInteger(0);
+
+ DeviceOnLineCountVO Monitor = new DeviceOnLineCountVO();
+ monitorBos.forEach(
+ device -> {
+ String s = redisUtils.get(DeviceRedisKey.MONITOR + device.getDeviceSerial());
+ if (s != null) {
+ RedisDeviceStatus redisDeviceStatus = JSON.parseObject(s, RedisDeviceStatus.class);
+ if (redisDeviceStatus.getStatus() == 0) {
+ //鍦ㄧ嚎
+ onLine.getAndIncrement();
+ } else {
+ //绂荤嚎
+ offLine.getAndIncrement();
+ }
+ } else {
+ offLine.getAndIncrement();
+ }
+ }
+ );
+
+ Monitor.setTotalCount(monitorBos.size());
+ Monitor.setOnlineCount(onLine.get());
+ Monitor.setOfflineCount(offLine.get());
+
+ onLineCountVO.setMonitor(Monitor);
+ System.out.println("鎽勫儚澶存墽琛屾椂闂�: " + LocalDateTime.now());
+ countDownLatchUtil.countDown(str);
+ }
+ }).start();
+
+
+ //鍗曠伅
+ List<LightBo> lights = SpringContextHolder.getBean(LightService.class).listLightOnHome();
+ BaseConditionVO baseConditionVO = new BaseConditionVO();
+ baseConditionVO.setPageNo(1);
+ baseConditionVO.setPageSize(999);
+ System.out.println("鍗曠伅鏁呴殰缁熻鏃堕棿: " + LocalDateTime.now());
+ CommonPage commonPage = SpringContextHolder.getBean(LightReportErrorService.class).queryErrorCode(baseConditionVO);
+ System.out.println("鍗曠伅鏁呴殰缁熻鏃堕棿: " + LocalDateTime.now());
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+
+ AtomicInteger onLine = new AtomicInteger(0);
+ AtomicInteger offLine = new AtomicInteger(0);
+ AtomicInteger error = new AtomicInteger(commonPage.getList().size());
+
+
+ DeviceOnLineCountVO light = new DeviceOnLineCountVO();
+ lights.forEach(
+ device -> {
+ String s = redisUtils.get(DeviceRedisKey.LIGHT_DEVICE + device.getDeviceCode());
+ if (s != null) {
+ RedisDeviceStatus redisDeviceStatus = JSON.parseObject(s, RedisDeviceStatus.class);
+ if (redisDeviceStatus.getStatus() == 0) {
+ //鍦ㄧ嚎
+ onLine.getAndIncrement();
+ } else {
+ //绂荤嚎
+ offLine.getAndIncrement();
+ }
+ } else {
+ offLine.getAndIncrement();
+ }
+ }
+ );
+
+ light.setTotalCount(lights.size());
+ light.setOnlineCount(onLine.get());
+ light.setOfflineCount(offLine.get());
+ light.setErrorCount(error.get());
+
+ onLineCountVO.setLight(light);
+ System.out.println("鍗曠伅鎵ц鏃堕棿: " + LocalDateTime.now());
+ countDownLatchUtil.countDown(str);
+ }
+ }).start();
+
+
+ //鍏呯數妗�
+ List<C3ChargingBo> c3mChargings = SpringContextHolder.getBean(C3ChargingService.class).getC3ChargingList();
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ AtomicInteger onLine = new AtomicInteger(0);
+ AtomicInteger offLine = new AtomicInteger(0);
+ AtomicInteger error = new AtomicInteger(0);
+
+
+ DeviceOnLineCountVO c3m = new DeviceOnLineCountVO();
+ c3mChargings.forEach(
+ device -> {
+ String s = redisUtils.get(C3mRedisConstant.C3_STATUS.getCode() + device.getC3Mac());
+ RedisDeviceStatus redisDeviceStatus = new RedisDeviceStatus();
+ redisDeviceStatus.setDeviceId(device.getC3Id().toString());
+ if (s != null) {
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage = JSON.parseObject(s, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage.class);
+ // 鍏呯數妗╁彛鐘舵�佷綅 1.绌洪棽 2.鍏呯數涓� 3.鍏呯數涓柇锛岀瓑寰呮湇鍔″櫒纭 4.鍏呯數缁撴潫锛岀瓑寰呮湇鍔″櫒纭 5.鏈夋晠闅� 6.涓庡厖鐢垫々瀵规帴涓�
+ if ("5".equals(heartBeatDataPackage.getStatusBit())) {
+ //鏁呴殰
+ onLine.getAndIncrement();
+ error.getAndIncrement();
+ } else {
+ //鍦ㄧ嚎
+ onLine.getAndIncrement();
+ }
+ } else {
+ //绂荤嚎
+ offLine.getAndIncrement();
+ }
+ }
+ );
+
+ c3m.setTotalCount(c3mChargings.size());
+ c3m.setOnlineCount(onLine.get());
+ c3m.setOfflineCount(offLine.get());
+ c3m.setErrorCount(error.get());
+
+ onLineCountVO.setC3m(c3m);
+ System.out.println("鍏呯數妗╂墽琛屾椂闂�: " + LocalDateTime.now());
+ countDownLatchUtil.countDown(str);
+ }
+ }).start();
+
+
+ //澶ф皵
+ List<AirEquipmentBo> airEquipments = SpringContextHolder.getBean(AirEquipmentService.class).listAirEquipmentOnHome();
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ AtomicInteger onLine = new AtomicInteger(0);
+ AtomicInteger offLine = new AtomicInteger(0);
+ AtomicInteger error = new AtomicInteger(0);
+
+
+ DeviceOnLineCountVO air = new DeviceOnLineCountVO();
+ airEquipments.forEach(
+ device -> {
+ String s = redisUtils.get(DeviceRedisKey.AIR + device.getMac());
+ if (s != null) {
+ RedisDeviceStatus redisDeviceStatus = JSON.parseObject(s, RedisDeviceStatus.class);
+ if (redisDeviceStatus.getStatus() == 0) {
+ //鍦ㄧ嚎
+ onLine.getAndIncrement();
+ } else if (redisDeviceStatus.getStatus() == 1) {
+ //绂荤嚎
+ offLine.getAndIncrement();
+ } else {
+ error.getAndIncrement();
+ }
+ } else {
+ error.getAndIncrement();
+ }
+ }
+ );
+
+ air.setTotalCount(airEquipments.size());
+ air.setOnlineCount(onLine.get());
+ air.setOfflineCount(offLine.get());
+ air.setErrorCount(error.get());
+
+ onLineCountVO.setAirEquipment(air);
+ System.out.println("澶ф皵鎵ц鏃堕棿: " + LocalDateTime.now());
+ countDownLatchUtil.countDown(str);
+ }
+ }).start();
+
+
+ //澶ф皵(鍐滆��)
+// List<AirEquipmentNongGengBo> airEquipmentNongGengBos = SpringContextHolder.getBean(AirEquipmentNongGengService.class).listAirEquipmentOnHome();
+// result.put("AirEquipmentNongGengTotalCount", airEquipmentNongGengBos.size());
+
+ //姘磋川
+ List<WaterQualityEquipmentBo> waterQualityEquipments = SpringContextHolder.getBean(WaterQualityEquipmentService.class).listWaterQualityEquipmentByKeyword(null, null);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+
+ DeviceOnLineCountVO water = new DeviceOnLineCountVO();
+ water.setTotalCount(waterQualityEquipments.size());
+ water.setOnlineCount(waterQualityEquipments.size());
+ water.setOfflineCount(0);
+ water.setErrorCount(0);
+ onLineCountVO.setWaterEquipment(water);
+ System.out.println("姘磋川鎵ц鏃堕棿: " + LocalDateTime.now());
+ countDownLatchUtil.countDown(str);
+ }
+ }).start();
+
+
+ //鐏潌鍊炬枩
+ List<LightPoleHeelingEquipmentBo> lightPoleHeelingEquipmentBos = SpringContextHolder.getBean(LightPoleHeelingEquipmentService.class).LightPoleHeelingEquipmentListOnHome();
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+
+ DeviceOnLineCountVO PoleHeeling = new DeviceOnLineCountVO();
+ PoleHeeling.setTotalCount(lightPoleHeelingEquipmentBos.size());
+ PoleHeeling.setOnlineCount(lightPoleHeelingEquipmentBos.size());
+ PoleHeeling.setOfflineCount(0);
+ PoleHeeling.setErrorCount(0);
+ onLineCountVO.setLightPoleHeeling(PoleHeeling);
+ System.out.println("鐏潌鍊炬枩鎵ц鏃堕棿: " + LocalDateTime.now());
+ countDownLatchUtil.countDown(str);
+ }
+ }).start();
+
+ //鐔欒
+ List<PoleLightemitEntity> xiXuns = SpringContextHolder.getBean(PoleLightemitService.class).listLedOnHome();
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ AtomicInteger onLine = new AtomicInteger(0);
+ AtomicInteger offLine = new AtomicInteger(0);
+
+ DeviceOnLineCountVO xixunLed = new DeviceOnLineCountVO();
+ xiXuns.forEach(
+ device -> {
+ String s = redisUtils.get(DeviceRedisKey.XIXUN + device.getLightemitControlCode());
+ if (s != null) {
+ RedisDeviceStatus redisDeviceStatus = JSON.parseObject(s, RedisDeviceStatus.class);
+ if (redisDeviceStatus.getStatus() == 0) {
+ //鍦ㄧ嚎
+ onLine.getAndIncrement();
+ } else {
+ //绂荤嚎
+ offLine.getAndIncrement();
+ }
+ } else {
+ offLine.getAndIncrement();
+ }
+ }
+ );
+
+ xixunLed.setTotalCount(xiXuns.size());
+ xixunLed.setOnlineCount(onLine.get());
+ xixunLed.setOfflineCount(offLine.get());
+
+ onLineCountVO.setLedXiXun(xixunLed);
+ System.out.println("鐔欐睕鎵ц鏃堕棿: " + LocalDateTime.now());
+ countDownLatchUtil.countDown(str);
+ }
+ }).start();
+ try {
+ countDownLatch.await(20000, TimeUnit.MILLISECONDS);
+ countDownLatchUtil.remove(str);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ System.out.println("鍝嶅簲鏃堕棿: " + LocalDateTime.now());
+ return onLineCountVO;
+ }
+
+
+ public CommonPage queryAllStatesAndList(Integer pageNo, Integer pageSize, PoleStatesParam param, Integer order, Integer seq) {
+ if (param == null) {
+ param = new PoleStatesParam();
+ }
+
+ //鎺掑簭瀛楁
+ String orderByResult = OrderByEnums.POLE_ID.getCode();
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.POLE_NAME.getCode();
+ break;
+ case 2:
+ orderByResult = OrderByEnums.POLE_ID.getCode();
+ break;
+ case 3:
+ orderByResult = OrderByEnums.POLE_CREATE_TIME.getCode();
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = OrderByEnums.ASC.getCode();
+ break;
+ case 2:
+ orderBySeq = OrderByEnums.DESC.getCode();
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = "t1." + orderByResult + " " + orderBySeq;
+
+ List<Pole> poleList;
+ Integer center = param.getCenter();
if (SecurityUtils.getClientId() == null) {
- wrapper = Wrappers.lambdaQuery(Pole.class);
+ poleList = poleMapper.queryPoleOnLineStatesList(null, param.getIsTrue(),
+ param.getBingStates(), param.getGroupid(), param.getKeyword(), center, orderBy);
} else {
- wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId()).or(
- w -> {
- w.eq(Pole::getUserId, SecurityUtils.getUserId());
- });
+ poleList = poleMapper.queryPoleOnLineStatesList(SecurityUtils.getUserId(),
+ param.getIsTrue(), param.getBingStates(), param.getGroupid(), param.getKeyword(), center, orderBy);
}
- if (param.getKeyword() != null && !param.getKeyword().isEmpty()) {
- wrapper.like(Pole::getPoleCode, param.getKeyword()).or(
- wrappers -> {
- wrappers.like(Pole::getPoleName, param.getKeyword());
+
+ poleList.forEach(
+ centre -> {
+ if (centre.getCentre() == 0) {
+ centre.setCenter(true);
}
- );
- }
+ }
+ );
+ List<Pole> PoleResult = isOnLine(poleList, param);
+ setCount(PoleResult);
- PageHelper.startPage(pageNo, pageSize);
- list = list(wrapper);
- 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;
- }
+ CommonPage commonPage = ListPagingUtils.pages(PoleResult, pageNo, pageSize);
- if (param.getBingStates() != 2) {//鏄惁缁戝畾
- list = isBind(list, param);// 缁戝畾/鏈粦瀹�
- if (param.getIsTrue() != 2) {//宸茬粦瀹氱殑鏄惁鏄湡瀹炵伅鏉�
- list = isTrue(list, param);
- if (param.getOnLineStates() != 2) {//缁戝畾鐨勭湡瀹炵伅鏉嗘槸鍚﹀湪绾�
- list = isOnLine(list, param);
- }
- } else {//鍏ㄩ儴鐏潌 瀹炰綋/铏氭嫙
- if (param.getOnLineStates() != 2) { //鏌ヨ鍏ㄩ儴鐏潌鏄惁鍦ㄧ嚎
- list = isOnLine(list, param);
- }
- }
- } else {//鍏ㄩ儴 缁戝畾/鏈粦瀹�
- if (param.getIsTrue() != 2) {// 鍒ゆ柇鐏潌绫诲瀷
- list = isTrue(list, param);// 瀹炰綋/铏氭嫙
- if (param.getOnLineStates() != 2) {// 鐏潌鐨勫湪绾垮垽鏂�
- list = isOnLine(list, param);//鍦ㄧ嚎/绂荤嚎
- }
- } else {//鍏ㄧ被鍨嬬伅鏉�
- if (param.getOnLineStates() != 2) {//鍒ゆ柇鍦ㄧ嚎鐘舵��
- list = isOnLine(list, param);//鍦ㄧ嚎/绂荤嚎
- }
- }
- }
-
- setCount(list);
- return list;
+ return commonPage;
}
/**
- * 璁剧疆缁戝畾璁惧鏁伴噺
+ * 鑾峰彇缁戝畾璁惧璇︽儏
*
* @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;
}
@@ -314,31 +729,33 @@
* @param param
* @return
*/
- public List<Pole> isBind(List<Pole> list, PoleStatesParam param) {
- List<Pole> bindList = new ArrayList<>();//宸茬粦瀹氬鎴�
- List<Pole> unbindList = new ArrayList<>();//鏈粦瀹氬鎴�
- list.forEach(bindwarpper -> {
-// Long clientId = bindwarpper.getClientId();
- if (bindwarpper.getClientId() == null) {//鍒ゆ柇鏄惁缁戝畾
- unbindList.add(bindwarpper);
- } else {
- bindList.add(bindwarpper);
- }
- });
- if (param.getBingStates() == 0) {
- return bindList;
- } else if (param.getBingStates() == 1) {
- return unbindList;
- }
- return list;
- }
-
+// public List<Pole> isBind(List<Pole> list, PoleStatesParam param) {
+// List<Pole> bindList = new ArrayList<>();//宸茬粦瀹氬鎴�
+// List<Pole> unbindList = new ArrayList<>();//鏈粦瀹氬鎴�
+// list.forEach(bindwarpper -> {
+//// Long clientId = bindwarpper.getClientId();
+// if (bindwarpper.getClientId() == null) {//鍒ゆ柇鏄惁缁戝畾
+// unbindList.add(bindwarpper);
+// } else {
+// bindList.add(bindwarpper);
+// }
+// });
+// if (param.getBingStates() == 0) {
+// return bindList;
+// } else if (param.getBingStates() == 1) {
+// return unbindList;
+// }
+// return list;
+// }
public List<Pole> isTrue(List<Pole> list, PoleStatesParam param) {
- List<Pole> isTrue = new ArrayList<>();//瀹炰綋鐏潌
- List<Pole> isFalse = new ArrayList<>();//铏氭嫙鐏潌
+ //瀹炰綋鐏潌
+ List<Pole> isTrue = new ArrayList<>();
+ //铏氭嫙鐏潌
+ List<Pole> isFalse = new ArrayList<>();
list.forEach(bindwarpper -> {
// Long clientId = bindwarpper.getClientId();
- if (bindwarpper.getDeviceCode() == null) {
+ //鍒ゆ柇鏄惁缁戝畾
+ if (bindwarpper.getDeviceType() == -1) {
isFalse.add(bindwarpper);
} else {
isTrue.add(bindwarpper);
@@ -373,16 +790,13 @@
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());
+
}
}
@@ -396,8 +810,6 @@
* @return
*/
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<>();
@@ -407,11 +819,9 @@
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);
- }
- );
+ wrapper.like(Pole::getPoleCode, keyword).or(wrappers -> {
+ wrappers.like(Pole::getPoleName, keyword);
+ });
}
list = list(wrapper);
List<String> MacCodes = new ArrayList<>();
@@ -422,16 +832,12 @@
List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses = MainBoardInvokeSyncService.getInstance().batchGetDeviceState(MacCodes);
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());
}
@@ -459,8 +865,8 @@
*
* @return 鏄惁鎴愬姛
*/
- public boolean unBindPole(Long poleId, String deviceCode) {
- return poleBindingService.unBindPole(poleId, deviceCode);
+ public boolean unBindPole(Long poleId, String deviceCode, Integer deviceType) {
+ return poleBindingService.unBindPole(poleId, deviceCode, deviceType);
}
@@ -472,27 +878,21 @@
*/
public boolean poleReset(Long id) {
Pole byId = getById(id);
- String deviceName = byId.getDeviceCode();
if (byId == null) {
throw new BusinessException("鏈壘鍒拌鐏潌");
}
+ String deviceName = byId.getDeviceCode();
if (deviceName.isEmpty()) {
- throw new BusinessException("璇ョ伅鏉哅ca涓虹┖");
+ throw new BusinessException("璇ョ伅鏉哅ac涓虹┖");
}
- IRequestFrame build = FrameBuilder.builderA5()
- .orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode())
- .innerFrame(new A5LightResetReqInnerFrame())
- .build();
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(deviceName, build);
+ IRequestFrame build = FrameBuilder.builderA5().orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode()).innerFrame(new A5LightResetReqInnerFrame()).build();
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceName, build);
+ StoreOperationRecordsUtils.storeInnerFrameData(deviceName, "鐏潌鎭㈠鍑哄巶璁剧疆", build, commonFrame);
System.out.println(commonFrame.toString());
-
- CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(deviceName,
- FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
- .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
-
+ IRequestFrame iRequestFrame = FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame()).orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build();
+ CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceName, iRequestFrame);
+ StoreOperationRecordsUtils.storeInnerFrameData(deviceName, "鐏潌閲嶅惎", iRequestFrame, commonFrame);
boolean b = false;
if ("00".equals(rebootFrame.getPayload())) {
@@ -500,6 +900,14 @@
b = updateById(byId);
System.out.println("閲嶅惎鎴愬姛");
}
+ /**
+ * 鐏潌鎭㈠鍑哄巶璁剧疆鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鐏潌ID锛�" + id + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐏潌鎭㈠鍑哄巶璁剧疆", content);
+ /**
+ * 鐏潌鎭㈠鍑哄巶璁剧疆鏃ュ織璁板綍缁撴潫
+ */
return b;
}
@@ -507,18 +915,13 @@
/**
* 缁欑伅鏉嗘敞鍐屼笁鍏冪爜
*/
- public boolean setMac(String baseMac) {
- // public boolean setMac() {
- //Pole pole = getById(poleId);
- /* if (pole == null) {
- throw new BusinessException("鏈壘鍒拌鐏潌");
- }*/
+ @Transactional(rollbackFor = Exception.class)
+ public Map setMac(String baseMac) {
- boolean setMac = false;
- //String baseMac = "baseDevice";
A1Frame a1Frame = new A1Frame(A1OrderEnum.REQUEST_READ_DEVICE_UNIQUE_MAC.getCode(), new EmptyRequestInnerFrame());
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(baseMac, a1Frame);
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(baseMac, a1Frame);
+ //瀛樺偍鎸褰�
+ StoreOperationRecordsUtils.storeInnerFrameData(baseMac, "娉ㄥ唽涓夊厓鐮�", a1Frame, commonFrame);
if (commonFrame == null) {
throw new BusinessException("璇诲彇璁惧鍞竴ID澶辫触");
}
@@ -543,58 +946,57 @@
log.info(deviceDetail.toString());
// 4 閰嶇疆Mac鈶�
- WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> productKeyResp = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(baseMac,
- FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(MainBoardInvokeSyncService.getInstance().getProductKey()))
- .orderType(A1OrderEnum.REQUEST_SET_PRODUCT_KEY.getCode()).build(),
- A1TernaryCodeRespInnerFrame.class);
- A1TernaryCodeRespInnerFrame responseInnerFrame = productKeyResp.getResponseInnerFrame();
+ IRequestFrame build1 = FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(MainBoardInvokeSyncService.getInstance().getProductKey())).orderType(A1OrderEnum.REQUEST_SET_PRODUCT_KEY.getCode()).build();
+ CommonFrame commonFrame1 = MainBoardInvokeSyncService.getInstance().sendRRPC(baseMac, build1);
+ //瀛樺偍鎸褰�
+ StoreOperationRecordsUtils.storeInnerFrameData(baseMac, "璁惧閰嶇疆ProductKey", build1, commonFrame1);
+
+ A1TernaryCodeRespInnerFrame responseInnerFrame = new A1TernaryCodeRespInnerFrame().transformFrame(commonFrame1.getPayload());
if (!MainBoardInvokeSyncService.getInstance().getProductKey().equals(responseInnerFrame.getTernaryCode())) {
throw new BusinessException("璁惧閰嶇疆ProductKey澶辫触");
}
// 5 閰嶇疆Mac鈶�
- WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(baseMac,
- FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(uniqueMac))
- .orderType(A1OrderEnum.REQUEST_SET_DEVICE_NAME.getCode()).build(),
- A1TernaryCodeRespInnerFrame.class);
- A1TernaryCodeRespInnerFrame deviceNameFrame = responseCommonFrame.getResponseInnerFrame();
- if (!uniqueMac.equals(deviceNameFrame.getTernaryCode())) {
+ IRequestFrame build2 = FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(uniqueMac)).orderType(A1OrderEnum.REQUEST_SET_DEVICE_NAME.getCode()).build();
+ CommonFrame commonFrame2 = MainBoardInvokeSyncService.getInstance().sendRRPC(baseMac, build2);
+ //瀛樺偍鎸褰�
+ StoreOperationRecordsUtils.storeInnerFrameData(baseMac, "璁惧閰嶇疆鍚�", build2, commonFrame2);
+
+ A1TernaryCodeRespInnerFrame a1TernaryCodeRespInnerFrame = new A1TernaryCodeRespInnerFrame().transformFrame(commonFrame2.getPayload());
+ if (!uniqueMac.equals(a1TernaryCodeRespInnerFrame.getTernaryCode())) {
throw new BusinessException("璁惧閰嶇疆鍚嶅け璐�");
}
// 6 閰嶇疆Mac鈶�
- WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> wrapResponseCommonFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(baseMac,
- FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(deviceDetail.getDeviceSecret()))
- .orderType(A1OrderEnum.REQUEST_SET_DEVICE_SECRET.getCode()).build(),
- A1TernaryCodeRespInnerFrame.class);
- A1TernaryCodeRespInnerFrame deviceSecretFrame = wrapResponseCommonFrame.getResponseInnerFrame();
+ IRequestFrame build3 = FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(deviceDetail.getDeviceSecret())).orderType(A1OrderEnum.REQUEST_SET_DEVICE_SECRET.getCode()).build();
+ CommonFrame commonFrame3 = MainBoardInvokeSyncService.getInstance().sendRRPC(baseMac, build3);
+ //瀛樺偍鎸褰�
+ StoreOperationRecordsUtils.storeInnerFrameData(baseMac, "璁惧瀵嗛挜", build3, commonFrame3);
+
+ A1TernaryCodeRespInnerFrame deviceSecretFrame = new A1TernaryCodeRespInnerFrame().transformFrame(commonFrame3.getPayload());
+
if (!deviceDetail.getDeviceSecret().equals(deviceSecretFrame.getTernaryCode())) {
throw new BusinessException("璁惧瀵嗛挜澶辫触");
}
// 7 閲嶅惎璁惧 骞朵娇鐢ㄦ柊鐨凪ac
- CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(baseMac,
- FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
- .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
+ IRequestFrame build4 = FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame()).orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build();
+ CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(baseMac, build4);
+ //瀛樺偍鎸褰�
+ StoreOperationRecordsUtils.storeInnerFrameData(baseMac, "閲嶅惎璁惧", build4, rebootFrame);
+
if ("00".equals(rebootFrame.getPayload())) {
- // pole.setDeviceCode(uniqueMac);
-
- // setMac = updateById(pole);
-
System.out.println("閲嶅惎鎴愬姛");
}
- Pole pole = new Pole();
- /* String type = uniqueMac.substring(uniqueMac.length() - 2, uniqueMac.length());
- String Code = uniqueMac.substring(0, uniqueMac.length() - 2);*/
+
+ Pole pole = getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, uniqueMac));
+ if (pole == null) {
+ pole = new Pole();
+ }
pole.setDeviceCode(uniqueMac);
pole.setPoleName(uniqueMac);
- /* int i = Integer.parseInt(strm);*/
if ("00".equals(a1DeviceMacRespInnerFrame.getType())) {
pole.setDeviceType(0);
} else if ("01".equals(a1DeviceMacRespInnerFrame.getType())) {
@@ -602,16 +1004,35 @@
}
pole.setPoleCode(generatePoleCode());
- Pole one = getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, uniqueMac));
-// setMac = save(pole);
- if (one == null) {
- return save(pole);
- } else {
- pole.setId(one.getId());
- return updateById(pole);
+
+ boolean result = saveOrUpdate(pole);
+
+ if (result) {
+ Light light = SpringContextHolder.getBean(LightService.class).getOne(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, pole.getDeviceCode()).last("limit 1"));
+ if (light == null) {
+ light = new Light();
+ light.setDeviceCode(uniqueMac);
+ light.setLightCount(2);
+ SpringContextHolder.getBean(LightService.class).save(light);
+ }
}
+ /**
+ * 瀹炰綋鐏潌娉ㄥ唽鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鐏潌ID锛�" + pole.getId() + ",鐏潌缂栧彿锛�" + pole.getPoleCode() + ",鐏潌鍚嶇О锛�" + pole.getPoleName() + ",鐏潌绫诲瀷锛�" + pole.getDeviceType() + ",鐏潌MAC锛�" + pole.getDeviceCode() + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "瀹炰綋鐏潌娉ㄥ唽", content);
+ /**
+ * 瀹炰綋鐏潌娉ㄥ唽鏃ュ織璁板綍缁撴潫
+ */
+ Map map = new HashMap();
+ if (true) {
+ map.put("mac", uniqueMac);
+ } else {
+ map.put("mac", -1);
+ }
+ return map;
}
public List<String> listDeviceCodeByIds(List<Long> poleIdList) {
@@ -619,8 +1040,7 @@
return null;
}
List<Pole> list = list(Wrappers.lambdaQuery(Pole.class).in(Pole::getId, poleIdList).select(Pole::getDeviceCode));
- return list
- .stream().filter(Objects::nonNull).map(Pole::getDeviceCode).filter(StrUtil::isNotEmpty).collect(Collectors.toList());
+ return list.stream().filter(Objects::nonNull).map(Pole::getDeviceCode).filter(StrUtil::isNotEmpty).collect(Collectors.toList());
}
/**
@@ -661,10 +1081,40 @@
if (pole == null) {
throw new BusinessException("鐏潌涓嶅瓨鍦�");
}
- pole.setUserId(clientId);
- if (!clientService.findClientId(clientId)) {
- pole.setClientId(clientService.getClientId(clientId));
+ pole.setClientId(clientId);
+ if (clientService.findClientId(clientId)) {
+ pole.setUserId(clientService.getClientId(clientId));
+
}
+ r = updateById(pole);
+
+ if (!r) {
+ throw new BusinessException("鐏潌ID涓�" + poleId + "璁剧疆澶辫触,鑷姩鍋滄");
+ }
+
+ }
+ return r;
+ }
+
+ /**
+ * 鐢ㄦ埛瑙ｇ粦鐏潌
+ *
+ * @param clientId
+ * @param poleIds
+ * @return
+ */
+ public boolean ClientUnBindingPole(long clientId, int[] poleIds) {
+ boolean r = false;
+ for (int poleId : poleIds) {
+ Pole pole = getById(poleId);
+ if (pole == null) {
+ throw new BusinessException("鐏潌涓嶅瓨鍦�");
+ }
+
+ //涓�绾у鎴� -1 userId
+ //浜岀骇瀹㈡埛 涓婄骇瀹㈡埛id userId
+ pole.setClientId(-1L);
+ pole.setUserId(-1L);
r = updateById(pole);
if (!r) {
@@ -678,36 +1128,23 @@
public List<Pole> getOwnerPole(BaseConditionVO baseConditionVO, String keyword, Long cilentId) {
LambdaQueryWrapper<Pole> eq;
-// if(SecurityUtils.getClientId()!=null){
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
if (clientService.findClientId(cilentId)) {
- eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getUserId, cilentId);
+ eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, cilentId);
} else {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, cilentId)
- .or(
- pole -> {
- pole.eq(Pole::getUserId, cilentId);
- }
- );
+ eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, cilentId).or(pole -> {
+ pole.eq(Pole::getUserId, cilentId);
+ });
}
-// }else {
-// PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
-// eq = Wrappers.lambdaQuery(Pole.class);
-// }
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+
if (!keyword.isEmpty()) {
- eq.like(Pole::getPoleName, keyword).or(
- code -> {
- code.like(Pole::getPoleCode, keyword);
- }
- ).or(
- deviceCode -> {
- deviceCode.like(Pole::getDeviceCode, keyword);
- }
- );
+ eq.like(Pole::getPoleName, keyword).or(code -> {
+ code.like(Pole::getPoleCode, keyword);
+ }).or(deviceCode -> {
+ deviceCode.like(Pole::getDeviceCode, keyword);
+ });
}
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
List<Pole> list;
list = list(eq);
setCount(list);
@@ -724,45 +1161,62 @@
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;
}
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("鍦ㄧ嚎");
@@ -786,4 +1240,183 @@
// return energy;
// }
+
+ public boolean updateDeviceCode(Long poleId) {
+ return poleMapper.updateDeviceCode(poleId);
+ }
+
+
+ /**
+ * 鎺ㄩ�佸ぇ姘旂洃娴嬫暟鎹埌novaLED
+ */
+ 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) {
+ throw new BusinessException("鐏潌涓嶅瓨鍦�");
+ }
+ if (air == null) {
+ throw new BusinessException("鏈粦瀹氬ぇ姘旂洃娴嬭澶�");
+ }
+ if (xixun == null) {
+ throw new BusinessException("鏈粦瀹歺ixun璁惧");
+ }
+ //鑾峰彇澶ф皵鐩戞祴鏁版嵁
+ A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage data = SpringContextHolder.getBean(AirDataService.class).getDataByPoleid(poleId);
+ //鎺ㄩ�佹暟鎹�
+ 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("璁惧涓嶅瓨鍦�");
+ }
+ //鍏抽棴鎺ㄩ��
+ String clear = SpringContextHolder.getBean(LightemitUtils.class).clear(xixun.getDeviceCode());
+ if (clear.contains("is not") || clear.contains("does not")) {
+ throw new BusinessException("璁惧涓嶅湪绾挎垨璁惧鏈瓨鍦ㄤ簬鏈嶅姟鍣�");
+ }
+ }
+
+ /**
+ * 鎺ㄩ�佸ぇ姘旂洃娴嬫暟鎹埌novaLED
+ */
+ public VnnoxResult pushAirDataToNova(PushAirDataToNovaParam param) {
+ Long poleId = param.getPoleId();
+ Pole pole = getById(poleId);
+ PoleBinding air = poleBindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId).eq(PoleBinding::getDeviceType, 3));
+ if (air == null) {
+ throw new BusinessException("鏈粦瀹氬ぇ姘旂洃娴嬭澶�");
+ }
+ PoleBinding nova = poleBindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId).eq(PoleBinding::getDeviceType, 1));
+ if (nova == null) {
+ throw new BusinessException("鏈粦瀹歯ova璁惧");
+ }
+ LedPlayerEntity LED = SpringContextHolder.getBean(LedPlayerEntityService.class).getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, nova.getDeviceCode()));
+ if (pole == null) {
+ throw new BusinessException("鐏潌涓嶅瓨鍦�");
+ }
+ //鑾峰彇澶ф皵鐩戞祴鏁版嵁
+ A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage data = SpringContextHolder.getBean(AirDataService.class).getDataByPoleid(poleId);
+ //鎺ㄩ�佹暟鎹�
+// return SpringContextHolder.getBean(VnnoxService.class).publishWaterData(LED.getPlayerId(),param.getDuration(), data);
+ return SpringContextHolder.getBean(VnnoxService.class).WaterData(LED.getPlayerId(), param.getDuration(), data);
+ }
+
+
+ /**
+ * 缁熻璁惧鐘舵�佸瓨鍏edis
+ */
+ public void setRedis() {
+
+ // redisStatusKeyTimeout涓虹┖ 浠ｈ〃涓婃璋冪敤鍦�15鍒嗛挓鍓�
+ if (redisUtils.get("redisStatusKeyTimeout") != null) {
+ //涓嶄负绌� 璇存槑鐭椂闂村唴璋冪敤杩� 鐩存帴杩斿洖
+ System.out.println("15鍒嗛挓鍐呭凡缁忔洿鏂拌繃鏁版嵁");
+ return;
+ }
+
+ //璁剧疆瑙﹀彂鏉′欢 瀛樺叆Redis 15鍒嗛挓瓒呮椂 15鍒嗛挓鍐呭啀娆¤皟鐢ㄧ洿鎺ヨ繑鍥�
+ redisUtils.set("redisStatusKeyTimeout", System.currentTimeMillis(), 60 * 15);
+
+ CountDownLatch countDownLatch = new CountDownLatch(7);//todo
+ //鑾峰彇涓�涓�7浣嶉殢鏈烘暟
+ String str = RandomStringUtils.randomAlphanumeric(7);
+ countDownLatchUtil.push(str, countDownLatch);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ SpringContextHolder.getBean(IpVolumeService.class).setCacheData();
+ countDownLatchUtil.countDown(str);
+ System.out.println("闊虫煴鎵ц");
+
+ }
+ }).start();
+
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ SpringContextHolder.getBean(MonitorService.class).setCacheData();
+ countDownLatchUtil.countDown(str);
+ System.out.println("鎽勫儚澶存墽琛�");
+ }
+ }).start();
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ SpringContextHolder.getBean(LightService.class).setCacheData();
+ countDownLatchUtil.countDown(str);
+ System.out.println("鍗曠伅鎵ц");
+ }
+ }).start();
+// new Thread(new Runnable() {
+// @Override
+// public void run() {
+// SpringContextHolder.getBean(C3ChargingService.class).setCacheData();
+// countDownLatchUtil.countDown(str);
+// System.out.println("鍏呯數妗╂墽琛�");
+// }
+// }).start();
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ SpringContextHolder.getBean(AirEquipmentService.class).setCacheData();
+ countDownLatchUtil.countDown(str);
+ System.out.println("澶ф皵鎵ц");
+ }
+ }).start();
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ SpringContextHolder.getBean(PoleLightemitService.class).setCacheData();
+ countDownLatchUtil.countDown(str);
+ System.out.println("鐔欐睕鎵ц");
+ }
+ }).start();
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ SpringContextHolder.getBean(VnnoxService.class).setCacheData();
+ countDownLatchUtil.countDown(str);
+ System.out.println("璇虹摝鎵ц"); //todo 璇虹摝鏁呴殰鏆傛棤
+ }
+ }).start();
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ SpringContextHolder.getBean(PoleLightemitService.class).setCacheData();
+ countDownLatchUtil.countDown(str);
+ System.out.println("鐔欐睕鎵ц");
+ }
+ }).start();
+
+
+ try {
+ countDownLatch.await(12000, TimeUnit.MILLISECONDS);
+ countDownLatchUtil.remove(str);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3