diff --git a/maibu-common/src/main/java/com/maibu/core/business/Device.java b/maibu-common/src/main/java/com/maibu/core/business/Device.java index 37de3f1..9411e78 100644 --- a/maibu-common/src/main/java/com/maibu/core/business/Device.java +++ b/maibu-common/src/main/java/com/maibu/core/business/Device.java @@ -105,7 +105,7 @@ public class Device extends BaseDO { /** * 设备在线状态（1-在线，2-离线） */ - @ApiModelProperty("设备状态（1-在线，2-离线）") + @ApiModelProperty("设备状态（1-在线，0-离线）") @Excel(name = "设备在线状态") private Integer onlineStatus; @@ -230,9 +230,9 @@ public class Device extends BaseDO { @TableField(exist = false) private DeviceRunParam runParam; - private boolean hasRegistered = false; + private Boolean hasRegistered; - private boolean hasHost = false; + private Boolean hasHost; @TableField(exist = false) private LocationMessage locationMessage; diff --git a/maibu-netty-server/src/main/java/com/maibu/netty/handler/DeviceConnectHandler.java b/maibu-netty-server/src/main/java/com/maibu/netty/handler/DeviceConnectHandler.java index c25935f..149cd00 100644 --- a/maibu-netty-server/src/main/java/com/maibu/netty/handler/DeviceConnectHandler.java +++ b/maibu-netty-server/src/main/java/com/maibu/netty/handler/DeviceConnectHandler.java @@ -1,5 +1,6 @@ package com.maibu.netty.handler; +import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; import java.util.List; @@ -183,12 +184,60 @@ public class DeviceConnectHandler extends SimpleChannelInboundHandler { NettyDevice masterDevice = sessionManager.getDevice(sessionId); if (masterDevice == null) { - // sessionManager.getControl(sessionId); + // sessionManager.getControl(sessionId); handleMasterConnect(ctx, sessionId, null, ConnectorStatus.ACTIVE); } else { ctx.channel().attr(Constant.ATT_DEVICE_ID).set(sessionId); } } + } else { + handleSlaveConnect(ctx, data); + logger.info("{}: 下位机连接", data); + Device device = deviceService.selectDeviceBySerialNumber(data); + if (device == null) { + device = new Device(); + device.setStatus(3); + device.setOnlineStatus(DeviceStatus.online.getType()); + device.setSerialNumber(data); + device.setDeviceName(data); + device.setProductId(-1L); + device.setTenantId(-1L); + device.setFirmwareVersion(BigDecimal.valueOf(1.0)); + device.setProductName("割草机产品MC700"); + device.setCreateTime(LocalDateTime.now()); + device.setUpdateTime(LocalDateTime.now()); + device.setHasHost(false); + deviceService.insertDeviceBySelf(device); + } else { + device.setStatus(3); + device.setOnlineStatus(DeviceStatus.online.getType()); + device.setUpdateTime(LocalDateTime.now()); + device.setHasHost(false); + deviceService.updateDeviceBySelf(device); + } + NettyDevice slaveDevice = sessionManager.getDevice(data); + if (slaveDevice != null) { + slaveDevice.setOnlineStatus(1); + slaveDevice.setDevice(device); + } + // // 推送json 找到设备绑定的主机进行推送 + // List controlMasters = + // sessionManager.getAllSlaveControl(device.getSerialNumber()); + // if (!CollectionUtils.isEmpty(controlMasters)) { + // controlMasters.forEach(x -> { + // DeviceStatusChangeDTO changeDTO = new DeviceStatusChangeDTO(); + // changeDTO.setDeviceId(data); + // changeDTO.setStatus(DeviceStatus.online.getCode()); + // changeDTO.setEvent(RespondCode.device_status_changed); + // ByteBuf buf = ctx.alloc().buffer(); + // CommandUtils.buildCommand(buf, changeDTO, CommandConstant.interaction); + // String content = buf.toString(CharsetUtil.UTF_8); + // logger.info("推送下位机登录状态消息:{}", content); + // if (x.getChannel() != null && x.getChannel().isActive()) { + // x.getChannel().writeAndFlush(buf); + // } + // }); + // } } } } else if (cmdType == CommandConstant.interaction) { @@ -244,7 +293,8 @@ public class DeviceConnectHandler extends SimpleChannelInboundHandler { changeDTO.setType(MesType.device_task_change); changeDTO.setTaskId(taskId); - GlobalMemory.customMqttDeviceMonitor.publish(mqttClientId, String.format(MqttTopic.DEVICE_TASK_STATUS_TOPIC, taskId), + GlobalMemory.customMqttDeviceMonitor.publish(mqttClientId, + String.format(MqttTopic.DEVICE_TASK_STATUS_TOPIC, taskId), JsonUtils.toJsonString(changeDTO)); List controlMasters = sessionManager .getAllSlaveControl(deviceId); @@ -267,7 +317,8 @@ public class DeviceConnectHandler extends SimpleChannelInboundHandler { reportDTO.setTaskId(taskId); reportDTO.setEntity(device.getCurrentPoint()); reportDTO.setType(MesType.device_task_arrive_point); - GlobalMemory.customMqttDeviceMonitor.publish(mqttClientId, String.format(MqttTopic.DEVICE_TASK_ARRIVE_TOPIC, taskId), + GlobalMemory.customMqttDeviceMonitor.publish(mqttClientId, + String.format(MqttTopic.DEVICE_TASK_ARRIVE_TOPIC, taskId), JsonUtils.toJsonString(reportDTO)); List controlMasters = sessionManager @@ -300,10 +351,10 @@ public class DeviceConnectHandler extends SimpleChannelInboundHandler { logger.info("12指令切换权限，c:{}", c.getConnectorId()); if (!c.getConnectorId().equals(masterId)) { // c.setCurrentSlaveId(null); -// c.removeConnectedDevice(slaveDevice); + // c.removeConnectedDevice(slaveDevice); c.setConnectorStatus(ConnectorStatus.RECEIVER); sessionManager.unLock(c.getConnectorId()); -// sysUserClientService.updateAliveStatus(c.getConnectorId(), slaveId, 2); + // sysUserClientService.updateAliveStatus(c.getConnectorId(), slaveId, 2); } }); } @@ -312,7 +363,8 @@ public class DeviceConnectHandler extends SimpleChannelInboundHandler { masterDevice.setCurrentSlaveId(slaveId); masterDevice.setConnectorStatus(ConnectorStatus.ACTIVE); masterDevice.addConnectedDevice(slaveDevice); -// sysUserClientService.updateAliveStatus(masterDevice.getConnectorId(), slaveId, 1); + // sysUserClientService.updateAliveStatus(masterDevice.getConnectorId(), + // slaveId, 1); } else { logger.info("权限切换请求被拒绝"); } @@ -343,73 +395,81 @@ public class DeviceConnectHandler extends SimpleChannelInboundHandler { } } -// /** -// * 找到当前设备控制的主机 转发控制请求 -// */ -// private void handlePermissionRequest(DeviceRequestDTO requestDTO, byte[] bytes, ChannelHandlerContext ctx) { -// logger.info("转发控制请求 :{}", JsonUtils.toJsonString(requestDTO)); -// String slaveId = requestDTO.getDeviceId(); -// List controlList = sessionManager.getSlaveControl(slaveId); -// String masterId = requestDTO.getUserId() + ":" + requestDTO.getPlatform(); -// logger.info("转发控制请求 controlList :{}", JsonUtils.toJsonString(controlList)); -// if (!CollectionUtils.isEmpty(controlList)) { -// // 如果当前设备有控制 -// logger.info("转发控制请求 发送报文"); -// NettyDevice controlDevice = controlList.get(0); -// if (controlDevice != null && controlDevice.getChannel() != null && controlDevice.getChannel().isActive()) { -// controlDevice.getChannel().writeAndFlush(Unpooled.wrappedBuffer(bytes)); -// logger.info("转发控制请求 发送报文结束 deviceId :{}", controlDevice.getConnectorId()); -// controlRequestMap.put(masterId, slaveId); -// logger.info("转发控制请求 controlRequestMap:{}", JsonUtils.toJsonString(controlRequestMap)); -// } -// -// } else { -// // 判断直接给权限 还是 判断是否有该账号其他端的的控制有权限 -// NettyDevice activeDevice = sessionManager.getUserControl(requestDTO.getUserId()); -// boolean sendMes = true; -// if (activeDevice == null) { -// sendMes = false; -// } else { -// if (activeDevice.getConnectorId().equals(masterId)) { -// sendMes = false; -// } -// } -// if (sendMes) { -// if (activeDevice.getChannel() != null && activeDevice.getChannel().isActive()) { -// activeDevice.getChannel().writeAndFlush(Unpooled.wrappedBuffer(bytes)); -// logger.info("转发控制请求2 发送报文结束 deviceId :{}", activeDevice.getConnectorId()); -// controlRequestMap.put(masterId, slaveId); -// logger.info("转发控制请求2 controlRequestMap:{}", JsonUtils.toJsonString(controlRequestMap)); -// } -// } else { -// NettyDevice masterDevice = sessionManager.getDevice(masterId); -// if (masterDevice != null) { -// NettyDevice slaveDevice = sessionManager.getDevice(slaveId); -// masterDevice.setCurrentSlaveId(slaveId); -// masterDevice.setConnectorStatus(ConnectorStatus.ACTIVE); -// masterDevice.addConnectedDevice(slaveDevice); -// -// sysUserClientService.updateAliveStatus(masterDevice.getConnectorId(), slaveId, 1); -// if (masterDevice.getChannel() != null && masterDevice.getChannel().isActive()) { -// DeviceRequestDTO reDto = new DeviceRequestDTO(); -// reDto.setPlatform(requestDTO.getPlatform()); -// DeviceRespondDTO respond = new DeviceRespondDTO(); -// respond.setSwitchResult(true); -// respond.setHolder("you"); -// respond.setDeviceId(slaveId); -// reDto.setRespond(respond); -// ByteBuf buf = ctx.alloc().buffer(); -// CommandUtils.buildCommand(buf, reDto, CommandConstant.interaction); -// String content = buf.toString(CharsetUtil.UTF_8); -// masterDevice.getChannel().writeAndFlush(buf); -// logger.info("转发控制请求设置当前控制2 发送报文:{} deviceId :{}", content, masterId); -// } -// } else { -// -// } -// } -// } -// } + // /** + // * 找到当前设备控制的主机 转发控制请求 + // */ + // private void handlePermissionRequest(DeviceRequestDTO requestDTO, byte[] + // bytes, ChannelHandlerContext ctx) { + // logger.info("转发控制请求 :{}", JsonUtils.toJsonString(requestDTO)); + // String slaveId = requestDTO.getDeviceId(); + // List controlList = sessionManager.getSlaveControl(slaveId); + // String masterId = requestDTO.getUserId() + ":" + requestDTO.getPlatform(); + // logger.info("转发控制请求 controlList :{}", JsonUtils.toJsonString(controlList)); + // if (!CollectionUtils.isEmpty(controlList)) { + // // 如果当前设备有控制 + // logger.info("转发控制请求 发送报文"); + // NettyDevice controlDevice = controlList.get(0); + // if (controlDevice != null && controlDevice.getChannel() != null && + // controlDevice.getChannel().isActive()) { + // controlDevice.getChannel().writeAndFlush(Unpooled.wrappedBuffer(bytes)); + // logger.info("转发控制请求 发送报文结束 deviceId :{}", controlDevice.getConnectorId()); + // controlRequestMap.put(masterId, slaveId); + // logger.info("转发控制请求 controlRequestMap:{}", + // JsonUtils.toJsonString(controlRequestMap)); + // } + // + // } else { + // // 判断直接给权限 还是 判断是否有该账号其他端的的控制有权限 + // NettyDevice activeDevice = + // sessionManager.getUserControl(requestDTO.getUserId()); + // boolean sendMes = true; + // if (activeDevice == null) { + // sendMes = false; + // } else { + // if (activeDevice.getConnectorId().equals(masterId)) { + // sendMes = false; + // } + // } + // if (sendMes) { + // if (activeDevice.getChannel() != null && + // activeDevice.getChannel().isActive()) { + // activeDevice.getChannel().writeAndFlush(Unpooled.wrappedBuffer(bytes)); + // logger.info("转发控制请求2 发送报文结束 deviceId :{}", activeDevice.getConnectorId()); + // controlRequestMap.put(masterId, slaveId); + // logger.info("转发控制请求2 controlRequestMap:{}", + // JsonUtils.toJsonString(controlRequestMap)); + // } + // } else { + // NettyDevice masterDevice = sessionManager.getDevice(masterId); + // if (masterDevice != null) { + // NettyDevice slaveDevice = sessionManager.getDevice(slaveId); + // masterDevice.setCurrentSlaveId(slaveId); + // masterDevice.setConnectorStatus(ConnectorStatus.ACTIVE); + // masterDevice.addConnectedDevice(slaveDevice); + // + // sysUserClientService.updateAliveStatus(masterDevice.getConnectorId(), + // slaveId, 1); + // if (masterDevice.getChannel() != null && + // masterDevice.getChannel().isActive()) { + // DeviceRequestDTO reDto = new DeviceRequestDTO(); + // reDto.setPlatform(requestDTO.getPlatform()); + // DeviceRespondDTO respond = new DeviceRespondDTO(); + // respond.setSwitchResult(true); + // respond.setHolder("you"); + // respond.setDeviceId(slaveId); + // reDto.setRespond(respond); + // ByteBuf buf = ctx.alloc().buffer(); + // CommandUtils.buildCommand(buf, reDto, CommandConstant.interaction); + // String content = buf.toString(CharsetUtil.UTF_8); + // masterDevice.getChannel().writeAndFlush(buf); + // logger.info("转发控制请求设置当前控制2 发送报文:{} deviceId :{}", content, masterId); + // } + // } else { + // + // } + // } + // } + // } /** * 找到当前设备控制的主机 转发控制请求 @@ -462,7 +522,7 @@ public class DeviceConnectHandler extends SimpleChannelInboundHandler { } private void handleMasterConnect(ChannelHandlerContext ctx, String masterId, String slaveId, - ConnectorStatus status) { + ConnectorStatus status) { ctx.channel().attr(Constant.ATT_DEVICE_ID).set(masterId); sessionManager.registerDevice(masterId, ctx.channel(), ConnectorType.MASTER, status, slaveId); // sessionManager.bindConnector(masterId, slaveId); diff --git a/maibu-netty-server/src/main/java/com/maibu/service/DeviceThreadService.java b/maibu-netty-server/src/main/java/com/maibu/service/DeviceThreadService.java index 5062213..6a2c86d 100644 --- a/maibu-netty-server/src/main/java/com/maibu/service/DeviceThreadService.java +++ b/maibu-netty-server/src/main/java/com/maibu/service/DeviceThreadService.java @@ -299,6 +299,12 @@ public class DeviceThreadService { } hostLocationMapper.saveOrUpdate(locationMessage); } + Device device = deviceService.selectDeviceBySerialNumber(deviceId); + if (device != null) { + device.setOnlineStatus(DeviceStatus.offline.getType()); + device.setUpdateTime(LocalDateTime.now()); + deviceService.updateDeviceBySelf(device); + } } } else { if (nettyDevice == null) { @@ -322,9 +328,7 @@ public class DeviceThreadService { device.setStatus(3); device.setOnlineStatus(DeviceStatus.online.getType()); device.setUpdateTime(LocalDateTime.now()); - if (!device.isHasHost()) { - device.setHasHost(true); - } + device.setHasHost(true); deviceService.updateDeviceBySelf(device); } // 推送json 找到设备绑定的主机进行推送 diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java index 7f256a4..20f5923 100644 --- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java +++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java @@ -328,13 +328,24 @@ public class DeviceServiceImpl implements IDeviceService { if (!CollectionUtils.isEmpty(deviceList)) { List ids = deviceList.stream().map(Device::getDeviceName).collect(Collectors.toList()); List allStatusList = deviceStatusHistoryMapper.selectLatestByDeviceIds(ids); + // 有上位机的 + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.in(LocationMessage::getDeviceId, ids); + List hostLocations = hostLocationMapper.selectList(query); + Map locationMap = hostLocations.stream() + .collect(Collectors.toMap(LocationMessage::getDeviceId, Function.identity())); + for (Device x : deviceList) { if (siteMemory.hasTask(x.getSerialNumber())) { work += 1; x.setFeStatus(1); } else { free += 1; - x.setFeStatus(2); + if (x.getOnlineStatus() == null || x.getOnlineStatus() == 0) { + x.setFeStatus(3); + } else { + x.setFeStatus(2); + } } String key = "running_status:" + x.getDeviceName(); DeviceStatusRecordDTO recordDTO = redisCache.getCacheObject(key); @@ -360,7 +371,16 @@ public class DeviceServiceImpl implements IDeviceService { } } } + x.setLastRunningStatus(lastRunningStatus); + + String locationKey = NettyCacheKey.latestPositonKey + x.getDeviceName(); + LocationMessage locationMessage = redisCache.getCacheObject(locationKey); + if (locationMessage == null) { + locationMessage = locationMap.get(x.getDeviceName()); + } + x.setLocationMessage(locationMessage); + } statusStatistics.put(0, work); statusStatistics.put(1, free);