Compare commits
4 Commits
dev_map
...
1d2636f641
| Author | SHA1 | Date | |
|---|---|---|---|
| 1d2636f641 | |||
| 40c6edda36 | |||
| be27d2b56e | |||
| f690786847 |
@@ -5,8 +5,12 @@ import com.maibu.core.business.device.Connector;
|
||||
import com.maibu.core.business.device.NettyDevice;
|
||||
import com.maibu.core.enums.ConnectorStatus;
|
||||
import com.maibu.core.enums.ConnectorType;
|
||||
import com.maibu.utils.json.JsonUtils;
|
||||
|
||||
import io.netty.channel.Channel;
|
||||
import lombok.Data;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -23,6 +27,7 @@ import java.util.stream.Collectors;
|
||||
*/
|
||||
@Component
|
||||
@Data
|
||||
@Slf4j
|
||||
public class DeviceSessionManager {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(DeviceSessionManager.class);
|
||||
@@ -187,7 +192,7 @@ public class DeviceSessionManager {
|
||||
public List<NettyDevice> getSlaveControl(String slaveId) {
|
||||
// 获取所有连接的主机 且是active状态的
|
||||
return deviceMap.values().stream()
|
||||
.filter(device -> ObjectUtil.equals(device.getCurrentSlaveId(), slaveId)
|
||||
.filter(device -> Objects.equals(device.getCurrentSlaveId(), slaveId)
|
||||
&& ConnectorStatus.ACTIVE.equals(device.getConnectorStatus()))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
@@ -195,14 +200,16 @@ public class DeviceSessionManager {
|
||||
public List<NettyDevice> getAllSlaveControl(String slaveId) {
|
||||
// 获取所有连接的主机 不区分状态
|
||||
return deviceMap.values().stream()
|
||||
.filter(device -> ObjectUtil.equals(device.getCurrentSlaveId(), slaveId))
|
||||
.filter(device -> !StringUtils.isEmpty(device.getCurrentSlaveId())
|
||||
&& Objects.equals(device.getCurrentSlaveId(), slaveId)
|
||||
&& device.getDeviceType().equals(ConnectorType.MASTER))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public NettyDevice getCurrentControl(String slaveId) {
|
||||
// 获取所有连接的主机 不区分状态
|
||||
return deviceMap.values().stream()
|
||||
.filter(device -> ObjectUtil.equals(device.getCurrentSlaveId(), slaveId)
|
||||
.filter(device -> Objects.equals(device.getCurrentSlaveId(), slaveId)
|
||||
&& ConnectorStatus.ACTIVE.equals(device.getConnectorStatus()))
|
||||
.findFirst().orElse(null);
|
||||
}
|
||||
@@ -312,8 +319,11 @@ public class DeviceSessionManager {
|
||||
if (taskId == null) {
|
||||
return null;
|
||||
}
|
||||
log.debug("sendMessage deviceMap:{},taskId={}", JsonUtils.toJsonString(deviceMap), taskId);
|
||||
for (String key : deviceMap.keySet()) {
|
||||
NettyDevice nettyDevice = deviceMap.get(key);
|
||||
log.debug("sendMessage currentTaskId:{},equal {}", JsonUtils.toJsonString(nettyDevice.getCurrentTaskId()),
|
||||
Objects.equals(nettyDevice.getCurrentTaskId(), taskId));
|
||||
if (nettyDevice != null && Objects.equals(nettyDevice.getCurrentTaskId(), taskId)) {
|
||||
return nettyDevice.getConnectorId();
|
||||
}
|
||||
|
||||
@@ -63,10 +63,13 @@ public class SiteMemory {
|
||||
return deviceMapPushMap;
|
||||
}
|
||||
|
||||
public void saveMaPushDTO(String deviceId, DeviceMapPushDTO dto) {
|
||||
public void saveMapPushDTO(String deviceId, DeviceMapPushDTO dto) {
|
||||
deviceMapPushMap.put(deviceId, dto);
|
||||
}
|
||||
|
||||
public void removeMapPushDTO(String deviceId) {
|
||||
deviceMapPushMap.remove(deviceId);
|
||||
}
|
||||
|
||||
public void saveRunStatistics(DeviceRunStatistics deviceRunStatistics) {
|
||||
if (deviceRunStatistics != null && !StringUtils.isEmpty(deviceRunStatistics.getDeviceId())) {
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.maibu.mqtt;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.paho.client.mqttv3.MqttException;
|
||||
import com.maibu.core.business.dto.DeviceMapPushDTO;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
@@ -161,14 +162,20 @@ public class HostMessageHandler implements CustomMqttMessageHandler {
|
||||
}
|
||||
|
||||
public WebStatusMessageDTO createWebDeviceLocationMessage(HostLocationRelTimeDTO locationRelTimeDTO,
|
||||
String deviceId) {
|
||||
String deviceId) {
|
||||
WebStatusMessageDTO webStatusMessageDTO = new WebStatusMessageDTO();
|
||||
List<DeviceStatusDetail> transferData = new ArrayList<>();
|
||||
|
||||
DeviceStatusDetail d = new DeviceStatusDetail();
|
||||
d.setName("deviceId");
|
||||
d.setValue(deviceId);
|
||||
d.setUnit("");
|
||||
transferData.add(d);
|
||||
|
||||
DeviceStatusDetail lat = new DeviceStatusDetail();
|
||||
lat.setName("latitude");
|
||||
lat.setValue(String.valueOf(locationRelTimeDTO.getData().getLatitude()));
|
||||
lat.setUnit("");
|
||||
|
||||
transferData.add(lat);
|
||||
|
||||
DeviceStatusDetail lng = new DeviceStatusDetail();
|
||||
@@ -227,15 +234,15 @@ public class HostMessageHandler implements CustomMqttMessageHandler {
|
||||
DeviceMapPushDTO dto = new DeviceMapPushDTO();
|
||||
dto.setA(Double.parseDouble(altitude.getValue()));
|
||||
dto.setId(deviceId);
|
||||
// dto.setB();
|
||||
// dto.setHa();
|
||||
// dto.setB();
|
||||
// dto.setHa();
|
||||
dto.setF(fix_status.getValue());
|
||||
dto.setS(status.getValue());
|
||||
dto.setLat(Double.parseDouble(lat.getValue()));
|
||||
dto.setLng(Double.parseDouble(lng.getValue()));
|
||||
dto.setT(nettyDevice.getCurrentTaskId());
|
||||
dto.setY(Double.parseDouble(yaw.getValue()));
|
||||
siteMemory.saveMaPushDTO(deviceId, dto);
|
||||
siteMemory.saveMapPushDTO(deviceId, dto);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -376,6 +383,15 @@ public class HostMessageHandler implements CustomMqttMessageHandler {
|
||||
}
|
||||
}
|
||||
}
|
||||
// todo 推送实时位置和状态消息到外部
|
||||
try {
|
||||
GlobalMemory.customMqttDeviceMonitor.publish(mqttClientId,
|
||||
String.format(MqttTopic.DEVICE_TASK_STATUS_TOPIC, taskId),
|
||||
JsonUtils.toJsonString(sendDto));
|
||||
} catch (MqttException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
}
|
||||
if ("cancelled".equals(dto.getStatus())) {
|
||||
|
||||
@@ -453,9 +453,9 @@ public class DeviceTaskService {
|
||||
x.setTaskStausTranslate(taskStaus.getDescription());
|
||||
});
|
||||
list.sort(
|
||||
Comparator.comparing(DevicePlanTask::getFinishTime,
|
||||
Comparator.comparing(DevicePlanTask::getCreateTime,
|
||||
Comparator.nullsLast(Comparator.reverseOrder()))
|
||||
.thenComparing(DevicePlanTask::getCreateTime,
|
||||
.thenComparing(DevicePlanTask::getFinishTime,
|
||||
Comparator.nullsLast(Comparator.reverseOrder())));
|
||||
return list;
|
||||
}
|
||||
|
||||
@@ -223,7 +223,7 @@ public class DeviceThreadService {
|
||||
}
|
||||
|
||||
public List<AlarmMessage> compareErrorStandard(Long siteId, Long orgId, DeviceRunningStatusHistory history,
|
||||
List<ErrorIdentificationStandard> standards) {
|
||||
List<ErrorIdentificationStandard> standards) {
|
||||
if (history == null || CollectionUtils.isEmpty(standards))
|
||||
return null;
|
||||
List<AlarmMessage> list = new ArrayList<>();
|
||||
@@ -343,6 +343,8 @@ public class DeviceThreadService {
|
||||
}
|
||||
deviceRunStatisticsMapper.saveOrUpdate(deviceRunStatistics);
|
||||
}
|
||||
// todo 删除实时消息推送里面的数据
|
||||
siteMemory.removeMapPushDTO(deviceId);
|
||||
}
|
||||
|
||||
sessionManager.removeDevice(deviceId);
|
||||
@@ -393,7 +395,6 @@ public class DeviceThreadService {
|
||||
}, 0, 500, TimeUnit.MILLISECONDS);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 监控心跳
|
||||
*/
|
||||
@@ -404,18 +405,16 @@ public class DeviceThreadService {
|
||||
if (!CollectionUtils.isEmpty(list)) {
|
||||
list.forEach(x -> {
|
||||
Map<String, DeviceMapPushDTO> map = x.getAllDeviceMapPush();
|
||||
if (!CollectionUtils.isEmpty(map)) {
|
||||
List<DeviceMapPushDTO> pushList = new ArrayList<>(map.values());
|
||||
WebMapMessageDTO dto = new WebMapMessageDTO();
|
||||
dto.setData(pushList);
|
||||
dto.setType(MesType.mapPush);
|
||||
try {
|
||||
websocketMesDispather.mapMessageDispather(x.getSiteId(), JsonUtils.toJsonString(pushList));
|
||||
} catch (Exception e) {
|
||||
log.error("实时地图数据websocket推送失败: siteId={}, error={}", x.getSiteId(),
|
||||
e.getMessage(), e);
|
||||
}
|
||||
|
||||
List<DeviceMapPushDTO> pushList = new ArrayList<>(map.values());
|
||||
WebMapMessageDTO dto = new WebMapMessageDTO();
|
||||
dto.setData(pushList);
|
||||
dto.setType(MesType.mapPush);
|
||||
try {
|
||||
websocketMesDispather.mapMessageDispather(x.getSiteId(),
|
||||
JsonUtils.toJsonString(dto));
|
||||
} catch (Exception e) {
|
||||
log.error("实时地图数据websocket推送失败: siteId={}, error={}", x.getSiteId(),
|
||||
e.getMessage(), e);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user