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

update 电单车协议

Browse Source
This commit is contained in:
Guoqs
2024-08-26 10:13:02 +08:00
parent f0c2869590
commit f27773ba05
12 changed files with 123 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
jsowell-common/src/main/java/com/jsowell/common/core/domain/ebike/EBikeCommandEnum.java
View File

@@ -1,41 +0,0 @@
package com.jsowell.common.core.domain.ebike;
import lombok.extern.slf4j.Slf4j;
/**
* 友电电单车协议指令
*/
@Slf4j
public enum EBikeCommandEnum {
// HEARTBEAT("01", "设备心跳包"),
REGISTRATION("20", "设备注册包"),
GET_SERVER_TIME("22", "设备获取服务器时间"),
HEARTBEAT_2("21", "设备心跳包"),
CARD_OPERATION("02", "刷卡操作"),
SETTLEMENT_UPLOAD("03", "结算消费信息上传"),
CHARGE_PORT_CONFIRMATION("04", "充电端口订单确认"),
POWER_HEARTBEAT("06", "端口充电时功率心跳包"),
CHARGER_HEARTBEAT("41", "充电柜专有心跳包"),
ALARM_PUSH("42", "报警推送指令"),
CHARGE_COMPLETE("43", "充电完成通知，但不结算"),
PORT_PUSH("44", "端口推送指令");
;
EBikeCommandEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}
private final String code; // 帧类型code
private final String desc; // 帧类型名称
public String getCode() {
return code;
}
public String getDesc() {
return desc;
}
}

26
jsowell-common/src/main/java/com/jsowell/common/protocol/SyncPromise.java
View File

@@ -27,24 +27,7 @@ public class SyncPromise {
this.rpcResult = rpcResult;
}
/**
* 同步等待返回结果
*/
// public RpcResponse get(long timeout, TimeUnit unit) throws InterruptedException {
// // 等待阻塞，超时时间内countDownLatch减到0，将提前唤醒，以此作为是否超时判断
// boolean earlyWakeUp = countDownLatch.await(timeout, unit);
//
// if(earlyWakeUp) {
// // 超时时间内countDownLatch减到0，提前唤醒，说明已有结果
// return rpcResponse;
// } else {
// // 超时时间内countDownLatch没有减到0，自动唤醒，说明超时时间内没有等到结果
// isTimeout = true;
// return null;
// }
// }
public byte[] get2(long timeout, TimeUnit unit) throws InterruptedException {
public byte[] get(long timeout, TimeUnit unit) throws InterruptedException {
// 等待阻塞，超时时间内countDownLatch减到0，将提前唤醒，以此作为是否超时判断
boolean earlyWakeUp = countDownLatch.await(timeout, unit);
@@ -61,12 +44,5 @@ public class SyncPromise {
public void wake() {
countDownLatch.countDown();
}
// public RpcResponse getRpcResponse() {
// return rpcResponse;
// }
// public void setRpcResponse(RpcResponse rpcResponse) {
// this.rpcResponse = rpcResponse;
// }
}