diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java index ec06d77..f0d93d5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java @@ -83,7 +83,7 @@ * */ //直接获取当前机器人阈值范围内的船舶数据没然后再计算距离 String rng = (lng * 600000) + "," + (lat * 600000) + "," + thresholdDTO.getShipDistance(); - List ships = shipService.shipsInCircle(rng, 30); + List ships = shipService.shipsInCircle(rng, 60); for (ShipDTO ship : ships) { double distance = EncodeData.distance(ship.getLng(), ship.getLat(), lng, lat); if (distance < thresholdDTO.getShipDistance()) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java index ec06d77..f0d93d5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java @@ -83,7 +83,7 @@ * */ //直接获取当前机器人阈值范围内的船舶数据没然后再计算距离 String rng = (lng * 600000) + "," + (lat * 600000) + "," + thresholdDTO.getShipDistance(); - List ships = shipService.shipsInCircle(rng, 30); + List ships = shipService.shipsInCircle(rng, 60); for (ShipDTO ship : ships) { double distance = EncodeData.distance(ship.getLng(), ship.getLat(), lng, lat); if (distance < thresholdDTO.getShipDistance()) { diff --git a/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java b/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java index 35e95bb..ce3f099 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java +++ b/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java @@ -94,10 +94,24 @@ if (-91 == data[0] && 90 == data[1]) { int[] unsignedData = ByteUtils.bytesToUnsigned(data); log.info("卫星通信返回值 ===> " + Arrays.toString(unsignedData)); - //A55A0A050000000000F0 - //[165, 90, 10, 5, 0, 0, 0, 0, 0, 240] int type = unsignedData[3]; switch (type) { + case 0x01: + //读取北斗/GPS位置信息 + + break; + case 0x02: + //数据接收 + + break; + case 0x03: + //数据发送成功 + + break; + case 0x04: + //数据发送失败 + + break; case 0x05: //当前天通信号强度 satelliteService.saveSatellite(unsignedData);