update 修改名称

jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/YKCFrameTypeCode.java

@@ -40,12 +40,11 @@ public enum YKCFrameTypeCode {
 	REQUEST_START_CHARGING_CODE(0x31, "充电桩主动申请启动充电"),
 	CONFIRM_START_CHARGING_CODE(0x32, "运营平台确认启动充电"),
 
-	REMOTE_START_CHARGING_ANSWER_CODE(0x33, "远程启动充电命令回复"),
+	REMOTE_CONTROL_START_CHARGING_ANSWER_CODE(0x33, "远程启动充电命令回复"),
-	REMOTE_CONTROL_START_CODE(0x34, "运营平台远程控制启机(启动充电)"),
+	REMOTE_CONTROL_START_CHARGING_CODE(0x34, "运营平台远程控制启机(启动充电)"),
-
-	REMOTE_STOP_CHARGING_ANSWER_CODE(0x35, "远程停机命令回复"),
-	REMOTE_STOP_CHARGING_CODE(0x36, "运营平台远程停机(停止充电)"),
 
+	REMOTE_CONTROL_STOP_CHARGING_ANSWER_CODE(0x35, "远程停机命令回复"),
+	REMOTE_CONTROL_STOP_CHARGING_CODE(0x36, "运营平台远程停机(停止充电)"),
 
 	TRANSACTION_RECORDS_CODE(0x3B, "交易记录"),
 	TRANSACTION_RECORDS_OLD_VERSION_CODE(0x39, "交易记录V1.3"),
@@ -79,8 +78,9 @@ public enum YKCFrameTypeCode {
 	RESERVATION_CHARGING_STARTUP_RESULT_CODE(0x65, "预约充电启动结果上传"), // 桩 -> 平台
 
 	GROUND_LOCK_DATA_UPLOAD_CODE(0x61, "地锁数据上送"),
-	REMOTE_CONTROL_GROUND_LOCK_LIFTING_CODE(0x62, "遥控地锁升降"),
+
-	CHARGING_PILE_RESPOND_GROUND_LOCK_LIFTING_CODE(0X63, "充电桩响应地锁升降数据"),
+	REMOTE_CONTROL_GROUND_LOCK_CODE(0x62, "遥控地锁升降"),
+	REMOTE_CONTROL_GROUND_LOCK_ANSWER_CODE(0X63, "充电桩响应地锁升降数据"),
 
 	REMOTE_RESTART_CODE(0x92, "远程重启"),
 	REMOTE_RESTART_ANSWER_CODE(0x91, "远程重启应答"),
@@ -167,15 +167,9 @@ public enum YKCFrameTypeCode {
 		// 计费模板请求
 		BILLING_TEMPLATE(BILLING_TEMPLATE_CODE.getCode(), BILLING_TEMPLATE_ANSWER_CODE.getCode()),
 
-		// 请求开始充电
+		// 充电桩请求开始充电
 		START_CHARGING(REQUEST_START_CHARGING_CODE.getCode(), CONFIRM_START_CHARGING_CODE.getCode()),
 
-		// 远程请求充电
-		REMOTE_START_CHARGING(REMOTE_CONTROL_START_CODE.getCode(), REMOTE_START_CHARGING_ANSWER_CODE.getCode()),
-
-		// 远程停止充电
-		REMOTE_STOP_CHARGING(REMOTE_STOP_CHARGING_CODE.getCode(), REMOTE_STOP_CHARGING_ANSWER_CODE.getCode()),
-
 		// 交易记录
 		TRANSACTION_RECORDS(TRANSACTION_RECORDS_CODE.getCode(), TRANSACTION_RECORDS_CONFIRM_CODE.getCode()),
 		TRANSACTION_RECORDS_V13(TRANSACTION_RECORDS_OLD_VERSION_CODE.getCode(), TRANSACTION_RECORDS_CONFIRM_CODE.getCode()),
@@ -234,9 +228,57 @@ public enum YKCFrameTypeCode {
 	 * PileAnswersRelation
 	 */
 	public enum PileAnswersRelation {
+		// 远程请求充电
+		REMOTE_START_CHARGING(REMOTE_CONTROL_START_CHARGING_CODE.getCode(), REMOTE_CONTROL_START_CHARGING_ANSWER_CODE.getCode()),
+
+		// 远程停止充电
+		REMOTE_STOP_CHARGING(REMOTE_CONTROL_STOP_CHARGING_CODE.getCode(), REMOTE_CONTROL_STOP_CHARGING_ANSWER_CODE.getCode()),
+
+		// 账户余额更新
+		ACCOUNT_BALANCE_UPDATE(REMOTE_ACCOUNT_BALANCE_UPDATE_CODE.getCode(), REMOTE_ACCOUNT_BALANCE_UPDATE_ANSWER_CODE.getCode()),
+
+		// 离线卡数据同步
+		OFFLINE_CARD_DATA_SYNCHRONIZATION(OFFLINE_CARD_DATA_SYNCHRONIZATION_CODE.getCode(), OFFLINE_CARD_DATA_SYNCHRONIZATION_ANSWER_CODE.getCode()),
+
+		// 离线卡数据清除
+		OFFLINE_CARD_DATA_CLEANING(OFFLINE_CARD_DATA_CLEANING_CODE.getCode(), OFFLINE_CARD_DATA_CLEANING_ANSWER_CODE.getCode()),
+
+		// 离线卡数据查询
+		OFFLINE_CARD_DATA_QUERY(OFFLINE_CARD_DATA_QUERY_CODE.getCode(), OFFLINE_CARD_DATA_QUERY_ANSWER_CODE.getCode()),
+
+		// 充电桩工作参数设置
+		CHARGING_PILE_WORKING_PARAMETER_SETTING(CHARGING_PILE_WORKING_PARAMETER_SETTING_CODE.getCode(), CHARGING_PILE_WORKING_PARAMETER_SETTING_ANSWER_CODE.getCode()),
+
+		// 对时设置
+		TIME_CHECK_SETTING(TIME_CHECK_SETTING_CODE.getCode(), TIME_CHECK_SETTING_ANSWER_CODE.getCode()),
+
+		// 计费模型设置
+		BILLING_TEMPLATE_SETTING(BILLING_TEMPLATE_SETTING_CODE.getCode(), BILLING_TEMPLATE_SETTING_ANSWER_CODE.getCode()),
+
 		// 预约充电设置
 		RESERVATION_CHARGING_SETUP(RESERVATION_CHARGING_SETUP_CODE.getCode(), RESERVATION_CHARGING_SETUP_ANSWER_CODE.getCode()),
 
+		// 预约充电启动结果上传
+		RESERVATION_CHARGING_STARTUP_RESULT(RESERVATION_CHARGING_STARTUP_RESULT_CODE.getCode(), RESERVATION_CHARGING_STARTUP_RESULT_ANSWER_CODE.getCode()),
+
+		// 遥控地锁
+		CONTROL_GROUND_LOCK(REMOTE_CONTROL_GROUND_LOCK_CODE.getCode(), REMOTE_CONTROL_GROUND_LOCK_ANSWER_CODE.getCode()),
+
+		// 远程重启
+		REMOTE_RESTART(REMOTE_RESTART_CODE.getCode(), REMOTE_RESTART_ANSWER_CODE.getCode()),
+
+		// 远程更新
+		REMOTE_UPDATE(REMOTE_UPDATE_CODE.getCode(), REMOTE_UPDATE_ANSWER_CODE.getCode()),
+
+		// 下发二维码
+		REMOTE_ISSUE_QRCODE(REMOTE_ISSUE_QRCODE_CODE.getCode(), REMOTE_ISSUE_QRCODE_ANSWER_CODE.getCode()),
+
+		// 查询工作参数
+		QUERY_PILE_WORK_PARAMS(QUERY_PILE_WORK_PARAMS_CODE.getCode(), QUERY_PILE_WORK_PARAMS_ANSWER_CODE.getCode()),
+
+		// 设置工作参数
+		SETTING_PILE_WORK_PARAMS(SETTING_PILE_WORK_PARAMS_CODE.getCode(), SETTING_PILE_WORK_PARAMS_ANSWER_CODE.getCode()),
+
 		// 远程账户余额更新
 		REMOTE_ACCOUNT_BALANCE_UPDATE(REMOTE_ACCOUNT_BALANCE_UPDATE_CODE.getCode(), REMOTE_ACCOUNT_BALANCE_UPDATE_ANSWER_CODE.getCode()),
 

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockHandler.java

@@ -19,7 +19,7 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class RemoteControlGroundLockHandler extends AbstractHandler{
-    private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_CONTROL_GROUND_LOCK_LIFTING_CODE.getBytes());
+    private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_CONTROL_GROUND_LOCK_CODE.getBytes());
 
     @Override
     public void afterPropertiesSet() throws Exception {

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockResponseHandler.java

@@ -26,7 +26,7 @@ public class RemoteControlGroundLockResponseHandler extends AbstractHandler{
     @Autowired
     private OrderPileOccupyService orderPileOccupyService;
 
-    private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.CHARGING_PILE_RESPOND_GROUND_LOCK_LIFTING_CODE.getBytes());
+    private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_CONTROL_GROUND_LOCK_ANSWER_CODE.getBytes());
 
     @Override
     public void afterPropertiesSet() throws Exception {

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java

@@ -27,7 +27,7 @@ import java.util.concurrent.CompletableFuture;
 @Slf4j
 @Component
 public class RemoteStartChargingRequestHandler extends AbstractHandler{
-    private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_START_CHARGING_ANSWER_CODE.getBytes());
+    private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_CONTROL_START_CHARGING_ANSWER_CODE.getBytes());
 
     @Autowired
     private OrderBasicInfoService orderBasicInfoService;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStopChargingRequestHandler.java

@@ -26,7 +26,7 @@ import java.util.Date;
 @Slf4j
 @Component
 public class RemoteStopChargingRequestHandler extends AbstractHandler{
-    private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_STOP_CHARGING_ANSWER_CODE.getBytes());
+    private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_CONTROL_STOP_CHARGING_ANSWER_CODE.getBytes());
 
     @Autowired
     private OrderBasicInfoService orderBasicInfoService;

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

@@ -56,8 +56,8 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService {
     // 需要记录报文的数据帧类型
     private final List<String> frameTypeList = Lists.newArrayList(
             YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_RESTART_CODE.getBytes()),
-            YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_CONTROL_START_CODE.getBytes()),
+            YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_CONTROL_START_CHARGING_CODE.getBytes()),
-            YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_STOP_CHARGING_CODE.getBytes()),
+            YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_CONTROL_STOP_CHARGING_CODE.getBytes()),
             YKCUtils.frameType2Str(YKCFrameTypeCode.RESERVATION_CHARGING_SETUP_CODE.getBytes())
     );
 
@@ -177,7 +177,7 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService {
         byte[] accountBalanceByteArr = YKCUtils.getPriceByte(chargeAmount.toString(), 2);
 
         byte[] msgBody = Bytes.concat(orderIdByteArr, pileSnByteArr, connectorCodeByteArr, logicCardNumByteArr, physicsCardNumByteArr, accountBalanceByteArr);
-        this.push(msgBody, pileSn, YKCFrameTypeCode.REMOTE_CONTROL_START_CODE);
+        this.push(msgBody, pileSn, YKCFrameTypeCode.REMOTE_CONTROL_START_CHARGING_CODE);
         log.info("【=====平台下发充电指令=====】:订单id:{}, 桩号:{}, 枪口号:{}, 逻辑卡号:{}, 物理卡号:{}, 账户余额:{}",
                 transactionCode, pileSn, BytesUtil.bcd2Str(connectorCodeByteArr), logicCardNum, physicsCardNum, chargeAmount);
     }
@@ -193,7 +193,7 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService {
         String connectorCode = command.getConnectorCode();
         // 远程停机
         byte[] msgBody = Bytes.concat(BytesUtil.str2Bcd(pileSn), BytesUtil.str2Bcd(connectorCode));
-        this.push(msgBody, pileSn, YKCFrameTypeCode.REMOTE_STOP_CHARGING_CODE);
+        this.push(msgBody, pileSn, YKCFrameTypeCode.REMOTE_CONTROL_STOP_CHARGING_CODE);
         log.info("【=====平台下发指令=====】:远程停止充电,桩号：{},枪口号：{}", pileSn, connectorCode);
     }
 
@@ -475,7 +475,7 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService {
         // 拼装msg信息
         byte[] msg = Bytes.concat(pileSnByteArr, connectorCodeByteArr, operateByteArr, obligateByteArr);
 
-        this.push(msg, pileSn, YKCFrameTypeCode.REMOTE_CONTROL_GROUND_LOCK_LIFTING_CODE);
+        this.push(msg, pileSn, YKCFrameTypeCode.REMOTE_CONTROL_GROUND_LOCK_CODE);
     }
 
     /**