From d52d4796208241c1a36b11b4e6c823a10ce4592a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 九月 2025 13:47:11 +0800
Subject: [PATCH] update
---
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 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 767b71c..7662598 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
@@ -155,7 +155,7 @@
* @param warnMsg
*/
public void up_warn_msg_adpt_info(ChannelHandlerContext ctx, int inferiorPlatformId, WarnMsg warnMsg) {
- log.info("上报报警信息cz0({})：{}",inferiorPlatformId,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);
@@ -163,8 +163,10 @@
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;
@@ -172,18 +174,21 @@
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());
+// 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());
+// 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());
+// 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());
+// log.info("上报报警信息czcontains({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
return;
}
@@ -199,10 +204,10 @@
}
break;
}
- log.info("上报报警信息555555({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
+// 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());
+// 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();
@@ -211,7 +216,7 @@
upWarnMsgAdptInfo.setLatitude(gnssData.getLat());
}
}
- log.info("上报报警信息333333");
+// log.info("上报报警信息333333");
upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo);
}catch (Exception e){
@@ -219,8 +224,8 @@
log.info("上报报警信息保存失败{}",e.getMessage());
}
- log.info("上报报警信息2({})：{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo));
-
+// log.info("上报报警信息2({})：{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo));
+
//请求报警附件（川标协议）
if(enterprise.contains(inferiorPlatformId)){
DOWNWarnMsgFileListReq downWarnMsgFileListReq = new DOWNWarnMsgFileListReq();
--
Gitblit v1.7.1