From d41c7315b1850e58c93604001052bcfcb877e4cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 30 五月 2025 11:02:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java
index 92d2cb3..fd1cb7e 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java
@@ -55,7 +55,7 @@
//走川标的公司
private List<Integer> enterprise = Arrays.asList(17458936, 43984060, 13914394);
//固定报警类型
- private List<Integer> warnType = Arrays.asList(0x0201, 0x0012, 0x0203, 0x0208, 0x0002, 0x0212, 0x0214, 0x0213, 0x0217, 0x0307);
+ private List<Integer> warnType = Arrays.asList(0x0201, 0x0202, 0x0301, 0x000B, 0x0012, 0x0203, 0x0208, 0x0002, 0x0211, 0x0212, 0x0214, 0x0213, 0x0215, 0x0217, 0x0307);
public void up_warn_msg(ChannelHandlerContext ctx, OuterPacket out) {
@@ -210,8 +210,8 @@
upWarnMsgAdptInfo.setWarnTime(LocalDateTime.parse(data.getAlarmTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).toEpochSecond(ZoneOffset.ofHours(8)));
upWarnMsgAdptInfo.setInfoId(data.getAlarmId());
upWarnMsgAdptInfo.setLevel(getLevel(data.getLevel()));
- upWarnMsgAdptInfo.setLongitude(data.getLongitude().intValue());
- upWarnMsgAdptInfo.setLatitude(data.getLatitude().intValue());
+ upWarnMsgAdptInfo.setLongitude(data.getLatitude().intValue() * 10);
+ upWarnMsgAdptInfo.setLatitude(data.getLongitude().intValue());
upWarnMsgAdptInfo.setAltitude(data.getHeight().intValue() / 10);
upWarnMsgAdptInfo.setSpeed(data.getSpeed().intValue() / 100000);
upWarnMsgAdptInfo.setVec2(data.getSpeed().intValue() / 100000);
--
Gitblit v1.7.1