Commit Graph

9 Commits

Author SHA1 Message Date
648540858
277f2db137 Merge branch 'master' into 重构/1078
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/Jt808Decoder.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/Jt808Handler.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/TcpServer.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java
#	src/main/java/com/genersoft/iot/vmp/media/service/IMediaNodeServerService.java
#	src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/utils/CivilCodeUtil.java
#	src/main/resources/application.yml
#	web_src/src/layout/UiHeader.vue
#	web_src/src/router/index.js
2024-10-18 13:55:23 +08:00
648540858
b98cfd1fed 使用Slf4j注解打印日志 2024-07-03 17:24:35 +08:00
648540858
87ecf68332 1078-双向对讲 2024-05-29 16:55:07 +08:00
648540858
2112fffc26 1078-查询区域或线路数据应答... 2024-05-06 18:00:26 +08:00
648540858
c53e4f6fbc 1078-设置路线 2024-05-06 15:55:14 +08:00
648540858
5dd49b3d44 1078-设置圆形区域... 2024-05-03 18:58:49 +08:00
648540858
98199ec657 1078-优化BCD码解析 2024-03-16 23:41:29 +08:00
648540858
3e672ca38c 1078-支持位置汇报 2024-03-16 23:22:07 +08:00
QingObject
97b673d6ad 新增JT1078 Template支持 2023-04-28 10:10:06 +08:00