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/model/UPWarnMsgAdptInfo.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPWarnMsgAdptInfo.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPWarnMsgAdptInfo.java
index 389b9f6..07fd5af 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPWarnMsgAdptInfo.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPWarnMsgAdptInfo.java
@@ -1,7 +1,7 @@
package com.ruoyi.dataInterchange.model;
-import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.dataInterchange.pojo.BaseModel;
+import com.ruoyi.dataInterchange.util.jtt809.common.ByteArrayUtil;
import com.ruoyi.dataInterchange.util.jtt809.common.Jtt809Util;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
@@ -9,8 +9,6 @@
import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
-
-import java.text.ParseException;
/**
* 上报报警信息
@@ -101,16 +99,11 @@
this.warnSrc = byteBuf.readByte();
//报警类型
this.warnType = byteBuf.readShort();
- String date = byteBuf.readByte() + "-" + byteBuf.readByte() + "-" + byteBuf.readShort() + " " +
- byteBuf.readByte() + ":" + byteBuf.readByte() + ":" + byteBuf.readByte();
- long time = 0;
- try {
- time = DateUtils.parseDate(date, "dd-MM-yyyy HH:mm:ss").getTime();
- } catch (ParseException e) {
- e.printStackTrace();
- }
+ byte[] readableBytes = new byte[8];
+ byteBuf.readBytes(readableBytes);
+ String time = ByteArrayUtil.bytes2HexStr(readableBytes);
//报警时间
- this.warnTime = time;
+ this.warnTime = Long.parseLong(time, 16);
//信息ID
this.infoId = byteBuf.readInt();
//报警数据长度
--
Gitblit v1.7.1