Merge remote-tracking branch 'origin/master'

liuhaonan

2022-08-12 798400ebc4769a6afec56ebbf8198e87e6c1a683

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

@@ -29,11 +29,13 @@


    @PostMapping("/C3ChargingList")
    public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO, @RequestBody(required = false) C3ChargingParam c3ChargingParam) {
    public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO, @RequestBody(required = false) C3ChargingParam c3ChargingParam
            , @RequestParam(value = "order", required = false) Integer order
            ,@RequestParam(value = "seq", required = false) Integer seq) {
        if (!permissionConfig.check(MenuEnum.C3_CHARGING_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.successPage(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
        return ResponseUtil.success(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam, order, seq));
    }

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

//    /**
//     * 充电开启
//     */
//    @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