mirror of
https://gitee.com/san-bing/JChargePointProtocol
synced 2026-05-05 02:19:56 +08:00
云快充离线卡协议相关矫正
This commit is contained in:
@@ -6,28 +6,18 @@
|
||||
*/
|
||||
package sanbing.jcpp.app.adapter;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
import sanbing.jcpp.app.service.PileProtocolService;
|
||||
import sanbing.jcpp.proto.gen.ProtocolProto;
|
||||
import sanbing.jcpp.proto.gen.ProtocolProto.CardInfo;
|
||||
import sanbing.jcpp.proto.gen.ProtocolProto.FlagPriceProto;
|
||||
import sanbing.jcpp.proto.gen.ProtocolProto.OfflineCardSyncRequest;
|
||||
import sanbing.jcpp.proto.gen.ProtocolProto.PeriodProto;
|
||||
import sanbing.jcpp.proto.gen.ProtocolProto.PricingModelFlag;
|
||||
import sanbing.jcpp.proto.gen.ProtocolProto.PricingModelProto;
|
||||
import sanbing.jcpp.proto.gen.ProtocolProto.PricingModelRule;
|
||||
import sanbing.jcpp.proto.gen.ProtocolProto.PricingModelType;
|
||||
import sanbing.jcpp.proto.gen.ProtocolProto.SetPricingRequest;
|
||||
import sanbing.jcpp.proto.gen.ProtocolProto.*;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author baigod
|
||||
@@ -186,10 +176,10 @@ public class TestController {
|
||||
return ResponseEntity.ok("success");
|
||||
}
|
||||
|
||||
@GetMapping("/api/limitUpdateRequest")
|
||||
public ResponseEntity<String> limitUpdateRequest() {
|
||||
@GetMapping("/api/offlineCardBalanceUpdateRequest")
|
||||
public ResponseEntity<String> offlineCardBalanceUpdateRequest() {
|
||||
|
||||
pileProtocolService.limitUpdateRequest(ProtocolProto.LimitUpdateRequest.newBuilder()
|
||||
pileProtocolService.offlineCardBalanceUpdateRequest(OfflineCardBalanceUpdateRequest.newBuilder()
|
||||
.setCardNo("1000000000123456")
|
||||
.setPileCode("20231212000010")
|
||||
.setGunCode("01")
|
||||
|
||||
@@ -8,6 +8,8 @@ package sanbing.jcpp.app.service;
|
||||
|
||||
import sanbing.jcpp.infrastructure.queue.Callback;
|
||||
import sanbing.jcpp.proto.gen.ProtocolProto;
|
||||
import sanbing.jcpp.proto.gen.ProtocolProto.OfflineCardBalanceUpdateRequest;
|
||||
import sanbing.jcpp.proto.gen.ProtocolProto.OfflineCardSyncRequest;
|
||||
import sanbing.jcpp.proto.gen.ProtocolProto.SetPricingRequest;
|
||||
import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage;
|
||||
|
||||
@@ -139,17 +141,17 @@ public interface PileProtocolService {
|
||||
/**
|
||||
* 远程账户余额更新
|
||||
*/
|
||||
void limitUpdateRequest(ProtocolProto.LimitUpdateRequest request);
|
||||
void offlineCardBalanceUpdateRequest(OfflineCardBalanceUpdateRequest request);
|
||||
|
||||
/**
|
||||
* 远程账户余额更新应答
|
||||
*/
|
||||
void onLimitUpdateResponse(UplinkQueueMessage uplinkQueueMessage, Callback callback);
|
||||
void onOfflineCardBalanceUpdateResponse(UplinkQueueMessage uplinkQueueMessage, Callback callback);
|
||||
|
||||
/**
|
||||
* 离线卡数据同步
|
||||
*/
|
||||
void offlineCardSyncRequest(ProtocolProto.OfflineCardSyncRequest request);
|
||||
void offlineCardSyncRequest(OfflineCardSyncRequest request);
|
||||
|
||||
/**
|
||||
* 离线卡数据同步应答
|
||||
|
||||
@@ -455,7 +455,7 @@ public class DefaultPileProtocolService implements PileProtocolService {
|
||||
|
||||
|
||||
@Override
|
||||
public void onLimitUpdateResponse(UplinkQueueMessage uplinkQueueMessage, Callback callback) {
|
||||
public void onOfflineCardBalanceUpdateResponse(UplinkQueueMessage uplinkQueueMessage, Callback callback) {
|
||||
log.info("接收到充电桩远程账户余额更新应答 {}", uplinkQueueMessage);
|
||||
|
||||
// TODO 处理相关业务逻辑
|
||||
@@ -464,7 +464,7 @@ public class DefaultPileProtocolService implements PileProtocolService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void limitUpdateRequest(LimitUpdateRequest request) {
|
||||
public void offlineCardBalanceUpdateRequest(OfflineCardBalanceUpdateRequest request) {
|
||||
UUID messageId = UUID.randomUUID();
|
||||
UUID requestId = UUID.randomUUID();
|
||||
|
||||
@@ -474,8 +474,8 @@ public class DefaultPileProtocolService implements PileProtocolService {
|
||||
.setPileCode(request.getPileCode())
|
||||
.setRequestIdMSB(requestId.getMostSignificantBits())
|
||||
.setRequestIdLSB(requestId.getLeastSignificantBits())
|
||||
.setDownlinkCmd(DownlinkCmdEnum.LIMIT_UPDATE_REQUEST.name())
|
||||
.setLimitUpdateRequest(request);
|
||||
.setDownlinkCmd(DownlinkCmdEnum.OFFLINE_CARD_BALANCE_UPDATE_REQUEST.name())
|
||||
.setOfflineCardBalanceUpdateRequest(request);
|
||||
downlinkCallService.sendDownlinkMessage(downlinkRequestMessageBuilder,request.getPileCode());
|
||||
}
|
||||
|
||||
|
||||
@@ -224,9 +224,9 @@ public class ProtocolUplinkConsumerService extends AbstractConsumerService imple
|
||||
|
||||
pileProtocolService.postLockStatus(uplinkQueueMsg, callback);
|
||||
|
||||
} else if (uplinkQueueMsg.hasLimitUpdateResponse()) {
|
||||
} else if (uplinkQueueMsg.hasOfflineCardBalanceUpdateResponse()) {
|
||||
|
||||
pileProtocolService.onLimitUpdateResponse(uplinkQueueMsg, callback);
|
||||
pileProtocolService.onOfflineCardBalanceUpdateResponse(uplinkQueueMsg, callback);
|
||||
|
||||
} else if (uplinkQueueMsg.hasOfflineCardSyncResponse()) {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user