roouzenn/wvp
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 重构/1078

Browse Source 
# 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
This commit is contained in:
648540858
2024-10-18 13:55:23 +08:00
parent 601daa1092 cbd6a57e15
commit 277f2db137
428 changed files with 26104 additions and 22272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/Jt808Decoder.java
View File

@@ -16,6 +16,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationEventPublisher;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
import java.util.List;
@@ -25,8 +26,8 @@ import java.util.List;
* @date 2023/4/27 18:10
* @email qingtaij@163.com
*/
@Slf4j
public class Jt808Decoder extends ByteToMessageDecoder {
private final static Logger log = LoggerFactory.getLogger(Jt808Decoder.class);
private ApplicationEventPublisher applicationEventPublisher = null;
private Ijt1078Service service = null;

5
src/main/java/com/genersoft/iot/vmp/jt1078/codec/encode/Jt808Encoder.java
View File

@@ -7,8 +7,7 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import java.util.List;
@@ -17,8 +16,8 @@ import java.util.List;
* @date 2023/4/27 18:10
* @email qingtaij@163.com
*/
@Slf4j
public class Jt808Encoder extends MessageToByteEncoder<Rs> {
private final static Logger log = LoggerFactory.getLogger(Jt808Encoder.class);
@Override
protected void encode(ChannelHandlerContext ctx, Rs msg, ByteBuf out) throws Exception {

5
src/main/java/com/genersoft/iot/vmp/jt1078/codec/encode/Jt808EncoderCmd.java
View File

@@ -13,8 +13,7 @@ import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;
import io.netty.util.ByteProcessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.StringUtils;
import java.util.LinkedList;
@@ -25,8 +24,8 @@ import java.util.List;
* @date 2023/4/27 18:25
* @email qingtaij@163.com
*/
@Slf4j
public class Jt808EncoderCmd extends MessageToByteEncoder<Cmd> {
private final static Logger log = LoggerFactory.getLogger(Jt808EncoderCmd.class);
@Override
protected void encode(ChannelHandlerContext ctx, Cmd cmd, ByteBuf out) throws Exception {

5
src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/Jt808Handler.java
View File

@@ -12,19 +12,18 @@ import io.netty.handler.timeout.IdleStateEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationEventPublisher;
import lombok.extern.slf4j.Slf4j;
/**
* @author QingtaiJiang
* @date 2023/4/27 18:14
* @email qingtaij@163.com
*/
@Slf4j
public class Jt808Handler extends ChannelInboundHandlerAdapter {
private final static Logger log = LoggerFactory.getLogger(Jt808Handler.class);
private ApplicationEventPublisher applicationEventPublisher = null;
public Jt808Handler(ApplicationEventPublisher applicationEventPublisher) {
this.applicationEventPublisher = applicationEventPublisher;
}

6
src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/TcpServer.java
View File

@@ -25,6 +25,7 @@ import org.springframework.boot.CommandLineRunner;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Component;
import lombok.extern.slf4j.Slf4j;
import java.util.concurrent.TimeUnit;
@@ -34,9 +35,8 @@ import java.util.concurrent.TimeUnit;
* @email qingtaij@163.com
*/
public class TcpServer{
private final static Logger log = LoggerFactory.getLogger(TcpServer.class);
@Slf4j
public class TcpServer {
private final Integer port;
private boolean isRunning = false;

6
src/main/java/com/genersoft/iot/vmp/jt1078/proc/factory/CodecFactory.java
View File

@@ -3,8 +3,7 @@ package com.genersoft.iot.vmp.jt1078.proc.factory;
import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
import com.genersoft.iot.vmp.jt1078.proc.request.Re;
import com.genersoft.iot.vmp.jt1078.util.ClassUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import java.util.HashMap;
import java.util.List;
@@ -15,9 +14,8 @@ import java.util.Map;
* @date 2023/4/27 18:29
* @email qingtaij@163.com
*/
@Slf4j
public class CodecFactory {
private final static Logger log = LoggerFactory.getLogger(CodecFactory.class);
private static Map<String, Class<?>> protocolHash;

3
src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java
View File

@@ -8,6 +8,7 @@ import io.netty.buffer.ByteBuf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationEvent;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.StringUtils;
/**
@@ -15,8 +16,8 @@ import org.springframework.util.StringUtils;
* @date 2023/4/27 18:50
* @email qingtaij@163.com
*/
@Slf4j
public abstract class Re {
private final static Logger log = LoggerFactory.getLogger(Re.class);
protected abstract Rs decode0(ByteBuf buf, Header header, Session session);

5
src/main/java/com/genersoft/iot/vmp/jt1078/session/Session.java
View File

@@ -3,8 +3,7 @@ package com.genersoft.iot.vmp.jt1078.session;
import com.genersoft.iot.vmp.jt1078.proc.Header;
import io.netty.channel.Channel;
import io.netty.util.AttributeKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import java.util.concurrent.atomic.AtomicInteger;
@@ -13,8 +12,8 @@ import java.util.concurrent.atomic.AtomicInteger;
* @date 2023/4/27 18:54
* @email qingtaij@163.com
*/
@Slf4j
public class Session {
private final static Logger log = LoggerFactory.getLogger(Session.class);
public static final AttributeKey<Session> KEY = AttributeKey.newInstance(Session.class.getName());

5
src/main/java/com/genersoft/iot/vmp/jt1078/session/SessionManager.java
View File

@@ -2,8 +2,7 @@ package com.genersoft.iot.vmp.jt1078.session;
import com.genersoft.iot.vmp.jt1078.proc.entity.Cmd;
import io.netty.channel.Channel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -16,9 +15,9 @@ import java.util.concurrent.TimeUnit;
* @date 2023/4/27 19:54
* @email qingtaij@163.com
*/
@Slf4j
public enum SessionManager {
INSTANCE;
private final static Logger log = LoggerFactory.getLogger(SessionManager.class);
// 用与消息的缓存
private final Map<String, SynchronousQueue<Object>> topicSubscribers = new ConcurrentHashMap<>();

13
src/main/java/com/genersoft/iot/vmp/jt1078/util/ClassUtil.java
View File

@@ -1,7 +1,6 @@
package com.genersoft.iot.vmp.jt1078.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.core.io.support.ResourcePatternResolver;
@@ -10,17 +9,15 @@ import java.lang.annotation.Annotation;
import java.util.LinkedList;
import java.util.List;
@Slf4j
public class ClassUtil {
private static final Logger logger = LoggerFactory.getLogger(ClassUtil.class);
public static Object getBean(Class<?> clazz) {
if (clazz != null) {
try {
return clazz.getDeclaredConstructor().newInstance();
} catch (Exception ex) {
logger.error("ClassUtil:找不到指定的类", ex);
log.error("ClassUtil:找不到指定的类", ex);
}
}
return null;
@@ -32,14 +29,14 @@ public class ClassUtil {
try {
clazz = Class.forName(className);
} catch (Exception ex) {
logger.error("ClassUtil:找不到指定的类");
log.error("ClassUtil:找不到指定的类");
}
if (clazz != null) {
try {
//获取声明的构造器--》创建实例
return clazz.getDeclaredConstructor().newInstance();
} catch (Exception ex) {
logger.error("ClassUtil:找不到指定的类", ex);
log.error("ClassUtil:找不到指定的类", ex);
}
}
return null;