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 | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 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 1fae260..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
@@ -66,7 +66,7 @@
//均辉报警类型
private List<Integer> jh_warnType = Arrays.asList(0x0201, 0x0012, 0x0202, 0x0203, 0x0208, 0x0002, 0x0212, 0x0214, 0x0213, 0x0215, 0x0217, 0x0307);
//出租车报警类型
- private List<Integer> cz_warnType = Arrays.asList(0x0001, 0x0005);
+ private List<Integer> cz_warnType = Arrays.asList(0x0001, 0x0004, 0x0005);
//公交报警类型
private List<Integer> gj_warnType = Arrays.asList(0x0002, 0x0212, 0x0214, 0x0213, 0x0215, 0x0217, 0x0001);
//平安报警类型
@@ -83,7 +83,7 @@
DataType dataType = DataType.getDataType(warnMsg.getDataType());
switch (dataType) {
case UP_WARN_MSG_URGE_TODO_ACK:
- log.info("报警督办应答消息({})：{}", DataType.UP_WARN_MSG_URGE_TODO_ACK.getCode(), out);
+ log.debug("报警督办应答消息({})：{}", DataType.UP_WARN_MSG_URGE_TODO_ACK.getCode(), out);
up_warn_msg_urge_todo_ack(ctx, out.getGnsscenterId(), warnMsg);
break;
case UP_WARN_MSG_ADPT_INFO:
@@ -91,11 +91,11 @@
up_warn_msg_adpt_info(ctx, out.getGnsscenterId(), warnMsg);
break;
case UP_WARN_MSG_OPERATION_INFO:
- log.info("上报报警处理信息({})：{}", DataType.UP_WARN_MSG_OPERATION_INFO.getCode(), out);
+ log.debug("上报报警处理信息({})：{}", DataType.UP_WARN_MSG_OPERATION_INFO.getCode(), out);
up_warn_msg_operation_info(ctx, out.getGnsscenterId(), warnMsg);
break;
case UP_WARN_MSG_FILELIST_ACK:
- log.info("报警附件目录请求应答({})：{}", DataType.UP_WARN_MSG_FILELIST_ACK.getCode(), out);
+ log.debug("报警附件目录请求应答({})：{}", DataType.UP_WARN_MSG_FILELIST_ACK.getCode(), out);
up_warn_msg_filelist_ack(ctx, out.getGnsscenterId(), warnMsg);
break;
default:
@@ -144,6 +144,7 @@
upWarnMsgUrgeTodoAck.setInferiorPlatformId(inferiorPlatformId);
upWarnMsgUrgeTodoAck.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
upWarnMsgUrgeTodoAckDao.save(upWarnMsgUrgeTodoAck);
+ log.info("报警督办应答消息({})：{}", DataType.UP_WARN_MSG_URGE_TODO_ACK.getCode(), JSON.toJSONString(upWarnMsgUrgeTodoAck));
}
/**
@@ -154,37 +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.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;
}
- upWarnMsgAdptInfo.setResult(0x00);
- upWarnMsgAdptInfo.setInferiorPlatformId(inferiorPlatformId);
- upWarnMsgAdptInfo.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
+ 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();
@@ -193,7 +216,15 @@
upWarnMsgAdptInfo.setLatitude(gnssData.getLat());
}
}
- upWarnMsgAdptInfoDao.save(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)){
@@ -226,6 +257,7 @@
upWarnMsgOperationInfo.setInferiorPlatformId(inferiorPlatformId);
upWarnMsgOperationInfo.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
upWarnMsgOperationInfoDao.save(upWarnMsgOperationInfo);
+ log.info("上报报警处理信息({})：{}", DataType.UP_WARN_MSG_OPERATION_INFO.getCode(), JSON.toJSONString(upWarnMsgOperationInfo));
//修改报警处理结果
UPWarnMsgAdptInfo upWarnMsgAdptInfo = upWarnMsgAdptInfoDao.findByInfoIdIs(upWarnMsgOperationInfo.getInfoId());
if(null != upWarnMsgAdptInfo){
@@ -246,6 +278,7 @@
upWarnMsgFileListAck.setInferiorPlatformId(inferiorPlatformId);
upWarnMsgFileListAck.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
upWarnMsgFileListAckDao.save(upWarnMsgFileListAck);
+ log.info("报警附件目录请求应答({})：{}", DataType.UP_WARN_MSG_FILELIST_ACK.getCode(), JSON.toJSONString(upWarnMsgFileListAck));
//修改报警附件数据
UPWarnMsgAdptInfo upWarnMsgAdptInfo = upWarnMsgAdptInfoDao.findByInfoIdIs(upWarnMsgFileListAck.getInfoId());
if(upWarnMsgFileListAck.getFileList().size() > 0){
--
Gitblit v1.7.1