changes

liuhaonan

2022-10-25 dda268997ca8f8a364f7c19b45d7a43a50a98efe

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

@@ -44,20 +44,20 @@
        return ResponseUtil.success(c3ChargingService.getChargingInfo(poleId));
    }

    /**
     * 充电开启
     */
    @AnonymousAccess
    @PostMapping("/startCharging")
    public ResponseVO<Object> startCharging(@RequestBody C3ChargingParam c3ChargingParam) {
        String result = c3ChargingService.startCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getChargingCapacity(), c3ChargingParam.getChargeAmount());
        if ("操作成功".equals(result)) {
            return ResponseUtil.success(result);
        } else {
            return ResponseUtil.fail(result);
        }

    }
//    /**
//     * 充电开启
//     */
//    @AnonymousAccess
//    @PostMapping("/startCharging")
//    public ResponseVO<Object> startCharging(@RequestBody C3ChargingParam c3ChargingParam) {
//        String result = c3ChargingService.startCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getChargingCapacity(), c3ChargingParam.getChargeAmount());
//        if ("操作成功".equals(result)) {
//            return ResponseUtil.success(result);
//        } else {
//            return ResponseUtil.fail(result);
//        }
//
//    }

    /**
     * 充电结束——小程序用户结束，不需要token，需要openId
@@ -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());

        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,11 @@
     */
    @PostMapping("/QueryVersion")
    public ResponseVO<Object> QueryVersion(@RequestBody C3ChargingParam c3ChargingParam) {
        String result = c3ChargingService.QueryVersion(c3ChargingParam.getC3Mac());
        if (!permissionConfig.check(MenuEnum.C3_CHARGING_QUERYVERSION.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }

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

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

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

        return ResponseUtil.success(result);
    }
@@ -141,7 +151,10 @@
     */
    @PostMapping("/QueryAddress")
    public ResponseVO<Object> QueryAddress(@RequestBody C3ChargingParam c3ChargingParam) {
        String result = c3ChargingService.QueryAddress(c3ChargingParam.getC3Mac());
        if (!permissionConfig.check(MenuEnum.C3_CHARGING_QUERYADDRESS.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        String result = c3ChargingService.QueryAddress(c3ChargingParam.getC3Id());
        return ResponseUtil.success(result);
    }

@@ -150,7 +163,10 @@
     */
    @PostMapping("/QueryFaultCode")
    public ResponseVO<Object> QueryFaultCode(@RequestBody C3ChargingParam c3ChargingParam) {
        String result = c3ChargingService.QueryFaultCode(c3ChargingParam.getC3Mac());
        if (!permissionConfig.check(MenuEnum.C3_CHARGING_QUERYFAULTCODE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        String result = c3ChargingService.QueryFaultCode(c3ChargingParam.getC3Id());
        return ResponseUtil.success(result);
    }

@@ -159,7 +175,10 @@
     */
    @PostMapping("/ReadTheHeartbeatPackage")
    public ResponseVO<Object> ReadTheHeartbeatPackage(@RequestBody C3ChargingParam c3ChargingParam) {
        return ResponseUtil.success(c3ChargingService.ReadTheHeartbeatPackage(c3ChargingParam.getC3Mac()));
        if (!permissionConfig.check(MenuEnum.C3_CHARGING_READTHEHEARTBEATPACKAGE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(c3ChargingService.ReadTheHeartbeatPackage(c3ChargingParam.getC3Id(), false));
    }

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

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

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

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

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

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

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

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

    /**
@@ -203,9 +230,13 @@
     */
    @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.getC3Mac()
                , c3ChargingParam.getYear(), c3ChargingParam.getMonth(), c3ChargingParam.getDay(), c3ChargingParam.getHour(), c3ChargingParam.getMin(), c3ChargingParam.getSec()));
        return ResponseUtil.success(c3ChargingService.SetCalendar(c3ChargingParam.getC3Id()
                , c3ChargingParam.getYear(), c3ChargingParam.getMonth(), c3ChargingParam.getDay()
                , c3ChargingParam.getHour(), c3ChargingParam.getMin(), c3ChargingParam.getSec(), false));
    }

    /**
@@ -213,8 +244,10 @@
     */
    @PostMapping("/ClearedFaultCode")
    public ResponseVO<Object> ClearedFaultCode(@RequestBody @Validated C3ChargingParam c3ChargingParam) {

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

    /**
@@ -222,8 +255,10 @@
     */
    @PostMapping("/RestoreFactoryValue")
    public ResponseVO<Object> RestoreFactoryValue(@RequestBody @Validated C3ChargingParam c3ChargingParam) {

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

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

        if ("操作成功".equals(result)) {
            return ResponseUtil.success(result);
@@ -240,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("添加充电桩硬件设备失败！");
//        }
//    }

    /**
     * 修改充电桩硬件设备名称
@@ -264,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("修改充电桩硬件设备名称成功！");