From 0e2034dd28f74fbf6fff0aef593b586a2dd9b634 Mon Sep 17 00:00:00 2001 From: liusuyi <13324259@qq.com> Date: 星期二, 14 十一月 2023 21:20:32 +0800 Subject: [PATCH] 修复bug --- src/main/java/com/ard/utils/tcp/ClientHandler.java | 98 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 68 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/ard/utils/tcp/ClientHandler.java b/src/main/java/com/ard/utils/tcp/ClientHandler.java index e4c4479..0063611 100644 --- a/src/main/java/com/ard/utils/tcp/ClientHandler.java +++ b/src/main/java/com/ard/utils/tcp/ClientHandler.java @@ -6,7 +6,7 @@ import com.ard.alarm.radar.domain.RadarAlarmData; import com.ard.utils.other.ByteUtils; import com.ard.utils.other.GisUtils; -import com.ard.utils.mqtt.MqttConsumer; +import com.ard.utils.mqtt.MqttProducer; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelId; @@ -17,9 +17,7 @@ import javax.xml.bind.DatatypeConverter; import java.net.InetSocketAddress; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.util.*; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -43,7 +41,7 @@ * @throws Exception */ @Override - public void channelActive(ChannelHandlerContext ctx) throws Exception { + public void channelActive(ChannelHandlerContext ctx) { context = ctx; startHeartbeatTask();//寮�濮嬪彂閫佸績璺� } @@ -145,7 +143,7 @@ byte[] heart = ByteUtils.appendArrays(header, payload, payloadCrc32, footer); // byte[] heart = {0x01, 0x02, 0x01, 0x10, 0x00, 0x00, 0x00, (byte) 0x83, (byte) 0x88, 0x5d, 0x71, 0x01, 0x02, 0x00}; String hexString = DatatypeConverter.printHexBinary(heart); - // log.debug("鍙戦�佸績璺�:" + hexString); + // log.debug("鍙戦�佸績璺�:" + hexString); message.writeBytes(heart); context.writeAndFlush(message); @@ -177,7 +175,7 @@ if (!crc32Check) { log.debug("CRC32鏍¢獙涓嶉�氳繃"); } else { - log.debug("CRC32鏍¢獙閫氳繃"); + //log.debug("CRC32鏍¢獙閫氳繃"); } //endregion //log.info("鍘熷鏁版嵁:" + DatatypeConverter.printHexBinary(data)); @@ -190,11 +188,12 @@ // log.info("鍛戒护ID:" + DatatypeConverter.printHexBinary(cmdId)); byte[] payloadSize = Arrays.copyOfRange(data, 2, 4);//鏈夋晥璐熻浇澶у皬 payloadSize = ByteUtils.toLittleEndian(payloadSize); + //log.info("payloadSize:" + DatatypeConverter.printHexBinary(payloadSize)); int payloadSizeToDecimal = ByteUtils.bytesToDecimal(payloadSize); // log.info("鏈夋晥璐熻浇澶у皬(杞暣鍨�):" + payloadSizeToDecimal); //endregion List<ArdAlarmRadar> radarAlarmInfos = new ArrayList<>(); - //鎶芥补鏈烘柊鎺ㄩ�侀泦鍚� + //鎶芥补鏈虹姸鎬侀浄杈炬帹閫侀泦鍚� List<ArdAlarmRadar> well = new ArrayList<>(); String alarmTime = ""; Integer targetNum = 0; @@ -305,7 +304,7 @@ float fTy = ByteUtils.bytesToFloat(afTy); log.debug("鍨傜洿瑙掑害:" + fTy); // 灏嗚搴﹁浆鎹负寮у害 - double thetaRadians = Math.toRadians(fTy+90); + double thetaRadians = Math.toRadians(fTy + 90); // 浣跨敤姝e鸡鍑芥暟璁$畻瀵硅竟闀垮害 Distance = Math.sin(thetaRadians) * Distance; log.debug("鐩爣鎶曞奖璺濈(m):" + Distance); @@ -322,6 +321,21 @@ radarAlarmInfos.add(ardAlarmRadar); } //endregion + if (StringUtils.isEmpty(alarmTime)) { + return; + } + if (targetNum == 0) { + return; + } + RadarAlarmData radarAlarmData = new RadarAlarmData(); + radarAlarmData.setRadarId(radarId); + radarAlarmData.setRadarName(radarName); + radarAlarmData.setAlarmTime(alarmTime); + radarAlarmData.setArdAlarmRadars(radarAlarmInfos); + MqttProducer.publish(2, false, "radar", JSON.toJSONString(radarAlarmData)); + //鎶芥补鏈虹姸鎬丮QTT闃熷垪 + radarAlarmData.setArdAlarmRadars(well); + MqttProducer.publish(2, false, "radarWellData", JSON.toJSONString(radarAlarmData)); } if (Arrays.equals(cmdId, new byte[]{0x04})) { //region鎶芥补鏈篈I鐘舵�佸弽棣� @@ -383,8 +397,8 @@ //log.info("鎵�灞炵粍:" + Grp); //endregion String alarmType; - //鏂伴泦鍚堜腑杩愯鍙橀噺 - String wellType = "杩愯"; + //鎶芥补鏈虹姸鎬佸彉閲� + String wellType; byte[] cStat = Arrays.copyOfRange(data, index + 23, index + 24); cStat = ByteUtils.toLittleEndian(cStat); //String binaryString = String.format("%8s", Integer.toBinaryString(cStat[0] & 0xFF)).replace(' ', '0'); @@ -408,12 +422,11 @@ wellType = "鍋滄満"; } else { wellType = "杩愯"; -// continue; } - //鏂扮殑闆嗗悎涓鍏ユ暟鎹� + //鎶芥补鏈虹姸鎬侀泦鍚堜腑瑁呭叆鏁版嵁 byte[] szName = Arrays.copyOfRange(data, index + 32, index + 64); String alarmPointName = ByteUtils.bytesToStringZh(szName); - //log.info("鎶ヨ绫诲瀷:" + alarmType); + log.debug("鎶芥补鏈虹姸鎬佹姤璀︿俊鎭細" + "銆恑d銆�" + id + "銆恘ame銆�" + alarmPointName + "銆恆larmType銆�" + wellType + "銆恆larmTime銆�" + alarmTime); ArdAlarmRadar wellAlarm = new ArdAlarmRadar(); wellAlarm.setTargetId(id); wellAlarm.setName(alarmPointName); @@ -421,25 +434,50 @@ well.add(wellAlarm); } //endregion + if (StringUtils.isEmpty(alarmTime)) { + return; + } + if (targetNum == 0) { + return; + } + RadarAlarmData radarAlarmData = new RadarAlarmData(); + radarAlarmData.setRadarId(radarId); + radarAlarmData.setRadarName(radarName); + radarAlarmData.setAlarmTime(alarmTime); + radarAlarmData.setArdAlarmRadars(radarAlarmInfos); + MqttProducer.publish(2, false, "radar", JSON.toJSONString(radarAlarmData)); + //鎶芥补鏈虹姸鎬丮QTT闃熷垪 + radarAlarmData.setArdAlarmRadars(well); + MqttProducer.publish(2, false, "radarWellData", JSON.toJSONString(radarAlarmData)); } - if (StringUtils.isEmpty(alarmTime)) { - return; + if (Arrays.equals(cmdId, new byte[]{0x02})) { + //region 鍛婅鍓嶇鍙戦�佺殑寮哄埗寮曞淇℃伅 + byte[] iDistance = Arrays.copyOfRange(data, 4, 8); + iDistance = ByteUtils.toLittleEndian(iDistance); + long distance = ByteUtils.bytesToDecimal(iDistance); + log.info("鐩爣褰撳墠璺濈(m):" + distance); + byte[] fTx = Arrays.copyOfRange(data, 8, 12); + fTx = ByteUtils.toLittleEndian(fTx); + float tx = ByteUtils.bytesToFloat(fTx); + log.debug("鏂逛綅:" + tx); + byte[] fTy = Arrays.copyOfRange(data, 12, 16); + fTy = ByteUtils.toLittleEndian(fTy); + float ty = ByteUtils.bytesToFloat(fTy); + if (ty < 0) { + ty += 360; + } + log.debug("淇话:" + ty); + Map<String, Object> forceGuideMap = new HashMap<>(); + forceGuideMap.put("distance", distance); + forceGuideMap.put("p", tx); + forceGuideMap.put("t", ty); + forceGuideMap.put("radarId", radarId); + log.debug("寮哄埗寮曞淇℃伅" + forceGuideMap); + //endregion + MqttProducer.publish(2, false, "radarForceGuide", JSON.toJSONString(forceGuideMap)); } - if (targetNum == 0) { - return; - } - RadarAlarmData radarAlarmData = new RadarAlarmData(); - radarAlarmData.setRadarId(radarId); - radarAlarmData.setRadarName(radarName); - radarAlarmData.setAlarmTime(alarmTime); - radarAlarmData.setArdAlarmRadars(radarAlarmInfos); - MqttConsumer.publish(2, false, "radar", JSON.toJSONString(radarAlarmData)); - //鏂扮殑MQTT闃熷垪 - radarAlarmData.setArdAlarmRadars(well); - MqttConsumer.publish(2, false, "well", JSON.toJSONString(radarAlarmData)); } catch (Exception ex) { log.error("闆疯揪鎶ユ枃瑙f瀽寮傚父:" + ex.getMessage()); } } - -} +} \ No newline at end of file -- Gitblit v1.9.3