autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-08 12:00:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

同步获取响应数据

Browse Source
This commit is contained in:
Guoqs
2024-08-01 18:03:21 +08:00
parent eb40bd5798
commit 64028f04f3
20 changed files with 99 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-netty/src/main/java/com/jsowell/netty/rpc/Message.java → jsowell-common/src/main/java/com/jsowell/common/protocol/Message.java
View File

@@ -1,4 +1,4 @@
package com.jsowell.netty.rpc;
package com.jsowell.common.protocol;
import lombok.Data;

6
jsowell-netty/src/main/java/com/jsowell/netty/rpc/MessageConstant.java → jsowell-common/src/main/java/com/jsowell/common/protocol/MessageConstant.java
View File

@@ -1,4 +1,8 @@
package com.jsowell.netty.rpc;
package com.jsowell.common.protocol;
import com.jsowell.common.protocol.Message;
import com.jsowell.common.protocol.RpcRequest;
import com.jsowell.common.protocol.RpcResponse;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

5
jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcRequest.java → jsowell-common/src/main/java/com/jsowell/common/protocol/RpcRequest.java
View File

@@ -1,5 +1,6 @@
package com.jsowell.netty.rpc;
package com.jsowell.common.protocol;
import com.jsowell.common.protocol.Message;
import lombok.Data;
import lombok.ToString;
@@ -7,7 +8,7 @@ import java.util.UUID;
@Data
@ToString
public class RpcRequest extends Message{
public class RpcRequest extends Message {
private String id;

5
jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcResponse.java → jsowell-common/src/main/java/com/jsowell/common/protocol/RpcResponse.java
View File

@@ -1,11 +1,12 @@
package com.jsowell.netty.rpc;
package com.jsowell.common.protocol;
import com.jsowell.common.protocol.Message;
import lombok.Data;
import lombok.ToString;
@Data
@ToString
public class RpcResponse extends Message{
public class RpcResponse extends Message {
private String id;

2
jsowell-pile/src/main/java/com/jsowell/pile/rpc/SyncPromise.java → jsowell-common/src/main/java/com/jsowell/common/protocol/SyncPromise.java
View File

@@ -1,4 +1,4 @@
package com.jsowell.pile.rpc;
package com.jsowell.common.protocol;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

17
jsowell-common/src/main/java/com/jsowell/common/util/RpcUtil.java Normal file
View File

@@ -0,0 +1,17 @@
package com.jsowell.common.util;
import com.jsowell.common.protocol.SyncPromise;
import lombok.extern.slf4j.Slf4j;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@Slf4j
public class RpcUtil {
private final static Map<String, SyncPromise> syncPromiseMap = new ConcurrentHashMap<>();
public static Map<String, SyncPromise> getSyncPromiseMap() {
return syncPromiseMap;
}
}

5
jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java
View File

@@ -1,14 +1,13 @@
package com.jsowell.netty.server.yunkuaichong;
import com.alibaba.fastjson2.JSON;
import com.google.common.collect.Lists;
import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;
import com.jsowell.common.enums.ykc.PileChannelEntity;
import com.jsowell.common.util.BytesUtil;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.YKCUtils;
import com.jsowell.pile.rpc.RpcUtil;
import com.jsowell.pile.rpc.SyncPromise;
import com.jsowell.common.util.RpcUtil;
import com.jsowell.common.protocol.SyncPromise;
import com.jsowell.netty.service.yunkuaichong.YKCBusinessService;
import io.netty.buffer.ByteBuf;
import io.netty.channel.*;

2
jsowell-netty/src/main/java/com/jsowell/netty/rpc/ClientChannelInitializer.java → jsowell-pile/src/main/java/com/jsowell/pile/rpc/ClientChannelInitializer.java
View File

@@ -1,4 +1,4 @@
package com.jsowell.netty.rpc;
package com.jsowell.pile.rpc;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelPipeline;

4
jsowell-netty/src/main/java/com/jsowell/netty/rpc/MessageDecode.java → jsowell-pile/src/main/java/com/jsowell/pile/rpc/MessageDecode.java
View File

@@ -1,5 +1,7 @@
package com.jsowell.netty.rpc;
package com.jsowell.pile.rpc;
import com.jsowell.common.protocol.Message;
import com.jsowell.common.protocol.MessageConstant;
import com.jsowell.common.util.bean.SerializationUtil;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;

3
jsowell-netty/src/main/java/com/jsowell/netty/rpc/MessageEncode.java → jsowell-pile/src/main/java/com/jsowell/pile/rpc/MessageEncode.java
View File

@@ -1,5 +1,6 @@
package com.jsowell.netty.rpc;
package com.jsowell.pile.rpc;
import com.jsowell.common.protocol.Message;
import com.jsowell.common.util.bean.SerializationUtil;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;

2
jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcClient.java → jsowell-pile/src/main/java/com/jsowell/pile/rpc/RpcClient.java
View File

@@ -1,4 +1,4 @@
package com.jsowell.netty.rpc;
package com.jsowell.pile.rpc;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.*;

4
jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcRequestHandler.java → jsowell-pile/src/main/java/com/jsowell/pile/rpc/RpcRequestHandler.java
View File

@@ -1,5 +1,7 @@
package com.jsowell.netty.rpc;
package com.jsowell.pile.rpc;
import com.jsowell.common.protocol.RpcRequest;
import com.jsowell.common.protocol.RpcResponse;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.DefaultEventLoopGroup;
import io.netty.channel.EventLoopGroup;

7
jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcResponseHandler.java → jsowell-pile/src/main/java/com/jsowell/pile/rpc/RpcResponseHandler.java
View File

@@ -1,7 +1,8 @@
package com.jsowell.netty.rpc;
package com.jsowell.pile.rpc;
import com.jsowell.pile.rpc.RpcUtil;
import com.jsowell.pile.rpc.SyncPromise;
import com.jsowell.common.protocol.RpcResponse;
import com.jsowell.common.protocol.SyncPromise;
import com.jsowell.common.util.RpcUtil;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;

2
jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcServer.java → jsowell-pile/src/main/java/com/jsowell/pile/rpc/RpcServer.java
View File

@@ -1,4 +1,4 @@
package com.jsowell.netty.rpc;
package com.jsowell.pile.rpc;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.*;

36
jsowell-pile/src/main/java/com/jsowell/pile/rpc/RpcUtil.java
View File

@@ -1,36 +0,0 @@
package com.jsowell.pile.rpc;
import com.google.common.collect.Lists;
import com.google.common.primitives.Bytes;
import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;
import com.jsowell.common.enums.ykc.PileChannelEntity;
import com.jsowell.common.util.BytesUtil;
import com.jsowell.common.util.CRC16Util;
import com.jsowell.common.util.YKCUtils;
import com.jsowell.pile.rpc.SyncPromise;
import com.jsowell.pile.service.PileMsgRecordService;
import io.netty.buffer.ByteBuf;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@Slf4j
public class RpcUtil {
private final static Map<String, SyncPromise> syncPromiseMap = new ConcurrentHashMap<>();
public static Map<String, SyncPromise> getSyncPromiseMap() {
return syncPromiseMap;
}
}

2
jsowell-netty/src/main/java/com/jsowell/netty/rpc/ServerChannelInitializer.java → jsowell-pile/src/main/java/com/jsowell/pile/rpc/ServerChannelInitializer.java
View File

@@ -1,4 +1,4 @@
package com.jsowell.netty.rpc;
package com.jsowell.pile.rpc;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelPipeline;

6
jsowell-netty/src/main/java/com/jsowell/netty/rpc/TestRpcClient.java → jsowell-pile/src/main/java/com/jsowell/pile/rpc/TestRpcClient.java
View File

@@ -1,8 +1,6 @@
package com.jsowell.netty.rpc;
package com.jsowell.pile.rpc;
import com.jsowell.pile.rpc.RpcUtil;
import java.util.concurrent.TimeUnit;
import com.jsowell.common.protocol.RpcRequest;
public class TestRpcClient {
public static void main(String[] args) throws Exception{

2
jsowell-netty/src/main/java/com/jsowell/netty/rpc/TestRpcServer.java → jsowell-pile/src/main/java/com/jsowell/pile/rpc/TestRpcServer.java
View File

@@ -1,4 +1,4 @@
package com.jsowell.netty.rpc;
package com.jsowell.pile.rpc;
public class TestRpcServer {
public static void main(String[] args) {

46
jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java
View File

@@ -2,9 +2,12 @@ package com.jsowell.pile.service;
import com.google.common.collect.Lists;
import com.jsowell.common.constant.CacheConstants;
import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.enums.ykc.ChargingFailedReasonEnum;
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.BytesUtil;
import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.domain.PileBillingTemplate;
import com.jsowell.pile.domain.PileFirmwareInfo;
@@ -296,6 +299,49 @@ public class PileRemoteService {
// 解析结果
if (Objects.isNull(bytes)) {
result = "0";
} else {
YKCDataProtocol ykcDataProtocol = new YKCDataProtocol(bytes);
byte[] msgBody = ykcDataProtocol.getMsgBody();
int startIndex = 0;
int length = 16;
// 交易流水号
byte[] transactionCodeByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String transactionCode = BytesUtil.bcd2Str(transactionCodeByteArr);
// 桩编码
startIndex += length;
length = 7;
byte[] pileSnByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String pileSn = BytesUtil.bcd2Str(pileSnByteArr);
// 枪口号
startIndex += length;
length = 1;
byte[] connectorCodeByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String connectorCode = BytesUtil.bcd2Str(connectorCodeByteArr);
// 启动结果 0x00失败 0x01成功
startIndex += length;
length = 1;
byte[] resultCodeByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String resultCode = BytesUtil.bcd2Str(resultCodeByteArr);
if (StringUtils.equals(resultCode, "00")) {
result = "0";
} else {
result = "1";
}
// 失败原因
startIndex += length;
length = 1;
byte[] failedReasonByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
String failedReason = BytesUtil.bcd2Str(failedReasonByteArr);
String failedReasonMsg = ChargingFailedReasonEnum.getMsgByCode(Integer.parseInt(failedReason, 16));
log.info("0x59预约充电响应sync, 交易流水号:{}, 桩SN:{}, 枪口号:{}, 结果:{}, 失败原因:{}",
transactionCode, pileSn, connectorCode, resultCode, failedReasonMsg);
}
return result;

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java
View File

@@ -10,8 +10,8 @@ import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.*;
import com.jsowell.common.util.Cp56Time2a.Cp56Time2aUtil;
import com.jsowell.pile.domain.ykcCommond.*;
import com.jsowell.pile.rpc.RpcUtil;
import com.jsowell.pile.rpc.SyncPromise;
import com.jsowell.common.util.RpcUtil;
import com.jsowell.common.protocol.SyncPromise;
import com.jsowell.pile.service.*;
import com.jsowell.pile.vo.web.BillingTemplateVO;
import com.jsowell.pile.vo.web.PileModelInfoVO;