充电桩

zhanzhiqin

2022-09-08 1213ddfaad5fbc7a51741b4f8612855866327487

充电桩

 dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java

@@ -45,6 +45,19 @@
    ADMIN_LIST("管理员列表"),
    MENU_LIST("菜单列表"),
    C3_CHARGING_LIST("充电桩列表"),
    C3_CHARGING_QUERYVERSION("查询版本"),
    C3_CHARGING_QUERYCONSTANT("查询常数"),
    C3_CHARGING_QUERYADDRESS("查询地址"),
    C3_CHARGING_QUERYFAULTCODE("查询故障码"),
    C3_CHARGING_READTHEHEARTBEATPACKAGE("读心跳包"),
    C3_CHARGING_HEARTBEATPACKETTIME("心跳包间隔时间"),
    C3_CHARGING_SETCONSTANT("设置常数"),
    C3_CHARGING_SETADDRESS("设置地址"),
    C3_CHARGING_SETCALENDAR("设置日历"),
    C3_CHARGING_CLEAREDFAULTCODE("故障码上报清除"),
    C3_CHARGING_RESTOREFACTORYVALUE("恢复出厂值"),
    C3_CHARGING_RESTARTCHARGING("软重启"),
    C3_CHARGING_UPDATEC3CHARGINGNAME("修改充电桩硬件设备名称"),
    ROLE_MANAGER("角色管理"),
    PAY_CONFIG("支付配置"),
    BANNER("微信logo"),

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

@@ -111,6 +111,10 @@
     */
    @PostMapping("/QueryVersion")
    public ResponseVO<Object> QueryVersion(@RequestBody C3ChargingParam c3ChargingParam) {
        if (!permissionConfig.check(MenuEnum.C3_CHARGING_QUERYVERSION.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }

        String result = c3ChargingService.QueryVersion(c3ChargingParam.getC3Id());

        return ResponseUtil.success(result);
@@ -121,6 +125,9 @@
     */
    @PostMapping("/QueryIntervalTime")
    public ResponseVO<Object> QueryIntervalTime(@RequestBody C3ChargingParam c3ChargingParam) {
        if (!permissionConfig.check(MenuEnum.C3_CHARGING_HEARTBEATPACKETTIME.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        String result = c3ChargingService.QueryIntervalTime(c3ChargingParam.getC3Id());

        return ResponseUtil.success(result);
@@ -131,6 +138,9 @@
     */
    @PostMapping("/QueryConstant")
    public ResponseVO<Object> QueryConstant(@RequestBody C3ChargingParam c3ChargingParam) {
        if (!permissionConfig.check(MenuEnum.C3_CHARGING_QUERYCONSTANT.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        String result = c3ChargingService.QueryConstant(c3ChargingParam.getC3Id());

        return ResponseUtil.success(result);
@@ -141,6 +151,9 @@
     */
    @PostMapping("/QueryAddress")
    public ResponseVO<Object> QueryAddress(@RequestBody C3ChargingParam c3ChargingParam) {
        if (!permissionConfig.check(MenuEnum.C3_CHARGING_QUERYADDRESS.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        String result = c3ChargingService.QueryAddress(c3ChargingParam.getC3Id());
        return ResponseUtil.success(result);
    }
@@ -150,6 +163,9 @@
     */
    @PostMapping("/QueryFaultCode")
    public ResponseVO<Object> QueryFaultCode(@RequestBody C3ChargingParam c3ChargingParam) {
        if (!permissionConfig.check(MenuEnum.C3_CHARGING_QUERYFAULTCODE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        String result = c3ChargingService.QueryFaultCode(c3ChargingParam.getC3Id());
        return ResponseUtil.success(result);
    }
@@ -159,6 +175,9 @@
     */
    @PostMapping("/ReadTheHeartbeatPackage")
    public ResponseVO<Object> ReadTheHeartbeatPackage(@RequestBody C3ChargingParam c3ChargingParam) {
        if (!permissionConfig.check(MenuEnum.C3_CHARGING_READTHEHEARTBEATPACKAGE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(c3ChargingService.ReadTheHeartbeatPackage(c3ChargingParam.getC3Id(), false));
    }

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

        if (!permissionConfig.check(MenuEnum.C3_CHARGING_HEARTBEATPACKETTIME.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Id(), c3ChargingParam.getTime(), true, false));
    }

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

        if (!permissionConfig.check(MenuEnum.C3_CHARGING_HEARTBEATPACKETTIME.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Id(), c3ChargingParam.getTime(), false, false));
    }

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

        if (!permissionConfig.check(MenuEnum.C3_CHARGING_SETCONSTANT.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(c3ChargingService.SetConstant(c3ChargingParam.getC3Id(), c3ChargingParam.getConstant()));
    }

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

        if (!permissionConfig.check(MenuEnum.C3_CHARGING_SETADDRESS.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(c3ChargingService.SetAddress(c3ChargingParam.getC3Id(), c3ChargingParam.getAddress(), false));
    }

@@ -203,6 +230,9 @@
     */
    @PostMapping("/SetCalendar")
    public ResponseVO<Object> SetCalendar(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
        if (!permissionConfig.check(MenuEnum.C3_CHARGING_SETCALENDAR.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }

        return ResponseUtil.success(c3ChargingService.SetCalendar(c3ChargingParam.getC3Id()
                , c3ChargingParam.getYear(), c3ChargingParam.getMonth(), c3ChargingParam.getDay()
@@ -214,7 +244,9 @@
     */
    @PostMapping("/ClearedFaultCode")
    public ResponseVO<Object> ClearedFaultCode(@RequestBody @Validated C3ChargingParam c3ChargingParam) {

        if (!permissionConfig.check(MenuEnum.C3_CHARGING_CLEAREDFAULTCODE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(c3ChargingService.ClearedFaultCode(c3ChargingParam.getC3Id()));
    }

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

        if (!permissionConfig.check(MenuEnum.C3_CHARGING_RESTOREFACTORYVALUE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(c3ChargingService.RestoreFactoryValue(c3ChargingParam.getC3Id()));
    }

@@ -232,6 +266,9 @@
     */
    @PostMapping("/restartCharging")
    public ResponseVO<Object> restartCharging(@RequestBody C3ChargingParam c3ChargingParam) {
        if (!permissionConfig.check(MenuEnum.C3_CHARGING_RESTARTCHARGING.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        String result = c3ChargingService.restartCharging(c3ChargingParam.getC3Id());

        if ("操作成功".equals(result)) {
@@ -241,21 +278,21 @@
        }
    }

    /**
     * 添加充电桩硬件设备
     *
     * @param c3ChargingAddParam
     * @return
     */
    @PostMapping("/addC3Charging")
    public ResponseVO<Object> addC3Charging(@RequestBody C3ChargingAddParam c3ChargingAddParam) {
        boolean flag = c3ChargingService.addC3Charging(c3ChargingAddParam);
        if (flag) {
            return ResponseUtil.success("添加充电桩硬件设备成功！");
        } else {
            return ResponseUtil.fail("添加充电桩硬件设备失败！");
        }
    }
//    /**
//     * 添加充电桩硬件设备
//     *
//     * @param c3ChargingAddParam
//     * @return
//     */
//    @PostMapping("/addC3Charging")
//    public ResponseVO<Object> addC3Charging(@RequestBody C3ChargingAddParam c3ChargingAddParam) {
//        boolean flag = c3ChargingService.addC3Charging(c3ChargingAddParam);
//        if (flag) {
//            return ResponseUtil.success("添加充电桩硬件设备成功！");
//        } else {
//            return ResponseUtil.fail("添加充电桩硬件设备失败！");
//        }
//    }

    /**
     * 修改充电桩硬件设备名称
@@ -265,6 +302,9 @@
     */
    @PostMapping("/updateC3ChargingName")
    public ResponseVO<Object> updateC3ChargingName(@RequestBody C3ChargingAddParam c3ChargingAddParam) {
        if (!permissionConfig.check(MenuEnum.C3_CHARGING_UPDATEC3CHARGINGNAME.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean flag = c3ChargingService.updateC3ChargingName(c3ChargingAddParam);
        if (flag) {
            return ResponseUtil.success("修改充电桩硬件设备名称成功！");

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

@@ -50,111 +50,116 @@

    @Override
    public void process(String productKey, String deviceName, CommonFrame frame) {
        String functionCode = frame.getPayload().substring(2, 4);
        //TODO
        if (frame.getPayload().contains("0000048E") || frame.getPayload().contains("FEA5820018F040001000000000")) {
            if (C3ChargingEnum.NETWORK_REQUEST.getCode().equals(functionCode)) {
                A5C3CommonReportInnerFrame netRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
                log.info("C3充电桩上报处理_netRequestFrame");
                log.info(netRequestFrame.toString());
        if (!"32313243305005ffad36ffff".equals(deviceName)) {
            log.info("不要处理0000048E之外的充电桩！");
            return;
        }

                if (netRequestFrame.isValidate()) {
                    //保存充电桩硬件信息
                    SpringContextHolder.getBean(C3ChargingService.class)
                            .saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress());
                }
            } else if (C3ChargingEnum.QR_CODE_REQUEST.getCode().equals(functionCode)) {
                //  网页操作二维码请求(41)
                A5C3CommonReportInnerFrame codeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
                log.info("C3充电桩上报处理_codeRequestFrame");
                log.info(codeRequestFrame.toString());

                if (codeRequestFrame.isValidate()) {
                    if (deviceName != null) {
                        //设置二维码
                        Pole pole = SpringContextHolder.getBean(PoleService.class).getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName));
                        if (pole != null) {
                            String testUrl = "http://www.ximonsmart.com/charge/#/charge/" + pole.getId() + "/" + System.currentTimeMillis();
                            SpringContextHolder.getBean(C3ChargingService.class).QrCode(codeRequestFrame.getDestinationAddress(), testUrl);
                        }
        String functionCode = frame.getPayload().substring(2, 4);
        if (C3ChargingEnum.NETWORK_REQUEST.getCode().equals(functionCode)) {
            A5C3CommonReportInnerFrame netRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
            log.info("C3充电桩上报处理_netRequestFrame");
            log.info(netRequestFrame.toString());

            if (netRequestFrame.isValidate()) {
                //保存充电桩硬件信息
                SpringContextHolder.getBean(C3ChargingService.class)
                        .saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress());
            }
        } else if (C3ChargingEnum.QR_CODE_REQUEST.getCode().equals(functionCode)) {
            //  网页操作二维码请求(41)
            A5C3CommonReportInnerFrame codeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
            log.info("C3充电桩上报处理_codeRequestFrame");
            log.info(codeRequestFrame.toString());

            if (codeRequestFrame.isValidate()) {
                if (deviceName != null) {
                    //设置二维码
                    Pole pole = SpringContextHolder.getBean(PoleService.class).getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName));
                    if (pole != null) {
                        String testUrl = "http://www.ximonsmart.com/charge/#/charge/" + pole.getId() + "/" + System.currentTimeMillis();
                        SpringContextHolder.getBean(C3ChargingService.class).QrCode(codeRequestFrame.getDestinationAddress(), testUrl);
                    }
                }
            }

            } else if (C3ChargingEnum.HEART_BEAT.getCode().equals(functionCode)) {
                log.info("心跳相应——C3充电桩数据" + productKey + "     -------       " + deviceName);
                A5C3HeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5C3HeartbeatReportInnerFrame().transformFrame(frame.getPayload());
                log.info("C3充电桩上报处理_heartbeatReportInnerFrame");
                log.info(heartbeatReportInnerFrame.toString());
        } else if (C3ChargingEnum.HEART_BEAT.getCode().equals(functionCode)) {
            log.info("心跳相应——C3充电桩数据" + productKey + "     -------       " + deviceName);
            A5C3HeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5C3HeartbeatReportInnerFrame().transformFrame(frame.getPayload());
            log.info("C3充电桩上报处理_heartbeatReportInnerFrame");
            log.info(heartbeatReportInnerFrame.toString());

                if (heartbeatReportInnerFrame.isValidate()) {
                    SpringContextHolder.getBean(C3ChargingService.class).updateReportState(deviceName
                            , heartbeatReportInnerFrame.getHeartBeatDataPackage().getC3Mac()
                            , heartbeatReportInnerFrame.getHeartBeatDataPackage().getStatusBit()
                            , heartbeatReportInnerFrame.getHeartBeatDataPackage().getDeviceTemperature());
                    //更新订单数据
                    SpringContextHolder.getBean(C3mOrderService.class).updateOrderStatusByHeartbeat(heartbeatReportInnerFrame.getHeartBeatDataPackage());
                    //存缓存
                    RedisUtils.getBean().set(C3mRedisConstant.C3_STATUS.getCode() + heartbeatReportInnerFrame.getHeartBeatDataPackage().getC3Mac()
                            , heartbeatReportInnerFrame.getHeartBeatDataPackage(), 300L);
            if (heartbeatReportInnerFrame.isValidate()) {
                SpringContextHolder.getBean(C3ChargingService.class).updateReportState(deviceName
                        , heartbeatReportInnerFrame.getHeartBeatDataPackage().getC3Mac()
                        , heartbeatReportInnerFrame.getHeartBeatDataPackage().getStatusBit()
                        , heartbeatReportInnerFrame.getHeartBeatDataPackage().getDeviceTemperature());
                //更新订单数据
                SpringContextHolder.getBean(C3mOrderService.class).updateOrderStatusByHeartbeat(heartbeatReportInnerFrame.getHeartBeatDataPackage());
                //存缓存
                RedisUtils.getBean().set(C3mRedisConstant.C3_STATUS.getCode() + heartbeatReportInnerFrame.getHeartBeatDataPackage().getC3Mac()
                        , heartbeatReportInnerFrame.getHeartBeatDataPackage(), 300L);
            }
        } else if (C3ChargingEnum.CHARGE_COMPLETE.getCode().equals(functionCode)) {
            A5C3CommonReportInnerFrame completeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
            log.info("C3充电桩上报处理_completeRequestFrame");
            log.info(completeRequestFrame.toString());
            //  充电结束上报(43)
            /**
             * 读取心跳包，判断剩余金额和已充电量，统计到缓存中正在进行的订单。
             */
            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;
                }
            } else if (C3ChargingEnum.CHARGE_COMPLETE.getCode().equals(functionCode)) {
                A5C3CommonReportInnerFrame completeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
                log.info("C3充电桩上报处理_completeRequestFrame");
                log.info(completeRequestFrame.toString());
                //  充电结束上报(43)
                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;
                }

                /**
                 * 读取心跳包，判断剩余金额和已充电量，统计到缓存中正在进行的订单。
                 */
                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);
                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());
            log.info("C3充电桩上报处理_errorCodeRequestFrame");
            log.info(errorCodeRequestFrame.toString());

            } 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(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());
                log.info("C3充电桩上报处理_errorCodeRequestFrame");
                log.info(errorCodeRequestFrame.toString());

                /**
                 * 保存C3充电桩故障数据
                 */
                if (errorCodeRequestFrame.isValidate() && errorCodeRequestFrame.getErrorMessage() != null) {
                    //保存故障信息
                    SpringContextHolder.getBean(C3mReportErrorService.class).saveReportError(errorCodeRequestFrame);
            /**
             * 保存C3充电桩故障数据
             */
            if (errorCodeRequestFrame.isValidate() && errorCodeRequestFrame.getErrorMessage() != null) {
                //保存故障信息
                SpringContextHolder.getBean(C3mReportErrorService.class).saveReportError(errorCodeRequestFrame);
//                //充电桩故障结束订单
//                A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(errorCodeRequestFrame.getDestinationAddress(), true);
//                if (aPackage == null) {
@@ -163,14 +168,11 @@
//                }
//                orderService.stopCharingOrder(aPackage);

                } else {
                    System.out.println("数据校验异常！");
                }
            } else {
                System.out.println("数据校验异常！");
            }
        } else {
            log.info("不要处理0000048A之外的充电桩！");
            return;
        }

    }



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

@@ -480,7 +480,6 @@

    /**
     * 结束充电
     *
     */
    @Transactional(rollbackFor = Exception.class)
    public String finishCharging(Long c3Id, String openId) {
@@ -1064,7 +1063,6 @@

    /**
     * 软重启
     *
     */
    public String restartCharging(Long c3Id) {
        C3mCharging one = getById(c3Id);
@@ -1122,9 +1120,7 @@
         * 添加充电桩 日志记录结束
         */

        return

                save(c3mCharging);
        return save(c3mCharging);

    }