From 2e98b20bea4463e4465e3c19059d0744a09aec06 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 27 Jun 2023 14:34:41 +0800
Subject: [PATCH] gb28181版本升级-补充
---
src/main/java/com/genersoft/iot/vmp/netty/handle/UdpServerHandler.java | 50 ++++++++++++++++++++++----------------------------
1 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/netty/handle/UdpServerHandler.java b/src/main/java/com/genersoft/iot/vmp/netty/handle/UdpServerHandler.java
index 9389b39..f9694ab 100644
--- a/src/main/java/com/genersoft/iot/vmp/netty/handle/UdpServerHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/netty/handle/UdpServerHandler.java
@@ -1,14 +1,14 @@
package com.genersoft.iot.vmp.netty.handle;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.netty.business.entity.TalkBackEquipment;
import com.genersoft.iot.vmp.netty.business.service.TalkBackEquipmentService;
-import com.genersoft.iot.vmp.netty.config.MyDecoder;
+import com.genersoft.iot.vmp.policeBodyCamera.service.DeviceChannelPoliceCameraService;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.channel.socket.DatagramPacket;
import io.netty.util.CharsetUtil;
-import okio.Utf8;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +16,6 @@
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
-import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -41,10 +40,14 @@
private TalkBackEquipmentService talkBackEquipmentService;
+ @Autowired
+ private DeviceChannelPoliceCameraService deviceChannelPoliceCameraService;
+
@PostConstruct
public void init() {
udpServerHandler = this;
udpServerHandler.talkBackEquipmentService = this.talkBackEquipmentService;
+ udpServerHandler.deviceChannelPoliceCameraService = this.deviceChannelPoliceCameraService;
}
@Override
@@ -54,13 +57,11 @@
byte[] req = new byte[buf.readableBytes()];
buf.readBytes(req);
String body = new String(req, CharsetUtil.UTF_8);
-
- System.out.println("【UDP】>>>>>> 收到客户端的数据："+body);
+ // 字节转16进制字符串
String s = bytesToHexString(req);
- System.out.println("s111111 = " + s);
//获取字符串的长度
int length = s.length();
- System.out.println("数据长度>>>>>> = " + length);
+// System.out.println("数据长度>>>>>> = " + length);
//数据解析
dataHandler(s);
}
@@ -114,8 +115,7 @@
if (Integer.parseInt(second)<10){
second = "0" + second;
}
- String time = year + "-" + month + "-" + day +" " + hour+ ":"+minute + ":" + second;
- System.out.println("接收时间： time = " + time);
+ String time = year + "-" + month + "-" + day +" " + hour + ":" + minute + ":" + second;
//时间拼接
try {
backEquipment.setReceiveTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(time));
@@ -145,30 +145,24 @@
}
/**
- * 保存设备数据
+ * 保存设备数据--测试
* @param body
*/
@Async
public void saveTalkBackEquipmentInfo(String body) {
- TalkBackEquipment equipmentRecord = new TalkBackEquipment();
- equipmentRecord.setName("ces");
- equipmentRecord.setCode("cs123456");
- equipmentRecord.setStatus(1);
- equipmentRecord.setUnitName("CSDW");
- equipmentRecord.setUnitCode("CSDW123456");
- equipmentRecord.setPoliceName("JINGYUAN");
- equipmentRecord.setPoliceCode("JINGYUAN123456");
- equipmentRecord.setTerminalNumber("788888888888");
- equipmentRecord.setLongitude("128.124124412");
- equipmentRecord.setLatitude("27.1224521421");
- equipmentRecord.setSpeed("10");
- equipmentRecord.setDirection("10");
- equipmentRecord.setElevation("10");
- equipmentRecord.setPrecisions("10");
- equipmentRecord.setReceiveTime(new Date());
- equipmentRecord.setCreateTime(new Date());
- equipmentRecord.setUpdateTime(new Date());
+ DeviceChannel deviceChannelPoliceCamera = new DeviceChannel();
+ deviceChannelPoliceCamera.setAddress("");
+ deviceChannelPoliceCamera.setDeviceId("123");
+ deviceChannelPoliceCamera.setName("CS");
+ deviceChannelPoliceCamera.setLongitude(128.125412);
+ deviceChannelPoliceCamera.setLatitude(29.1254124);
+ deviceChannelPoliceCamera.setPTZTypeText("111");
+ deviceChannelPoliceCamera.setCertNum("10");
+ deviceChannelPoliceCamera.setPTZType(1);
+ deviceChannelPoliceCamera.setStatus(1);
+ deviceChannelPoliceCamera.setChannelId("123456");
+ udpServerHandler.deviceChannelPoliceCameraService.insertDeviceChannelPoliceCamera(deviceChannelPoliceCamera);
}
/**
--
Gitblit v1.9.3