autumn/JChargePointProtocol
1
0
Fork 0
mirror of https://gitee.com/san-bing/JChargePointProtocol synced 2026-05-04 09:59:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改downlink protobuf

Browse Source
This commit is contained in:
三丙
2024-10-22 17:11:05 +08:00
parent 73de4b28b3
commit 7445d4e3f0
14 changed files with 83 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/adapter/DownlinkController.java
View File

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.request.async.DeferredResult;
import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRestMessage;
import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage;
import sanbing.jcpp.protocol.domain.ProtocolSession;
import sanbing.jcpp.protocol.provider.ProtocolSessionRegistryProvider;
@@ -37,7 +37,7 @@ public class DownlinkController {
ProtocolSessionRegistryProvider protocolSessionRegistryProvider;
@PostMapping(value = "/onDownlink", consumes = "application/x-protobuf", produces = "application/x-protobuf")
public DeferredResult<ResponseEntity<String>> onDownlink(@RequestBody DownlinkRestMessage downlinkMsg) {
public DeferredResult<ResponseEntity<String>> onDownlink(@RequestBody DownlinkRequestMessage downlinkMsg) {
log.debug("收到REST下行请求 {}", downlinkMsg);
final DeferredResult<ResponseEntity<String>> response = new DeferredResult<>(onDownlinkTimeout,

6
jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/domain/ProtocolSession.java
View File

@@ -9,7 +9,7 @@ import com.github.benmanes.caffeine.cache.Caffeine;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRestMessage;
import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage;
import sanbing.jcpp.protocol.forwarder.Forwarder;
import java.io.Closeable;
@@ -52,14 +52,14 @@ public abstract class ProtocolSession implements Closeable {
@Setter
private Forwarder forwarder;
public ProtocolSession(String protocolName) {
protected ProtocolSession(String protocolName) {
this.protocolName = protocolName;
this.pileCodeSet = new LinkedHashSet<>();
this.id = UUID.randomUUID();
this.lastActivityTime = LocalDateTime.now();
}
public abstract void onDownlink(DownlinkRestMessage downlinkMsg);
public abstract void onDownlink(DownlinkRequestMessage downlinkMsg);
public void close() {
close(SessionCloseReason.DESTRUCTION);

4
jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/domain/SessionToHandlerMsg.java
View File

@@ -4,10 +4,10 @@
*/
package sanbing.jcpp.protocol.domain;
import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRestMessage;
import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage;
/**
* @author baigod
*/
public record SessionToHandlerMsg(DownlinkRestMessage downlinkMsg, ProtocolSession session) {
public record SessionToHandlerMsg(DownlinkRequestMessage downlinkMsg, ProtocolSession session) {
}

4
jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/tcp/TcpChannelHandler.java
View File

@@ -19,7 +19,7 @@ import sanbing.jcpp.infrastructure.stats.MessagesStats;
import sanbing.jcpp.infrastructure.util.exception.DownlinkException;
import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil;
import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil;
import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRestMessage;
import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage;
import sanbing.jcpp.protocol.ProtocolMessageProcessor;
import sanbing.jcpp.protocol.domain.ListenerToHandlerMsg;
import sanbing.jcpp.protocol.domain.ProtocolUplinkMsg;
@@ -121,7 +121,7 @@ public class TcpChannelHandler<T> extends SimpleChannelInboundHandler<ProtocolUp
}
}
protected void onDownlink(DownlinkRestMessage downlinkMsg) throws DownlinkException {
protected void onDownlink(DownlinkRequestMessage downlinkMsg) throws DownlinkException {
protocolMessageProcessor.downlinkHandle(new SessionToHandlerMsg(downlinkMsg, tcpSession), downlinkMsgStats);
}

8
jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/tcp/TcpSession.java
View File

@@ -9,7 +9,7 @@ import io.netty.channel.ChannelHandlerContext;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRestMessage;
import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage;
import sanbing.jcpp.protocol.domain.ProtocolSession;
import sanbing.jcpp.protocol.domain.SessionCloseReason;
import sanbing.jcpp.protocol.listener.tcp.enums.SequenceNumberLength;
@@ -32,7 +32,7 @@ public class TcpSession extends ProtocolSession {
private ChannelHandlerContext ctx;
private final Consumer<DownlinkRestMessage> sendDownlinkConsumer;
private final Consumer<DownlinkRequestMessage> sendDownlinkConsumer;
private final Consumer<ByteBuf> writeAndFlushConsumer;
@@ -64,7 +64,7 @@ public class TcpSession extends ProtocolSession {
}
public TcpSession(String protocolName,
Consumer<DownlinkRestMessage> sendDownlinkConsumer,
Consumer<DownlinkRequestMessage> sendDownlinkConsumer,
Consumer<ByteBuf> writeAndFlushConsumer) {
super(protocolName);
this.sendDownlinkConsumer = sendDownlinkConsumer;
@@ -72,7 +72,7 @@ public class TcpSession extends ProtocolSession {
}
@Override
public void onDownlink(DownlinkRestMessage downlinkMsg) {
public void onDownlink(DownlinkRequestMessage downlinkMsg) {
sendDownlinkConsumer.accept(downlinkMsg);
}