From af4b8add9d103889472a75973847871b7dcdf3c8 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 08 九月 2025 14:23:36 +0800
Subject: [PATCH] 0908
---
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 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 b7d4519..24bafdb 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
@@ -87,7 +87,7 @@
up_warn_msg_urge_todo_ack(ctx, out.getGnsscenterId(), warnMsg);
break;
case UP_WARN_MSG_ADPT_INFO:
- log.debug("上报报警信息({})：{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), out);
+ log.info("上报报警信息({})：{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), out);
up_warn_msg_adpt_info(ctx, out.getGnsscenterId(), warnMsg);
break;
case UP_WARN_MSG_OPERATION_INFO:
@@ -155,38 +155,59 @@
* @param warnMsg
*/
public void up_warn_msg_adpt_info(ChannelHandlerContext ctx, int inferiorPlatformId, WarnMsg warnMsg) {
+ log.info("上报报警信息cz0({})：{}",inferiorPlatformId,warnMsg);
UPWarnMsgAdptInfo upWarnMsgAdptInfo = enterprise.contains(inferiorPlatformId) ? new UPWarnMsgAdptInfo().decode2(warnMsg) : new UPWarnMsgAdptInfo().decode1(warnMsg);
upWarnMsgAdptInfo.setResult(0x00);
upWarnMsgAdptInfo.setInferiorPlatformId(inferiorPlatformId);
upWarnMsgAdptInfo.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
- log.warn("上报报警信息({})：{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo));
+ log.info("上报报警信息cz1({})：{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo));
switch (inferiorPlatformId) {
case 17458936:
if(!fl_warnType.contains(upWarnMsgAdptInfo.getWarnType())){
return;
}
+ if(0x001==upWarnMsgAdptInfo.getLevel()){
+ return;
+ }
+ break;
case 43984060:
if(!jh_warnType.contains(upWarnMsgAdptInfo.getWarnType())){
return;
}
+ if(0x001==upWarnMsgAdptInfo.getLevel()){
+ return;
+ }
+ break;
case 17235341:
+ log.info("上报报警信息cz88888({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
if(!cz_warnType.contains(upWarnMsgAdptInfo.getWarnType())){
+ log.info("上报报警信息czcontains({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
return;
}
+ break;
case 82296583:
+ log.info("上报报警信息cz88888({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
if(!cz_warnType.contains(upWarnMsgAdptInfo.getWarnType())){
+ log.info("上报报警信息czcontains({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
+
return;
}
+ break;
case 25439966:
if(!gj_warnType.contains(upWarnMsgAdptInfo.getWarnType())){
return;
}
+ break;
case 13914394:
if(!pa_warnType.contains(upWarnMsgAdptInfo.getWarnType())){
return;
}
+ break;
}
+ log.info("上报报警信息555555({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
+ try {
if(0 == upWarnMsgAdptInfo.getLongitude()){
+ log.info("上报报警信息6666666({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
UPExgMsgRealLocation upExgMsgRealLocation = upExgMsgRealLocationDao.findByVehicleNoOrderByCreateTimeDesc(upWarnMsgAdptInfo.getVehicleNo());
if (null != upExgMsgRealLocation) {
GnssData gnssData = upExgMsgRealLocation.getGnssData();
@@ -195,8 +216,15 @@
upWarnMsgAdptInfo.setLatitude(gnssData.getLat());
}
}
- upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo);
- log.info("上报报警信息({})：{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo));
+ log.info("上报报警信息333333");
+
+ upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo);
+ }catch (Exception e){
+ e.printStackTrace();
+ log.info("上报报警信息保存失败{}",e.getMessage());
+ }
+
+ log.info("上报报警信息2({})：{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo));
//请求报警附件（川标协议）
if(enterprise.contains(inferiorPlatformId)){
--
Gitblit v1.7.1