#实时消息和参数
This commit is contained in:
@@ -83,7 +83,7 @@ public class CommandForwardHandler extends SimpleChannelInboundHandler<String> {
|
||||
}
|
||||
for (Connector target : connectedDevices) {
|
||||
|
||||
if (!target.canReceive()) {
|
||||
if (target == null || !target.canReceive()) {
|
||||
logger.debug("发送拒绝master:{},消息到达的slave设备:{},处于禁止接收状态", senderDeviceId, target.getConnectorId());
|
||||
continue;
|
||||
}
|
||||
@@ -110,8 +110,8 @@ public class CommandForwardHandler extends SimpleChannelInboundHandler<String> {
|
||||
.setScale(2, RoundingMode.HALF_UP)
|
||||
.doubleValue();
|
||||
|
||||
data.setLinear_speed(linearSpeed);
|
||||
data.setAngular_speed(angularSpeed);
|
||||
data.setLinear_x(linearSpeed);
|
||||
data.setAngular_z(angularSpeed);
|
||||
|
||||
data.setChassis_lift(pEntity.getChassisLiftFlag());
|
||||
data.setCutter(pEntity.getMowerSpeedFlag());
|
||||
|
||||
@@ -140,13 +140,13 @@ public class DataToDataBaseHandler extends SimpleChannelInboundHandler<String> {
|
||||
nettyDevice.setLatestStatus(latestStatus);
|
||||
}
|
||||
} else if (bytes[2] == CommandConstant.readConfig) {
|
||||
DeviceRunParam runParam = DeviceRunParam.fromBytes(bytes);
|
||||
logger.debug("收到返回的设备运行参数: {}", JsonUtils.toJsonString(runParam));
|
||||
CompletableFuture<DeviceRunParam> future = ctx.channel().attr(Constant.READ_CONFIG_KEY).get();
|
||||
if (future != null) {
|
||||
future.complete(runParam);
|
||||
ctx.channel().attr(Constant.READ_CONFIG_KEY).set(null);
|
||||
}
|
||||
// DeviceRunParam runParam = DeviceRunParam.fromBytes(bytes);
|
||||
// logger.debug("收到返回的设备运行参数: {}", JsonUtils.toJsonString(runParam));
|
||||
// CompletableFuture<DeviceRunParam> future = ctx.channel().attr(Constant.READ_CONFIG_KEY).get();
|
||||
// if (future != null) {
|
||||
// future.complete(runParam);
|
||||
// ctx.channel().attr(Constant.READ_CONFIG_KEY).set(null);
|
||||
// }
|
||||
}
|
||||
ctx.fireChannelRead(msg);
|
||||
} catch (Exception e) {
|
||||
|
||||
@@ -75,20 +75,20 @@ public class ScheduledTask {
|
||||
System.out.println("0点定时刷新状态执行完成");
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws DecoderException {
|
||||
String hex = "AB AA 05 88 4D 43 37 30 30 50 4C 55 53 2D 43 4E 2D 4A 53 2D 31 37 38 34 38 37 31 39 37 39 31 39 30 2D 30 30 30 30 30 30 30 41 2D 36 30 00 B1 FB 7F FE FE FE 00 00 00 00 00 00 00 00 00 00 00 00 00 12 01 48 95 E8 03 E8 03 28 32 91 53 24 4D 43 37 30 30 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 31 32 33 34 35 36 37 38 00 00 00 00 00 00 00 00 00 00 00 00 00 08 00 00 00 CD CC A4 41 00 00 80 3F 33 33 33 3F B8 1E 05 3F 33 33 33 3F 9A 99 19 3E 00 00 80 3F 00 00 80 3F 00 00 80 3F 32 36 2D 34 2D 32 37 00 2D 32 37 00 50 B1 BF 00 00 AA AB";
|
||||
String cleanHex = hex.replaceAll("\\s+", ""); // 移除所有空白字符
|
||||
byte[] bytes = Hex.decodeHex(cleanHex);
|
||||
DeviceRunParam runParam = DeviceRunParam.fromBytes(bytes);
|
||||
System.out.println(JsonUtils.toJsonString(runParam));
|
||||
// public static void main(String[] args) throws DecoderException {
|
||||
// String hex = "AB AA 05 88 4D 43 37 30 30 50 4C 55 53 2D 43 4E 2D 4A 53 2D 31 37 38 34 38 37 31 39 37 39 31 39 30 2D 30 30 30 30 30 30 30 41 2D 36 30 00 B1 FB 7F FE FE FE 00 00 00 00 00 00 00 00 00 00 00 00 00 12 01 48 95 E8 03 E8 03 28 32 91 53 24 4D 43 37 30 30 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 31 32 33 34 35 36 37 38 00 00 00 00 00 00 00 00 00 00 00 00 00 08 00 00 00 CD CC A4 41 00 00 80 3F 33 33 33 3F B8 1E 05 3F 33 33 33 3F 9A 99 19 3E 00 00 80 3F 00 00 80 3F 00 00 80 3F 32 36 2D 34 2D 32 37 00 2D 32 37 00 50 B1 BF 00 00 AA AB";
|
||||
// String cleanHex = hex.replaceAll("\\s+", ""); // 移除所有空白字符
|
||||
// byte[] bytes = Hex.decodeHex(cleanHex);
|
||||
// DeviceRunParam runParam = DeviceRunParam.fromBytes(bytes);
|
||||
// System.out.println(JsonUtils.toJsonString(runParam));
|
||||
|
||||
runParam.setLeftBackwardGain(0.2f);
|
||||
runParam.setLeftForwardGain(0.2f);
|
||||
runParam.setRightForwardGain(0.2f);
|
||||
runParam.setRightBackwardGain(0.2f);
|
||||
// runParam.setLeftBackwardGain(0.2f);
|
||||
// runParam.setLeftForwardGain(0.2f);
|
||||
// runParam.setRightForwardGain(0.2f);
|
||||
// runParam.setRightBackwardGain(0.2f);
|
||||
|
||||
byte[] newB = runParam.toWriteBytes();
|
||||
System.out.println(Hex.encodeHexString(newB));
|
||||
// byte[] newB = runParam.toWriteBytes();
|
||||
// System.out.println(Hex.encodeHexString(newB));
|
||||
|
||||
}
|
||||
// }
|
||||
}
|
||||
@@ -43,12 +43,11 @@ public class TransferDeviceService {
|
||||
@Autowired
|
||||
private DeviceMapper deviceMapper;
|
||||
|
||||
|
||||
public AjaxResult bind(DeviceBindDTO bindDTO, LoginUser user) {
|
||||
try {
|
||||
String deviceId = bindDTO.getDeviceId();
|
||||
String deviceAlias = bindDTO.getDeviceAlias();
|
||||
//判断当前设备是否存
|
||||
// 判断当前设备是否存
|
||||
Device device = iDeviceService.selectDeviceBySerialNumber(deviceId);
|
||||
if (device == null) {
|
||||
return AjaxResult.error("设备不存在");
|
||||
@@ -65,7 +64,7 @@ public class TransferDeviceService {
|
||||
device.setDeviceAlias(deviceAlias);
|
||||
device.setActiveTime(new Date());
|
||||
iDeviceService.updateDeviceBySelf(device);
|
||||
// deviceMapper.updateById(device);
|
||||
// deviceMapper.updateById(device);
|
||||
return AjaxResult.success(true);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
@@ -77,7 +76,7 @@ public class TransferDeviceService {
|
||||
public AjaxResult unbind(DeviceBindDTO bindDTO, LoginUser user) {
|
||||
try {
|
||||
String deviceId = bindDTO.getDeviceId();
|
||||
//判断当前设备是否存
|
||||
// 判断当前设备是否存
|
||||
Device device = iDeviceService.selectDeviceBySerialNumber(deviceId);
|
||||
if (device == null) {
|
||||
return AjaxResult.error("设备不存在");
|
||||
@@ -93,9 +92,9 @@ public class TransferDeviceService {
|
||||
device.setTenantName("");
|
||||
device.setUpdateTime(LocalDateTime.now());
|
||||
device.setDeviceAlias("");
|
||||
// deviceMapper.updateById(device);
|
||||
// deviceMapper.updateById(device);
|
||||
iDeviceService.updateDeviceBySelf(device);
|
||||
//判断是否正在控制 如果正在控制,删除控制状态
|
||||
// 判断是否正在控制 如果正在控制,删除控制状态
|
||||
LambdaQueryWrapper<UserClient> lambdaWrapper = new LambdaQueryWrapper<>();
|
||||
lambdaWrapper.eq(UserClient::getDeviceName, deviceId);
|
||||
List<UserClient> users = userClientMapper.selectList(lambdaWrapper);
|
||||
@@ -108,12 +107,15 @@ public class TransferDeviceService {
|
||||
NettyDevice deviceMaster = sessionManager.getDevice(masterId);
|
||||
if (deviceMaster != null) {
|
||||
String oldSlave = userClient.getDeviceName();
|
||||
//删除主的连接关系
|
||||
deviceMaster.getConnectedConnectors().removeIf(x -> x.getConnectorId().equals(oldSlave));
|
||||
//删除从的连接关系
|
||||
// 删除主的连接关系
|
||||
deviceMaster.getConnectedConnectors()
|
||||
.removeIf(x -> x.getConnectorId().equals(oldSlave));
|
||||
// 删除从的连接关系
|
||||
NettyDevice oldSlaveDevice = sessionManager.getDevice(oldSlave);
|
||||
if (oldSlaveDevice != null && !CollectionUtils.isEmpty(oldSlaveDevice.getConnectedConnectors())) {
|
||||
Set<com.maibu.core.business.device.Connector> connectedDevices = oldSlaveDevice.getConnectedConnectors();
|
||||
if (oldSlaveDevice != null
|
||||
&& !CollectionUtils.isEmpty(oldSlaveDevice.getConnectedConnectors())) {
|
||||
Set<com.maibu.core.business.device.Connector> connectedDevices = oldSlaveDevice
|
||||
.getConnectedConnectors();
|
||||
connectedDevices.removeIf(x -> x.getConnectorId().equals(masterId));
|
||||
}
|
||||
}
|
||||
@@ -130,21 +132,20 @@ public class TransferDeviceService {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public AjaxResult updateDeviceAlias(DeviceBindDTO bindDTO, LoginUser user) {
|
||||
try {
|
||||
String deviceId = bindDTO.getDeviceId();
|
||||
//判断当前设备是否存
|
||||
// 判断当前设备是否存
|
||||
Device device = iDeviceService.selectDeviceBySerialNumber(deviceId);
|
||||
if (device == null) {
|
||||
return AjaxResult.error("设备不存在");
|
||||
} else {
|
||||
// Long tenantId = device.getTenantId();
|
||||
// if (tenantId == -1) {
|
||||
// return AjaxResult.error("设备未绑定");
|
||||
// return AjaxResult.error("设备未绑定");
|
||||
// }
|
||||
// if (!tenantId.equals(user.getUserId())) {
|
||||
// return AjaxResult.error("无操作权限");
|
||||
// return AjaxResult.error("无操作权限");
|
||||
// }
|
||||
device.setDeviceAlias(bindDTO.getDeviceAlias());
|
||||
device.setUpdateTime(LocalDateTime.now());
|
||||
@@ -158,76 +159,76 @@ public class TransferDeviceService {
|
||||
}
|
||||
}
|
||||
|
||||
// public synchronized boolean switchDevice(DeviceBindDTO bindDTO, LoginUser user) {
|
||||
// try {
|
||||
// String slaveId = bindDTO.getDeviceId();
|
||||
// String platform = bindDTO.getPlatform();
|
||||
// String userName = user.getUsername();
|
||||
// String masterId = userName + ":" + platform;
|
||||
// //todo 判断是否有权限 正在控制才能切
|
||||
// //todo 离线没有控制权的怎么切
|
||||
// log.info("switchDevice:{}", masterId);
|
||||
// NettyDevice deviceMaster = sessionManager.getDevice(masterId);
|
||||
// log.info("deviceMaster:{}", deviceMaster);
|
||||
// if (deviceMaster != null) {
|
||||
// log.info("ConnectorStatus:{}", deviceMaster.getConnectorStatus());
|
||||
// if (ConnectorStatus.RECEIVER.equals(deviceMaster.getConnectorStatus())) {
|
||||
// //当前账号没有控制则可以切换为控制?
|
||||
// NettyDevice activeDevice = sessionManager.getUserControl(userName);
|
||||
// deviceMaster.getConnectedConnectors().clear();
|
||||
// if (activeDevice == null) {
|
||||
// log.info("bindConnector ACTIVE :{}", masterId);
|
||||
// sessionManager.bindConnector(masterId, slaveId);
|
||||
// deviceMaster.setConnectorStatus(ConnectorStatus.ACTIVE);
|
||||
// deviceMaster.setCurrentSlaveId(slaveId);
|
||||
// sysUserClientService.updateAliveStatus(masterId, slaveId, 1);
|
||||
// } else {
|
||||
// log.info("bindConnector RECEIVER :{}", masterId);
|
||||
// sessionManager.bindConnector(masterId, slaveId);
|
||||
// deviceMaster.setConnectorStatus(ConnectorStatus.RECEIVER);
|
||||
// deviceMaster.setCurrentSlaveId(slaveId);
|
||||
// sysUserClientService.updateAliveStatus(masterId, slaveId, 2);
|
||||
// }
|
||||
// } else {
|
||||
// //从关联其他设备切换到 当前禁言 假如有控制且不是当前更新为2
|
||||
// List<NettyDevice> controls = sessionManager.getSlaveControl(slaveId);
|
||||
// if (CollectionUtils.isEmpty(controls)) {
|
||||
// deviceMaster.getConnectedConnectors().clear();
|
||||
// log.info("bindConnector 1:{}", masterId);
|
||||
// sessionManager.bindConnector(masterId, slaveId);
|
||||
// deviceMaster.setConnectorStatus(ConnectorStatus.ACTIVE);
|
||||
// deviceMaster.setCurrentSlaveId(slaveId);
|
||||
// sysUserClientService.updateAliveStatus(masterId, slaveId, 1);
|
||||
// } else {
|
||||
// NettyDevice controlDevice = controls.get(0);
|
||||
// if (!masterId.equals(controlDevice.getConnectorId())) {
|
||||
// //当前的设备有控制 的主机
|
||||
// deviceMaster.getConnectedConnectors().clear();
|
||||
// log.info("bindConnector RECEIVER 2:{}", masterId);
|
||||
// sessionManager.bindConnector(masterId, slaveId);
|
||||
// deviceMaster.setConnectorStatus(ConnectorStatus.RECEIVER);
|
||||
// deviceMaster.setCurrentSlaveId(slaveId);
|
||||
// sysUserClientService.updateAliveStatus(masterId, slaveId, 2);
|
||||
// }
|
||||
// //当前 切当前不做操作
|
||||
// }
|
||||
// }
|
||||
// return true;
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// log.error("切换设备失败: {}", e.getMessage(), e);
|
||||
// }
|
||||
// return false;
|
||||
// }
|
||||
// public synchronized boolean switchDevice(DeviceBindDTO bindDTO, LoginUser
|
||||
// user) {
|
||||
// try {
|
||||
// String slaveId = bindDTO.getDeviceId();
|
||||
// String platform = bindDTO.getPlatform();
|
||||
// String userName = user.getUsername();
|
||||
// String masterId = userName + ":" + platform;
|
||||
// //todo 判断是否有权限 正在控制才能切
|
||||
// //todo 离线没有控制权的怎么切
|
||||
// log.info("switchDevice:{}", masterId);
|
||||
// NettyDevice deviceMaster = sessionManager.getDevice(masterId);
|
||||
// log.info("deviceMaster:{}", deviceMaster);
|
||||
// if (deviceMaster != null) {
|
||||
// log.info("ConnectorStatus:{}", deviceMaster.getConnectorStatus());
|
||||
// if (ConnectorStatus.RECEIVER.equals(deviceMaster.getConnectorStatus())) {
|
||||
// //当前账号没有控制则可以切换为控制?
|
||||
// NettyDevice activeDevice = sessionManager.getUserControl(userName);
|
||||
// deviceMaster.getConnectedConnectors().clear();
|
||||
// if (activeDevice == null) {
|
||||
// log.info("bindConnector ACTIVE :{}", masterId);
|
||||
// sessionManager.bindConnector(masterId, slaveId);
|
||||
// deviceMaster.setConnectorStatus(ConnectorStatus.ACTIVE);
|
||||
// deviceMaster.setCurrentSlaveId(slaveId);
|
||||
// sysUserClientService.updateAliveStatus(masterId, slaveId, 1);
|
||||
// } else {
|
||||
// log.info("bindConnector RECEIVER :{}", masterId);
|
||||
// sessionManager.bindConnector(masterId, slaveId);
|
||||
// deviceMaster.setConnectorStatus(ConnectorStatus.RECEIVER);
|
||||
// deviceMaster.setCurrentSlaveId(slaveId);
|
||||
// sysUserClientService.updateAliveStatus(masterId, slaveId, 2);
|
||||
// }
|
||||
// } else {
|
||||
// //从关联其他设备切换到 当前禁言 假如有控制且不是当前更新为2
|
||||
// List<NettyDevice> controls = sessionManager.getSlaveControl(slaveId);
|
||||
// if (CollectionUtils.isEmpty(controls)) {
|
||||
// deviceMaster.getConnectedConnectors().clear();
|
||||
// log.info("bindConnector 1:{}", masterId);
|
||||
// sessionManager.bindConnector(masterId, slaveId);
|
||||
// deviceMaster.setConnectorStatus(ConnectorStatus.ACTIVE);
|
||||
// deviceMaster.setCurrentSlaveId(slaveId);
|
||||
// sysUserClientService.updateAliveStatus(masterId, slaveId, 1);
|
||||
// } else {
|
||||
// NettyDevice controlDevice = controls.get(0);
|
||||
// if (!masterId.equals(controlDevice.getConnectorId())) {
|
||||
// //当前的设备有控制 的主机
|
||||
// deviceMaster.getConnectedConnectors().clear();
|
||||
// log.info("bindConnector RECEIVER 2:{}", masterId);
|
||||
// sessionManager.bindConnector(masterId, slaveId);
|
||||
// deviceMaster.setConnectorStatus(ConnectorStatus.RECEIVER);
|
||||
// deviceMaster.setCurrentSlaveId(slaveId);
|
||||
// sysUserClientService.updateAliveStatus(masterId, slaveId, 2);
|
||||
// }
|
||||
// //当前 切当前不做操作
|
||||
// }
|
||||
// }
|
||||
// return true;
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// log.error("切换设备失败: {}", e.getMessage(), e);
|
||||
// }
|
||||
// return false;
|
||||
// }
|
||||
|
||||
public synchronized boolean switchDevice(DeviceBindDTO bindDTO) {
|
||||
try {
|
||||
String slaveId = bindDTO.getDeviceId();
|
||||
// String platform = bindDTO.getPlatform();
|
||||
// String userName = user.getUsername();
|
||||
|
||||
// String masterId = userName + ":" + platform;
|
||||
// String platform = bindDTO.getPlatform();
|
||||
// String userName = user.getUsername();
|
||||
|
||||
// String masterId = userName + ":" + platform;
|
||||
|
||||
String token = bindDTO.getToken();
|
||||
|
||||
@@ -247,9 +248,10 @@ public class TransferDeviceService {
|
||||
sessionManager.lock(slaveId, token);
|
||||
log.info("switchDevice bindConnector slaveId:{},token:{}", slaveId, token);
|
||||
} else {
|
||||
List<String> connectorIds = controls.stream().map(NettyDevice::getConnectorId).collect(Collectors.toList());
|
||||
List<String> connectorIds = controls.stream().map(NettyDevice::getConnectorId)
|
||||
.collect(Collectors.toList());
|
||||
if (!connectorIds.contains(token)) {
|
||||
//当前的设备有控制 的主机
|
||||
// 当前的设备有控制 的主机
|
||||
deviceMaster.getConnectedConnectors().clear();
|
||||
sessionManager.bindConnector(token, slaveId);
|
||||
deviceMaster.setConnectorStatus(ConnectorStatus.RECEIVER);
|
||||
@@ -260,16 +262,15 @@ public class TransferDeviceService {
|
||||
deviceMaster.setCurrentSlaveId(slaveId);
|
||||
sessionManager.lock(slaveId, token);
|
||||
}
|
||||
//当前 切当前不做操作
|
||||
// 当前 切当前不做操作
|
||||
}
|
||||
return true;
|
||||
} catch (Exception e) {
|
||||
log.error("切换设备失败: {}", e.getMessage(), e);
|
||||
log.error("切换设备失败", e);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
public DeviceControlDTO remoteControl(DeviceBindDTO bindDTO) {
|
||||
try {
|
||||
String token = bindDTO.getToken();
|
||||
@@ -290,7 +291,6 @@ public class TransferDeviceService {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
public DeviceSwitchControlDTO switchControl(DeviceBindDTO bindDTO, LoginUser user) {
|
||||
try {
|
||||
String slaveId = bindDTO.getDeviceId();
|
||||
@@ -299,11 +299,11 @@ public class TransferDeviceService {
|
||||
String masterId = userName + ":" + platform;
|
||||
|
||||
DeviceSwitchControlDTO dto = new DeviceSwitchControlDTO();
|
||||
//收到明确的切换设备请求了 从哪边切换到另一边
|
||||
//判断当前是否有控制的设备
|
||||
// 收到明确的切换设备请求了 从哪边切换到另一边
|
||||
// 判断当前是否有控制的设备
|
||||
NettyDevice masterDevice = sessionManager.getDevice(masterId);
|
||||
if (masterDevice == null || !masterDevice.getChannel().isActive()) {
|
||||
//主机已离线
|
||||
// 主机已离线
|
||||
dto.setSwitchControl(false);
|
||||
dto.setReason("主机已离线");
|
||||
return dto;
|
||||
@@ -311,8 +311,8 @@ public class TransferDeviceService {
|
||||
|
||||
NettyDevice slaveDevice = sessionManager.getDevice(slaveId);
|
||||
if (slaveDevice == null || !masterDevice.getChannel().isActive()) {
|
||||
//从机已离线
|
||||
//主机已离线
|
||||
// 从机已离线
|
||||
// 主机已离线
|
||||
dto.setSwitchControl(false);
|
||||
dto.setReason("从机已离线");
|
||||
return dto;
|
||||
@@ -321,7 +321,7 @@ public class TransferDeviceService {
|
||||
List<NettyDevice> controlList = sessionManager.getSlaveControl(slaveId);
|
||||
|
||||
if (!CollectionUtils.isEmpty(controlList)) {
|
||||
//如果当前设备有控制
|
||||
// 如果当前设备有控制
|
||||
controlList.forEach(c -> {
|
||||
if (!c.getConnectorId().equals(masterId)) {
|
||||
c.setCurrentSlaveId(null);
|
||||
@@ -333,7 +333,8 @@ public class TransferDeviceService {
|
||||
}
|
||||
masterDevice.setCurrentSlaveId(slaveId);
|
||||
masterDevice.setConnectorStatus(ConnectorStatus.ACTIVE);
|
||||
// sysUserClientService.updateAliveStatus(masterDevice.getConnectorId(), slaveId, 1);
|
||||
// sysUserClientService.updateAliveStatus(masterDevice.getConnectorId(),
|
||||
// slaveId, 1);
|
||||
|
||||
dto.setSwitchControl(true);
|
||||
dto.setHolder(platform);
|
||||
|
||||
Reference in New Issue
Block a user