From 19c823c2c8df4cceee0d827fb598e7f0d9b69154 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 11 三月 2025 18:57:58 +0800
Subject: [PATCH] 修改809对接bug
---
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 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 c0064ce..42c2f6e 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
@@ -11,7 +11,6 @@
import com.ruoyi.dataInterchange.netty.client.ChannelMap;
import com.ruoyi.dataInterchange.util.jtt809.common.Jtt809Util;
import com.ruoyi.dataInterchange.util.jtt809.packet.common.OuterPacket;
-import com.ruoyi.dataInterchange.wapper.UPConnect;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;
@@ -21,7 +20,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
-import java.util.ArrayList;
+import java.time.ZoneOffset;
import java.util.List;
/**
@@ -112,7 +111,7 @@
public void up_warn_msg_urge_todo_ack(ChannelHandlerContext ctx, int inferiorPlatformId, WarnMsg warnMsg) {
UPWarnMsgUrgeTodoAck upWarnMsgUrgeTodoAck = new UPWarnMsgUrgeTodoAck().decode(warnMsg);
upWarnMsgUrgeTodoAck.setInferiorPlatformId(inferiorPlatformId);
- upWarnMsgUrgeTodoAck.setCreateTime(LocalDateTime.now());
+ upWarnMsgUrgeTodoAck.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
upWarnMsgUrgeTodoAckDao.save(upWarnMsgUrgeTodoAck);
}
@@ -125,8 +124,9 @@
*/
public void up_warn_msg_adpt_info(ChannelHandlerContext ctx, int inferiorPlatformId, WarnMsg warnMsg) {
UPWarnMsgAdptInfo upWarnMsgAdptInfo = new UPWarnMsgAdptInfo().decode(warnMsg);
+ upWarnMsgAdptInfo.setResult(0x00);
upWarnMsgAdptInfo.setInferiorPlatformId(inferiorPlatformId);
- upWarnMsgAdptInfo.setCreateTime(LocalDateTime.now());
+ upWarnMsgAdptInfo.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo);
}
@@ -135,8 +135,7 @@
* 定时任务督办报警请求
*/
public void taskUrgeTodo() {
- upWarnMsgAdptInfoDao.findAll()
- List<UPWarnMsgAdptInfo> list = new ArrayList<>();
+ List<UPWarnMsgAdptInfo> list = upWarnMsgAdptInfoDao.findByResultIs(0x00);
for (UPWarnMsgAdptInfo upWarnMsgAdptInfo : list) {
down_warn_msg_urge_todo_req(upWarnMsgAdptInfo);
}
@@ -156,11 +155,9 @@
Channel channel = ChannelMap.getClientChannel(inferiorPlatformId);
if (null != channel && channel.isActive()) {
channel.writeAndFlush(out);
- channel.flush();
} else {
- //重新连接从链路
- UPConnect ipAndPort = ChannelMap.getIpAndPort(inferiorPlatformId);
- connectReqService.downConnect(inferiorPlatformId, ipAndPort.getDownLinkIp(), ipAndPort.getDownLinkPort(), ipAndPort.getVerifyCode());
+ channel = ChannelMap.getServerChannel(inferiorPlatformId);
+ channel.writeAndFlush(out);
}
}
--
Gitblit v1.7.1