From b9276c27abdac33f7e3fefccb4600a98db465c6e Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 11 五月 2022 16:49:10 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 621 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 451 insertions(+), 170 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 7518889..ad0012e 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
@@ -7,13 +7,19 @@
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;
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.entity.Command;
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.request.A1TernaryCodeReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.A5LightResetReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.EmptyRequestInnerFrame;
@@ -21,19 +27,18 @@
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.dao.domain.Pole;
-import com.sandu.ximon.dao.domain.PoleBinding;
-import com.sandu.ximon.dao.domain.PoleGroupRelation;
+import com.sandu.ximon.admin.utils.LightemitUtils;
+import com.sandu.ximon.admin.utils.ListPagingUtils;
+import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.admin.utils.response.VnnoxResult;
+import com.sandu.ximon.admin.vo.PoleBindVO;
+import com.sandu.ximon.dao.bo.*;
+import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.mapper.PoleMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -41,10 +46,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;
/**
@@ -60,11 +62,14 @@
private final RedisService redisService;
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);
}
@@ -72,6 +77,13 @@
Pole pole = getById(poleId);
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);
@@ -87,6 +99,8 @@
if (pole == null) {
throw new BusinessException("鏈壘鍒拌鐏潌");
}
+ // 鍒犻櫎鐏潌缁戝畾鍏崇郴
+ poleBindingService.remove(Wrappers.<PoleBinding>lambdaQuery().eq(PoleBinding::getPoleId, poleId));
return removeById(poleId);
}
@@ -110,146 +124,181 @@
}
- 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<>();
+ /**
+ * 缁熻鍦ㄧ嚎鐏潌鏁伴噺
+ *
+ * @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());
+ wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId()).or(
+ w -> {
+ w.eq(Pole::getUserId, SecurityUtils.getUserId());
+ });
}
- if (!param.getKeyword().isEmpty()) {
- wrapper.like(Pole::getPoleCode, param.getKeyword()).or(
- wrappers -> {
- wrappers.like(Pole::getPoleName, param.getKeyword());
- }
- );
- }
+ //鐏潌
+ List<Pole> list = list(wrapper);
+ List<Pole> poles = isOnLine(list);
+ result.put("poleOnlineCount", poles.size());
+ result.put("poleTotalCount", list.size());
- 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<Pole> bind = isBind(list, param);
-// List<Pole> aTrue = isTrue(list, param);
-// List<Pole> onLine = isOnLine(list, param);
-
- 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);//鍦ㄧ嚎/绂荤嚎
- }
+ //璇虹摝
+ 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).getList();
+ monitorParam.setEquipmentState(1);
+ List<MonitorBo> online = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, monitorParam).getList();
+ 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());
-// 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);
-//// }
-//
-// if (param.getIsTrue() == 1) { //铏氭嫙鐏潌
-// list = isFalse;
-// } else if (param.getIsTrue() == 0) {//瀹炰綋鐏潌
-// setOnline(list);
-// list = isTrue;
-// list.forEach(onLinePole -> {
-// System.out.println("online---------------------------------------------------"+("ONLINE").equals(onLinePole.getOnLineState()));
-// System.out.println("online---------------------------------------------------"+(onLinePole.getOnLineState()));
-// if (("ONLINE").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;
+ //澶ф皵
+ number = 0;
+ List<AirEquipmentBo> airEquipments = SpringContextHolder.getBean(AirEquipmentService.class).listAirEquipmentByKeyword(null, null);
+ for (AirEquipmentBo airEquipmentBo : airEquipments) {
+ if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT_STATE.getCode() + airEquipmentBo.getMac()) != null) {
+ number++;
+ }
+ }
+ result.put("AirEquipmentOnlineCount", number);
+ result.put("AirEquipmentTotalCount", airEquipments.size());
+ //澶ф皵(鍐滆��)
+ 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_STATE.getCode() + airEquipmentNongGengBo.getMac()) != null) {
+ number++;
+ }
+ }
+ result.put("AirEquipmentNongGengOnlineCount", number);
+ result.put("AirEquipmentNongGengTotalCount", airEquipmentNongGengBos.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 CommonPage queryAllStatesAndList(Integer pageNo, Integer pageSize, PoleStatesParam param) {
+ if (param == null) {
+ param = new PoleStatesParam();
+ }
+ System.out.println(param);
+ List<Pole> poleList;
+ if (SecurityUtils.getClientId() == null) {
+ poleList = poleMapper.queryPoleOnLineStatesList(null, param.getIsTrue(), param.getBingStates(), param.getGroupid(), param.getKeyword());
+ } else {
+ poleList = poleMapper.queryPoleOnLineStatesList(SecurityUtils.getUserId(), param.getIsTrue(), param.getBingStates(), param.getGroupid(), param.getKeyword());
+ }
+
+ List<Pole> PoleResult = isOnLine(poleList, param);
+ setCount(PoleResult);
+
+ CommonPage commonPage = ListPagingUtils.pages(PoleResult, pageNo, pageSize);
+
+ 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;
}
@@ -284,6 +333,26 @@
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;
+ }
+
/**
* 鏌ヨ缁戝畾鐘舵��
*
@@ -311,11 +380,14 @@
}
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);
@@ -350,16 +422,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());
+
}
}
@@ -373,8 +442,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<>();
@@ -399,16 +466,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());
}
@@ -462,22 +525,17 @@
.build();
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
.sendRRPC(deviceName, build);
+
System.out.println(commonFrame.toString());
+
CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
.sendRRPC(deviceName,
FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
.orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
- if ("00".equals(rebootFrame.getPayload())) {
- System.out.println("閲嶅惎鎴愬姛");
- }
- CommonFrame result = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(deviceName,
- FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
- .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
boolean b = false;
- if ("00".equals(result.getPayload())) {
+ if ("00".equals(rebootFrame.getPayload())) {
byId.setDeviceCode(null);
b = updateById(byId);
System.out.println("閲嶅惎鎴愬姛");
@@ -572,16 +630,28 @@
}
Pole pole = new Pole();
- String strh = uniqueMac.substring(uniqueMac.length() - 2, uniqueMac.length());
- pole.setDeviceCode(strh);
- pole.setPoleName(strh);
- String strm = uniqueMac.substring(0, uniqueMac.length() - 2);
- int i = Integer.parseInt(strm);
- pole.setPoleCode(generatePoleCode());
- pole.setDeviceType(i);
- setMac = save(pole);
+ /* String type = uniqueMac.substring(uniqueMac.length() - 2, uniqueMac.length());
+ String Code = uniqueMac.substring(0, uniqueMac.length() - 2);*/
+ 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())) {
+ pole.setDeviceType(1);
+ }
- return setMac;
+ 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);
+ }
+
+
}
public List<String> listDeviceCodeByIds(List<Long> poleIdList) {
@@ -631,7 +701,10 @@
if (pole == null) {
throw new BusinessException("鐏潌涓嶅瓨鍦�");
}
- pole.setClientId(clientId);
+ pole.setUserId(clientId);
+ if (!clientService.findClientId(clientId)) {
+ pole.setClientId(clientService.getClientId(clientId));
+ }
r = updateById(pole);
if (!r) {
@@ -641,4 +714,212 @@
}
return r;
}
-}
+
+
+ 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);
+ } else {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ 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);
+ }
+ );
+ }
+ List<Pole> list;
+ list = list(eq);
+ setCount(list);
+ setOnline(list);
+ return list;
+ }
+
+
+ /**
+ * 鏍规嵁鐏潌id鏌ヨ鐏潌缁戝畾璁惧
+ *
+ * @return
+ */
+ public PoleBindVO getBindByPoleId(Long poleId) {
+ List<PoleBinding> bind = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId));
+
+ 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 (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("鍦ㄧ嚎");
+ } else if (deviceStatuses.get(0).getStatus() == 2) {
+ one.setOnLineState("鏈縺娲�");
+ } else if (deviceStatuses.get(0).getStatus() == 3) {
+ one.setOnLineState("涓嶅彲鐢�");
+ } else {
+ one.setOnLineState("鏈煡");
+ }
+ return one;
+ }
+
+// /**
+// * 鐢ㄦ埛鎬诲崟鐏妭鑳界巼
+// */
+// public Double getPoleEnergy() {
+// Double energy = 0.0;
+//
+//
+// 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("璁惧涓嶅瓨鍦�");
+ }
+ //鍏抽棴鎺ㄩ��
+ SpringContextHolder.getBean(LightemitUtils.class).clear(xixun.getDeviceCode());
+
+ }
+
+ /**
+ * 鎺ㄩ�佸ぇ姘旂洃娴嬫暟鎹埌novaLED
+ */
+ public VnnoxResult pushAirDataToNova(Long poleId) {
+ Pole pole = getById(poleId);
+ PoleBinding air = poleBindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId).eq(PoleBinding::getDeviceType, 3));
+ PoleBinding nova = poleBindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId).eq(PoleBinding::getDeviceType, 1));
+ LedPlayerEntity LED = SpringContextHolder.getBean(LedPlayerEntityService.class).getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, nova.getDeviceCode()));
+ if (pole == null) {
+ throw new BusinessException("鐏潌涓嶅瓨鍦�");
+ }
+ if (air == null) {
+ throw new BusinessException("鏈粦瀹氬ぇ姘旂洃娴嬭澶�");
+ }
+ if (nova == null) {
+ throw new BusinessException("鏈粦瀹歯ova璁惧");
+ }
+ //鑾峰彇澶ф皵鐩戞祴鏁版嵁
+ A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage data = SpringContextHolder.getBean(AirDataService.class).getDataByPoleid(poleId);
+ //鎺ㄩ�佹暟鎹�
+ return SpringContextHolder.getBean(VnnoxService.class).publishWaterData(LED.getPlayerId(), data);
+ }
+
+
+}
\ No newline at end of file
--
Gitblit v1.9.3