~zhangnaisong/ruoyi-api-alarm.git

			@@ -188,7 +188,8 @@
			byte[] type = Arrays.copyOfRange(data, 0, 1);//命令类型
			// log.info("命令类型:" + DatatypeConverter.printHexBinary(type));
			byte[] cmdId = Arrays.copyOfRange(data, 1, 2);//命令ID
			// log.info("命令ID:" + DatatypeConverter.printHexBinary(cmdId));
			String cmdIdStr=DatatypeConverter.printHexBinary(cmdId);
			//log.info("命令ID:" + DatatypeConverter.printHexBinary(cmdId));
			byte[] payloadSize = Arrays.copyOfRange(data, 2, 4);//有效负载大小
			payloadSize = toLittleEndian(payloadSize);
			//log.info("payloadSize:" + DatatypeConverter.printHexBinary(payloadSize));
			@@ -196,11 +197,12 @@
			// log.info("有效负载大小(转整型):" + payloadSizeToDecimal);
			//endregion
			List<ArdAlarmRadar> radarAlarmInfos = new ArrayList<>();
			ArdAlarmRadar radarFollowInfo = null;
			List<ArdAlarmRadar> radarFollowInfos = new ArrayList<>();
			//抽油机状态雷达推送集合
			List<ArdAlarmRadar> well = new ArrayList<>();
			String alarmTime = "";
			Integer targetNum = 0;
			log.debug("处理雷达"+radarName+"数据-->命令ID:"+cmdIdStr);
			//雷达移动防火报警
			if (Arrays.equals(cmdId, new byte[]{0x01})) {
			//region 告警信息反馈
			@@ -309,11 +311,15 @@
			double thetaRadians = Math.toRadians(fTy + 90);
			// 使用正弦函数计算对边长度
			Distance = Math.sin(thetaRadians) * Distance;
			if(Distance<0)
			{
			continue;//过滤距离小于0的脏数据
			}
			//log.debug("目标投影距离(m):" + Distance);

			Double[] radarXY = {radarLongitude, radarLagitude};
			Double[] alarmXY = GisUtils.CalculateCoordinates(radarXY, Distance, (double) fTx);
			log.debug("报警信息：" + "【radarId】" + radarId+ "【targetId】" + targetId + "【name】" + alarmPointName + "【alarmType】" + alarmType + "【alarmTime】" + alarmTime + "【distance】" + Distance + "【P】" + fTx + "【T】" + fTy + "【X】" + alarmXY[0] + "【Y】" + alarmXY[1]);
			log.debug("报警信息：" + "【radarName】" + radarName + "【targetId】"+ targetId + "【alarmType】" + alarmType + "【alarmTime】" + alarmTime + "【name】" + alarmPointName+"【Distance】"+Distance);
			ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();
			ardAlarmRadar.setTargetId(targetId);
			ardAlarmRadar.setName(alarmPointName);
			@@ -324,9 +330,7 @@
			int bit1 = (cStat[0] >> 1) & 0x1;
			//目标的B1=1 锁定
			if (bit1 == 1) {
			radarFollowInfo = ardAlarmRadar;
			//将追踪锁定的报警对象属性复制给radarFollowInfo对象
			//BeanUtils.copyProperties(ardAlarmRadar, radarFollowInfo);
			radarFollowInfos.add(ardAlarmRadar);
			}
			}
			//endregion
			@@ -342,9 +346,10 @@
			radarAlarmData.setAlarmTime(alarmTime);
			radarAlarmData.setArdAlarmRadars(radarAlarmInfos);
			MqttProducer.publish(2, false, "radar", JSON.toJSONString(radarAlarmData));
			if (radarFollowInfo != null) {
			if (radarFollowInfos.size() >0) {
			radarAlarmData.setArdFollowRadars(radarFollowInfos);
			//当前雷达扫描存在引导跟踪数据，只保留最后一次锁定的数据
			MqttProducer.publish(2, false, "radarFollowGuide", JSON.toJSONString(radarFollowInfo));
			MqttProducer.publish(2, false, "radarFollowGuide", JSON.toJSONString(radarAlarmData));
			}
			//抽油机状态MQTT队列
			radarAlarmData.setArdAlarmRadars(well);
			@@ -428,7 +433,7 @@
			//log.info("所属告警区域名称:" + DatatypeConverter.printHexBinary(szName));
			String alarmPointName = ByteUtils.bytesToStringZh(szName);
			// log.info("所属告警区域名称:" + alarmPointName);
			log.debug("报警信息："+ "【radarId】" + radarId + "【targetId】" + targetId + "【name】" + alarmPointName + "【alarmType】" + alarmType + "【alarmTime】" + alarmTime);
			log.debug("报警信息："+ "【radarName】" + radarName + "【targetId】" + targetId + "【name】" + alarmPointName + "【alarmType】" + alarmType + "【alarmTime】" + alarmTime);
			ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();
			ardAlarmRadar.setTargetId(targetId);
			ardAlarmRadar.setName(alarmPointName);
			@@ -441,7 +446,7 @@
			//抽油机状态集合中装入数据
			byte[] szName = Arrays.copyOfRange(data, index + 32, index + 64);
			String alarmPointName = ByteUtils.bytesToStringZh(szName);
			log.debug("报警信息：" + "【radarId】" + radarId + "【targetId】" + targetId + "【name】" + alarmPointName + "【alarmType】抽油机状态报警【alarmState】" + wellType + "【alarmTime】" + alarmTime);
			//log.debug("状态信息：" + "【radarName】" + radarName + "【targetId】" + targetId + "【alarmTime】" + alarmTime + "【name】" + alarmPointName + "【alarmState】" + wellType);
			ArdAlarmRadar wellAlarm = new ArdAlarmRadar();
			wellAlarm.setTargetId(targetId);
			wellAlarm.setName(alarmPointName);