充电桩

zhanzhiqin

2022-08-31 65ffc54ad3145eaecbbfe687f7557b95514205a6

充电桩

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java

@@ -65,10 +65,10 @@
    @AnonymousAccess
    @PostMapping("/finishCharging")
    public ResponseVO<Object> finishCharging(@RequestBody C3ChargingParam c3ChargingParam) {
        if (c3ChargingParam.getC3Mac() == null || c3ChargingParam.getOpenId() == null) {
        if (c3ChargingParam.getC3Id() == null || c3ChargingParam.getOpenId() == null) {
            throw new BusinessException("参数错误！");
        }
        String result = c3ChargingService.finishCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getOpenId());
        String result = c3ChargingService.finishCharging(c3ChargingParam.getC3Id(), c3ChargingParam.getOpenId());

        if ("操作成功".equals(result)) {
            return ResponseUtil.success(result);
@@ -77,19 +77,19 @@
        }
    }

    /**
     * 同步结束
     */
    @PostMapping("/EndOfTheSynchronization")
    public ResponseVO<Object> EndOfTheSynchronization(@RequestBody C3ChargingParam c3ChargingParam) {
        String result = c3ChargingService.EndOfTheSynchronization(c3ChargingParam.getC3Mac(), false);

        if ("操作成功".equals(result)) {
            return ResponseUtil.success(result);
        } else {
            return ResponseUtil.fail(result);
        }
    }
//    /**
//     * 同步结束
//     */
//    @PostMapping("/EndOfTheSynchronization")
//    public ResponseVO<Object> EndOfTheSynchronization(@RequestBody C3ChargingParam c3ChargingParam) {
//        String result = c3ChargingService.EndOfTheSynchronization(c3ChargingParam.getC3Mac(), false);
//
//        if ("操作成功".equals(result)) {
//            return ResponseUtil.success(result);
//        } else {
//            return ResponseUtil.fail(result);
//        }
//    }

//    /**
//     * 二维码
@@ -111,7 +111,7 @@
     */
    @PostMapping("/QueryVersion")
    public ResponseVO<Object> QueryVersion(@RequestBody C3ChargingParam c3ChargingParam) {
        String result = c3ChargingService.QueryVersion(c3ChargingParam.getC3Mac());
        String result = c3ChargingService.QueryVersion(c3ChargingParam.getC3Id());

        return ResponseUtil.success(result);
    }
@@ -121,7 +121,7 @@
     */
    @PostMapping("/QueryIntervalTime")
    public ResponseVO<Object> QueryIntervalTime(@RequestBody C3ChargingParam c3ChargingParam) {
        String result = c3ChargingService.QueryIntervalTime(c3ChargingParam.getC3Mac());
        String result = c3ChargingService.QueryIntervalTime(c3ChargingParam.getC3Id());

        return ResponseUtil.success(result);
    }
@@ -131,7 +131,7 @@
     */
    @PostMapping("/QueryConstant")
    public ResponseVO<Object> QueryConstant(@RequestBody C3ChargingParam c3ChargingParam) {
        String result = c3ChargingService.QueryConstant(c3ChargingParam.getC3Mac());
        String result = c3ChargingService.QueryConstant(c3ChargingParam.getC3Id());

        return ResponseUtil.success(result);
    }
@@ -141,7 +141,7 @@
     */
    @PostMapping("/QueryAddress")
    public ResponseVO<Object> QueryAddress(@RequestBody C3ChargingParam c3ChargingParam) {
        String result = c3ChargingService.QueryAddress(c3ChargingParam.getC3Mac());
        String result = c3ChargingService.QueryAddress(c3ChargingParam.getC3Id());
        return ResponseUtil.success(result);
    }

@@ -150,7 +150,7 @@
     */
    @PostMapping("/QueryFaultCode")
    public ResponseVO<Object> QueryFaultCode(@RequestBody C3ChargingParam c3ChargingParam) {
        String result = c3ChargingService.QueryFaultCode(c3ChargingParam.getC3Mac());
        String result = c3ChargingService.QueryFaultCode(c3ChargingParam.getC3Id());
        return ResponseUtil.success(result);
    }

@@ -159,7 +159,7 @@
     */
    @PostMapping("/ReadTheHeartbeatPackage")
    public ResponseVO<Object> ReadTheHeartbeatPackage(@RequestBody C3ChargingParam c3ChargingParam) {
        return ResponseUtil.success(c3ChargingService.ReadTheHeartbeatPackage(c3ChargingParam.getC3Mac(), false));
        return ResponseUtil.success(c3ChargingService.ReadTheHeartbeatPackage(c3ChargingParam.getC3Id(), false));
    }

    /**
@@ -168,7 +168,7 @@
    @PostMapping("/SetHeartbeatPacketTimeCharging")
    public ResponseVO<Object> SetHeartbeatPacketTimeCharging(@RequestBody @Validated C3ChargingParam c3ChargingParam) {

        return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getTime(), true, false));
        return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Id(), c3ChargingParam.getTime(), true, false));
    }

    /**
@@ -177,7 +177,7 @@
    @PostMapping("/SetHeartbeatPacketTimeNotCharging")
    public ResponseVO<Object> SetHeartbeatPacketTimeNotCharging(@RequestBody @Validated C3ChargingParam c3ChargingParam) {

        return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getTime(), false, false));
        return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Id(), c3ChargingParam.getTime(), false, false));
    }

    /**
@@ -186,7 +186,7 @@
    @PostMapping("/SetConstant")
    public ResponseVO<Object> SetConstant(@RequestBody @Validated C3ChargingParam c3ChargingParam) {

        return ResponseUtil.success(c3ChargingService.SetConstant(c3ChargingParam.getC3Mac(), c3ChargingParam.getConstant()));
        return ResponseUtil.success(c3ChargingService.SetConstant(c3ChargingParam.getC3Id(), c3ChargingParam.getConstant()));
    }

    /**
@@ -195,7 +195,7 @@
    @PostMapping("/SetAddress")
    public ResponseVO<Object> SetAddress(@RequestBody @Validated C3ChargingParam c3ChargingParam) {

        return ResponseUtil.success(c3ChargingService.SetAddress(c3ChargingParam.getC3Mac(), c3ChargingParam.getAddress(), false));
        return ResponseUtil.success(c3ChargingService.SetAddress(c3ChargingParam.getC3Id(), c3ChargingParam.getAddress(), false));
    }

    /**
@@ -204,7 +204,7 @@
    @PostMapping("/SetCalendar")
    public ResponseVO<Object> SetCalendar(@RequestBody @Validated C3ChargingParam c3ChargingParam) {

        return ResponseUtil.success(c3ChargingService.SetCalendar(c3ChargingParam.getC3Mac()
        return ResponseUtil.success(c3ChargingService.SetCalendar(c3ChargingParam.getC3Id()
                , c3ChargingParam.getYear(), c3ChargingParam.getMonth(), c3ChargingParam.getDay()
                , c3ChargingParam.getHour(), c3ChargingParam.getMin(), c3ChargingParam.getSec(), false));
    }
@@ -215,7 +215,7 @@
    @PostMapping("/ClearedFaultCode")
    public ResponseVO<Object> ClearedFaultCode(@RequestBody @Validated C3ChargingParam c3ChargingParam) {

        return ResponseUtil.success(c3ChargingService.ClearedFaultCode(c3ChargingParam.getC3Mac()));
        return ResponseUtil.success(c3ChargingService.ClearedFaultCode(c3ChargingParam.getC3Id()));
    }

    /**
@@ -224,7 +224,7 @@
    @PostMapping("/RestoreFactoryValue")
    public ResponseVO<Object> RestoreFactoryValue(@RequestBody @Validated C3ChargingParam c3ChargingParam) {

        return ResponseUtil.success(c3ChargingService.RestoreFactoryValue(c3ChargingParam.getC3Mac()));
        return ResponseUtil.success(c3ChargingService.RestoreFactoryValue(c3ChargingParam.getC3Id()));
    }

    /**
@@ -232,7 +232,7 @@
     */
    @PostMapping("/restartCharging")
    public ResponseVO<Object> restartCharging(@RequestBody C3ChargingParam c3ChargingParam) {
        String result = c3ChargingService.restartCharging(c3ChargingParam.getC3Mac());
        String result = c3ChargingService.restartCharging(c3ChargingParam.getC3Id());

        if ("操作成功".equals(result)) {
            return ResponseUtil.success(result);

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java

@@ -12,6 +12,7 @@
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.C3mOrder;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.enums.OrderStatus;
@@ -104,28 +105,44 @@
                /**
                 * 读取心跳包，判断剩余金额和已充电量，统计到缓存中正在进行的订单。
                 */
                A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(completeRequestFrame.getDestinationAddress(), true);
                if (completeRequestFrame != null) {
                    C3mCharging one = SpringContextHolder.getBean(C3ChargingService.class).
                            getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, completeRequestFrame.getMcuUdid()).last("limit 1"));
                    if (one == null) {
                        return;
                    }
                    A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(one.getC3Id(), true);
                if (aPackage == null) {
                    LogUtils.error("{ 充电桩(" + completeRequestFrame.getDestinationAddress() + ")充电结束上报读取心跳包失败，请检查充电桩是否出现故障! }");
                    return;
                }
                orderService.stopCharingOrder(aPackage);
                }


            } else if (C3ChargingEnum.CHARGE_STOP.getCode().equals(functionCode)) {
                log.info("心跳响应——充电中断");
                A5C3CommonReportInnerFrame stopRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
                log.info("C3充电桩上报处理_stopRequestFrame");
                log.info(stopRequestFrame.toString());
                if (stopRequestFrame != null) {
                    C3mCharging one = SpringContextHolder.getBean(C3ChargingService.class).
                            getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, stopRequestFrame.getMcuUdid()).last("limit 1"));
                    if (one == null) {
                        return;
                    }

                /**
                 * 读取心跳包，判断剩余金额和已充电量，统计到缓存中正在进行的订单。
                 */
                A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(stopRequestFrame.getDestinationAddress(), true);
                    A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(one.getC3Id(), true);
                if (aPackage == null) {
                    LogUtils.error("{ 充电桩(" + stopRequestFrame.getDestinationAddress() + ")充电结束上报读取心跳包失败，请检查充电桩是否出现故障! }");
                    return;
                }
                orderService.stopCharingOrder(aPackage);
                }

            } else if (C3ChargingEnum.ERROR_CODE.getCode().equals(functionCode)) {
                log.info("心跳响应——故障");
                A5C3ErrorCodeReportInnerFrame errorCodeRequestFrame = new A5C3ErrorCodeReportInnerFrame().transformFrame(frame.getPayload());

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/C3ChargingParam.java

@@ -1,5 +1,7 @@
package com.sandu.ximon.admin.param;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import javax.validation.constraints.NotEmpty;
@@ -13,8 +15,10 @@
public class C3ChargingParam {
    //C3充电桩地址  4（8char）

    @NotEmpty(message = "C3充电桩地址不能为空")
    private String c3Mac = "";
    //    @NotEmpty(message = "C3充电桩地址不能为空")
//    private String c3Mac = "";
    @NotNull(message = "充电桩ID不能为空")
    private Long c3Id;

    //充电量
    private Integer chargingCapacity;

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java

@@ -107,7 +107,7 @@
                newC3Mac = SupplementUtils.suppleZero(index, 8);
                if (!c3macList.contains(newC3Mac)) {
                    //失败重发一次
                    String s = SetAddress(c3Mac, newC3Mac, true);
                    String s = SetAddress(one.getC3Id(), newC3Mac, true);
                    if (!"操作成功".equals(s)) {
                        LogUtils.error("初始化充电桩失败!");
                        return false;
@@ -127,7 +127,7 @@
        //同步时间戳
        System.out.println("同步时间戳开始");
        String date = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
        String s = SetCalendar(newC3Mac, Integer.parseInt(date.substring(0, 2)), Integer.parseInt(date.substring(2, 4)),
        String s = SetCalendar(one.getC3Id(), Integer.parseInt(date.substring(0, 2)), Integer.parseInt(date.substring(2, 4)),
                Integer.parseInt(date.substring(4, 6)), Integer.parseInt(date.substring(6, 8)),
                Integer.parseInt(date.substring(8, 10)), Integer.parseInt(date.substring(10, 12)), true);
        if (!"操作成功".equals(s)) {
@@ -159,9 +159,9 @@
        Set<String> keys = RedisUtils.getBean().keys(C3mRedisConstant.C3_STATUS.getCode() + "*");

        C3mRedisConfig.reFlushTime(keys.size());
        String time1 = SetHeartbeatPacketTimeCharging(newC3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME) * 2, false, true);
        String time1 = SetHeartbeatPacketTimeCharging(one.getC3Id(), C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME) * 2, false, true);
        LogUtils.error("C3空闲心跳包时间同步响应结果：" + time1);
        String time2 = SetHeartbeatPacketTimeCharging(newC3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME), true, true);
        String time2 = SetHeartbeatPacketTimeCharging(one.getC3Id(), C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME), true, true);
        LogUtils.error("C3充电时心跳包时间同步响应结果：" + time2);
        System.out.println("设置心跳包间隔时间结束");

@@ -171,7 +171,7 @@
         * 获取心跳包，判断在线
         */
        System.out.println("获取心跳包开始");
        A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = ReadTheHeartbeatPackage(newC3Mac, true);
        A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = ReadTheHeartbeatPackage(one.getC3Id(), true);
        if (aPackage == null) {
            LogUtils.error("读取心跳包为空");
            return false;
@@ -361,7 +361,7 @@
        if (one == null) {
            throw new BusinessException("充电桩信息不存在！");
        }
        A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = ReadTheHeartbeatPackage(one.getC3Mac(), false);
        A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = ReadTheHeartbeatPackage(one.getC3Id(), false);
        if (beatDataPackage != null) {
            //充电桩ID
            chargingDto.setC3Id(one.getC3Id());
@@ -481,17 +481,21 @@
    /**
     * 结束充电
     *
     * @param c3Mac
     */
    @Transactional(rollbackFor = Exception.class)
    public String finishCharging(String c3Mac, String openId) {
    public String finishCharging(Long c3Id, String openId) {
        C3mCharging one = getById(c3Id);
        if (one == null) {
            System.out.println("充电桩不存在！");
        }

        //查询
        if (openId.isEmpty()) {
            throw new BusinessException("openId不能为空");
        }
        //查询该充电桩最近的订单
        C3mOrder order = SpringContextHolder.getBean(C3mOrderService.class).getOne(Wrappers.lambdaQuery(C3mOrder.class)
                .eq(C3mOrder::getC3Mac, c3Mac).eq(C3mOrder::getChargingStates, 0).last("limit 1"));
                .eq(C3mOrder::getC3Mac, one.getC3Mac()).eq(C3mOrder::getChargingStates, 0).last("limit 1"));

        if (order == null) {
            throw new BusinessException("充电桩没有进行中的订单");
@@ -501,23 +505,20 @@
        }

        C3FinishChargingReqInnerFrame c3FinishChargingReqInnerFrame =
                new C3FinishChargingReqInnerFrame(c3Mac);
                new C3FinishChargingReqInnerFrame(one.getC3Mac());

        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3FinishChargingReqInnerFrame);
        System.out.println(a5Frame + "            -----a5Frame");

        C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
        if (c3mCharging == null) {
            throw new BusinessException("C3充电桩硬件mcu_udid不存在");
        }
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-结束充电", a5Frame, commonFrame);

        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3帧-结束充电", a5Frame, commonFrame);
        System.out.println(commonFrame + "            -----commonFrame");

        A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(commonFrame.getPayload());

        //结束充电 更改订单状态
        C3mOrder lastOrderByC3Mac = SpringContextHolder.getBean(C3mOrderService.class).getLastOrderByC3Mac(c3Mac);
        C3mOrder lastOrderByC3Mac = SpringContextHolder.getBean(C3mOrderService.class).getLastOrderByC3Mac(one.getC3Mac());
        if (lastOrderByC3Mac != null) {
            //设置订单状态为已完成
            lastOrderByC3Mac.setOrderStatus(OrderStatus.COMPLETE.getStatus());
@@ -610,22 +611,21 @@

    /**
     * 查询版本
     *
     * @param c3Mac
     */
    public String QueryVersion(String c3Mac) {
    public String QueryVersion(Long c3Id) {
        C3mCharging one = getById(c3Id);
        if (one == null) {
            System.out.println("充电桩不存在！");
        }

        C3QueryVersionReqInnerFrame c3QueryVersionReqInnerFrame =
                new C3QueryVersionReqInnerFrame(c3Mac);
                new C3QueryVersionReqInnerFrame(one.getC3Mac());

        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3QueryVersionReqInnerFrame);
        System.out.println(a5Frame + "            -----a5Frame");

        C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
        if (c3mCharging == null) {
            throw new BusinessException("C3充电桩硬件mcu_udid不存在");
        }
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-版本查询", a5Frame, commonFrame);
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3帧-版本查询", a5Frame, commonFrame);


        System.out.println(commonFrame + "            -----commonFrame");
@@ -641,22 +641,21 @@

    /**
     * 查询心跳包间隔时间
     *
     * @param c3Mac
     */
    public String QueryIntervalTime(String c3Mac) {
    public String QueryIntervalTime(Long c3Id) {
        C3mCharging one = getById(c3Id);
        if (one == null) {
            System.out.println("充电桩不存在！");
        }

        C3QueryIntervalTimeReqInnerFrame c3QueryIntervalTimeReqInnerFrame =
                new C3QueryIntervalTimeReqInnerFrame(c3Mac);
                new C3QueryIntervalTimeReqInnerFrame(one.getC3Mac());

        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3QueryIntervalTimeReqInnerFrame);
        System.out.println(a5Frame + "            -----a5Frame");

        C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
        if (c3mCharging == null) {
            throw new BusinessException("C3充电桩硬件mcu_udid不存在");
        }
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-查询心跳包间隔时间", a5Frame, commonFrame);
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3帧-查询心跳包间隔时间", a5Frame, commonFrame);

        System.out.println(commonFrame + "            -----commonFrame");

@@ -671,22 +670,22 @@

    /**
     * 查询电压/电流常数
     *
     * @param c3Mac
     */
    public String QueryConstant(String c3Mac) {
    public String QueryConstant(Long c3Id) {
        C3mCharging one = getById(c3Id);
        if (one == null) {
            System.out.println("充电桩不存在！");
        }


        C3QueryConstantReqInnerFrame c3QueryConstantReqInnerFrame =
                new C3QueryConstantReqInnerFrame(c3Mac);
                new C3QueryConstantReqInnerFrame(one.getC3Mac());

        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3QueryConstantReqInnerFrame);
        System.out.println(a5Frame + "            -----a5Frame");

        C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
        if (c3mCharging == null) {
            throw new BusinessException("C3充电桩硬件mcu_udid不存在");
        }
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-查询电压/电流常数", a5Frame, commonFrame);
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3帧-查询电压/电流常数", a5Frame, commonFrame);


        System.out.println(commonFrame + "            -----commonFrame");
@@ -702,23 +701,21 @@

    /**
     * 查询地址
     *
     * @param c3Mac
     */
    public String QueryAddress(String c3Mac) {
    public String QueryAddress(Long c3Id) {
        C3mCharging one = getById(c3Id);
        if (one == null) {
            System.out.println("充电桩不存在！");
        }

        C3QueryAddressReqInnerFrame c3QueryAddressReqInnerFrame =
                new C3QueryAddressReqInnerFrame(c3Mac);
                new C3QueryAddressReqInnerFrame(one.getC3Mac());

        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3QueryAddressReqInnerFrame);
        System.out.println(a5Frame + "            -----a5Frame");

        C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
        if (c3mCharging == null) {
            throw new BusinessException("C3充电桩硬件mcu_udid不存在");
        }
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-查询地址", a5Frame, commonFrame);

        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3帧-查询地址", a5Frame, commonFrame);

        System.out.println(commonFrame + "            -----commonFrame");

@@ -733,22 +730,21 @@

    /**
     * 查询故障码
     *
     * @param c3Mac
     */
    public String QueryFaultCode(String c3Mac) {
    public String QueryFaultCode(Long c3Id) {
        C3mCharging one = getById(c3Id);
        if (one == null) {
            System.out.println("充电桩不存在！");
        }

        C3QueryFaultCodeReqInnerFrame c3QueryFaultCodeReqInnerFrame =
                new C3QueryFaultCodeReqInnerFrame(c3Mac);
                new C3QueryFaultCodeReqInnerFrame(one.getC3Mac());

        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3QueryFaultCodeReqInnerFrame);
        System.out.println(a5Frame + "            -----a5Frame");

        C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
        if (c3mCharging == null) {
            throw new BusinessException("C3充电桩硬件mcu_udid不存在");
        }
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-查询故障码", a5Frame, commonFrame);
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3帧-查询故障码", a5Frame, commonFrame);


        System.out.println(commonFrame + "            -----commonFrame");
@@ -765,27 +761,27 @@
    /**
     * 读心跳包
     *
     * @param c3Mac
     * @param resendFlag 重发标志
     */
    public A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage ReadTheHeartbeatPackage(String c3Mac, boolean resendFlag) {
    public A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage ReadTheHeartbeatPackage(Long c3Id, boolean resendFlag) {
        C3mCharging one = getById(c3Id);
        if (one == null) {
            System.out.println("充电桩不存在！");
        }

        C3ReadTheHeartbeatPackageReqInnerFrame readTheHeartbeatPackageReqInnerFrame =
                new C3ReadTheHeartbeatPackageReqInnerFrame(c3Mac);
                new C3ReadTheHeartbeatPackageReqInnerFrame(one.getC3Mac());

        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), readTheHeartbeatPackageReqInnerFrame);
        System.out.println(a5Frame + "            -----a5Frame");

        C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
        if (c3mCharging == null) {
            throw new BusinessException("C3充电桩硬件mcu_udid不存在");
        }
        CommonFrame commonFrame;
        if (resendFlag) {
            commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame, true);
            commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame, true);
        } else {
            commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
            commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
        }
        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-读取心跳包", a5Frame, commonFrame);
        StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3帧-读取心跳包", a5Frame, commonFrame);


        System.out.println(commonFrame + "            -----commonFrame");
@@ -801,32 +797,32 @@
    /**
     * 设置心跳包间隔时间(秒）-充电状态时/非充电状态时
     *
     * @param c3Mac
     * @param setTime
     * @param resndFlag 重发标志
     * @return
     */
    public String SetHeartbeatPacketTimeCharging(String c3Mac, int setTime, boolean flag, boolean resndFlag) {
    public String SetHeartbeatPacketTimeCharging(Long c3Id, int setTime, boolean flag, boolean resndFlag) {
        C3mCharging one = getById(c3Id);
        if (one == null) {
            System.out.println("充电桩不存在！");
        }

        if (setTime <= 0) {
            throw new BusinessException("设置的心跳包间隔时间错误！");
        }
        C3SetHeartbeatPacketTimeReqInnerFrame setHeartbeatPacketTimeChargingReqInnerFrame =
                new C3SetHeartbeatPacketTimeReqInnerFrame(c3Mac, setTime, flag);
                new C3SetHeartbeatPacketTimeReqInnerFrame(one.getC3Mac(), setTime, flag);

        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), setHeartbeatPacketTimeChargingReqInnerFrame);
        System.out.println(a5Frame + "            -----a5Frame");

        C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
        if (c3mCharging == null) {
            throw new BusinessException("C3充电桩硬件mcu_udid不存在");
        }
        CommonFrame commonFrame;
        if (resndFlag) {
            commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame, true);
            commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame, true);
        } else {
            commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
            commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
        }
        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-设置心跳包间隔时间", a5Frame, commonFrame);
        StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3帧-设置心跳包间隔时间", a5Frame, commonFrame);


        System.out.println(commonFrame + "            -----commonFrame");
@@ -842,24 +838,23 @@
    /**
     * 设置电压/电流常数(各一字节)(默认值0xBC64)
     *
     * @param c3Mac
     * @param constant
     * @return
     */
    public String SetConstant(String c3Mac, String constant) {
    public String SetConstant(Long c3Id, String constant) {
        C3mCharging one = getById(c3Id);
        if (one == null) {
            System.out.println("充电桩不存在！");
        }

        C3SetConstantReqInnerFrame setConstantReqInnerFrame =
                new C3SetConstantReqInnerFrame(c3Mac, constant);
                new C3SetConstantReqInnerFrame(one.getC3Mac(), constant);

        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), setConstantReqInnerFrame);
        System.out.println(a5Frame + "            -----a5Frame");

        C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
        if (c3mCharging == null) {
            throw new BusinessException("C3充电桩硬件mcu_udid不存在");
        }
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-设置电压/电流常数", a5Frame, commonFrame);
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3帧-设置电压/电流常数", a5Frame, commonFrame);


        System.out.println(commonFrame + "            -----commonFrame");
@@ -875,18 +870,17 @@
    /**
     * 设置地址
     *
     * @param c3Mac
     * @param address
     * @return
     */
    public String SetAddress(String c3Mac, String address, boolean resendFlag) {
        if (address == null || address.length() != 8) {
            throw new BusinessException("地址信息错误！");
    public String SetAddress(Long c3Id, String address, boolean resendFlag) {
        C3mCharging one = getById(c3Id);
        if (one == null) {
            System.out.println("充电桩不存在！");
        }

        C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
        if (c3mCharging == null) {
            throw new BusinessException("C3MAC地址不存在");
        if (address == null || address.length() != 8) {
            throw new BusinessException("地址信息错误！");
        }

        if (getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, address).last("limit 1")) != null) {
@@ -894,30 +888,30 @@
        }

        C3SetAddressReqInnerFrame setAddressReqInnerFrame =
                new C3SetAddressReqInnerFrame(c3Mac, address);
                new C3SetAddressReqInnerFrame(one.getC3Mac(), address);

        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), setAddressReqInnerFrame);
        System.out.println(a5Frame + "            -----a5Frame");
        CommonFrame commonFrame;
        if (resendFlag) {
            commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame, true);
            commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame, true);
        } else {
            commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
            commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
        }
        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-设置地址", a5Frame, commonFrame);
        StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3帧-设置地址", a5Frame, commonFrame);
        System.out.println(commonFrame + "            -----commonFrame");

        //保存操作日志
        String content = "旧C3Mac地址：" + c3Mac + "；新C3Mac地址：" + address;
        String content = "旧C3Mac地址：" + one.getC3Mac() + "；新C3Mac地址：" + address;
        StoreOperationRecordsUtils.storeOperationData(null, null, "C3帧-设置地址", content);

        A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(commonFrame.getPayload());
        if (operationReportInnerFrame.isValidate()) {
            if ("操作成功".equals(operationReportInnerFrame.getState())) {
                //修改成功需要更改数据库数据
                C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
                C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, one.getC3Mac()).last("limit 1"));
                one.setC3Mac(address);
                updateById(one);
                updateById(c3mCharging);
            }
            return operationReportInnerFrame.getState();
        } else {
@@ -929,32 +923,30 @@
    /**
     * 设置日历（同心跳包中的6字节日期时间）
     *
     * @param c3Mac
     * @param resendFlag 是否需要重发标志
     * @return
     */
    public String SetCalendar(String c3Mac, int year, int month, int day, int hour, int min, int sec, boolean resendFlag) {

    public String SetCalendar(Long c3Id, int year, int month, int day, int hour, int min, int sec, boolean resendFlag) {
        C3mCharging one = getById(c3Id);
        if (one == null) {
            System.out.println("充电桩不存在！");
        }

        C3SetCalendarReqInnerFrame setCalendarReqInnerFrame =
                new C3SetCalendarReqInnerFrame(c3Mac, year, month, day, hour, min, sec);
                new C3SetCalendarReqInnerFrame(one.getC3Mac(), year, month, day, hour, min, sec);

        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), setCalendarReqInnerFrame);
        System.out.println(a5Frame + "            -----a5Frame");

        C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
        if (c3mCharging == null) {
            throw new BusinessException("C3充电桩硬件mcu_udid不存在");
        }
        CommonFrame commonFrame;
        if (resendFlag) {
            //需要重发
            commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame, true);
            commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame, true);
        } else {
            //不需要重发
            commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
            commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
        }
        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-设置日历", a5Frame, commonFrame);
        StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3帧-设置日历", a5Frame, commonFrame);

        System.out.println(commonFrame + "            -----commonFrame");

@@ -1008,24 +1000,22 @@
    /**
     * 故障码上报清除
     *
     * @param c3Mac
     * @return
     */
    public String ClearedFaultCode(String c3Mac) {

    public String ClearedFaultCode(Long c3Id) {
        C3mCharging one = getById(c3Id);
        if (one == null) {
            System.out.println("充电桩不存在！");
        }

        C3ClearedFaultCodeReqInnerFrame clearedFaultCodeReqInnerFrame =
                new C3ClearedFaultCodeReqInnerFrame(c3Mac);
                new C3ClearedFaultCodeReqInnerFrame(one.getC3Mac());

        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), clearedFaultCodeReqInnerFrame);
        System.out.println(a5Frame + "            -----a5Frame");

        C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
        if (c3mCharging == null) {
            throw new BusinessException("C3充电桩硬件mcu_udid不存在");
        }
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-清除故障码上报", a5Frame, commonFrame);
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3帧-清除故障码上报", a5Frame, commonFrame);

        System.out.println(commonFrame + "            -----commonFrame");

@@ -1040,24 +1030,22 @@
    /**
     * 恢复出厂值
     *
     * @param c3Mac
     * @return
     */
    public String RestoreFactoryValue(String c3Mac) {

    public String RestoreFactoryValue(Long c3Id) {
        C3mCharging one = getById(c3Id);
        if (one == null) {
            System.out.println("充电桩不存在！");
        }

        C3RestoreFactoryValueReqInnerFrame restoreFactoryValueReqInnerFrame =
                new C3RestoreFactoryValueReqInnerFrame(c3Mac);
                new C3RestoreFactoryValueReqInnerFrame(one.getC3Mac());

        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), restoreFactoryValueReqInnerFrame);
        System.out.println(a5Frame + "            -----a5Frame");

        C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
        if (c3mCharging == null) {
            throw new BusinessException("C3充电桩硬件mcu_udid不存在");
        }
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-恢复出厂设置", a5Frame, commonFrame);
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3帧-恢复出厂设置", a5Frame, commonFrame);

        System.out.println(commonFrame + "            -----commonFrame");

@@ -1065,8 +1053,8 @@
        if (operationReportInnerFrame.isValidate()) {
            if ("操作成功".equals(operationReportInnerFrame.getState())) {
                //恢复出厂设置成功，需要修改C3Mac地址
                c3mCharging.setC3Mac("00000000");
                updateById(c3mCharging);
                one.setC3Mac("00000000");
                updateById(one);
            }
            return operationReportInnerFrame.getState();
        } else {
@@ -1077,21 +1065,22 @@
    /**
     * 软重启
     *
     * @param c3Mac
     */
    public String restartCharging(String c3Mac) {
    public String restartCharging(Long c3Id) {
        C3mCharging one = getById(c3Id);
        if (one == null) {
            System.out.println("充电桩不存在！");
        }


        C3RestartChargingReqInnerFrame c3RestartChargingReqInnerFrame =
                new C3RestartChargingReqInnerFrame(c3Mac);
                new C3RestartChargingReqInnerFrame(one.getC3Mac());

        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3RestartChargingReqInnerFrame);
        System.out.println(a5Frame + "            -----a5Frame");

        C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac).last("limit 1"));
        if (c3mCharging == null) {
            throw new BusinessException("C3充电桩硬件mcu_udid不存在");
        }
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3帧-软重启", a5Frame, commonFrame);
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(one.getPoleDevicesCode(), a5Frame);
        StoreOperationRecordsUtils.storeInnerFrameData(one.getC3Mac(), "C3帧-软重启", a5Frame, commonFrame);


        System.out.println(commonFrame + "            -----commonFrame");