Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-01 f3a5d0eaa481c6f565e54bde2f1690aa94cec580

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

@@ -23,9 +23,9 @@
    private C3ChargingService c3ChargingService;


    @GetMapping("/C3ChargingList")
    public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO) {
        return ResponseUtil.successPage(c3ChargingService.getC3ChargingList(baseConditionVO));
    @PostMapping("/C3ChargingList")
    public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO, @RequestBody(required = false) C3ChargingParam c3ChargingParam) {
        return ResponseUtil.successPage(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
    }

    /**
@@ -71,6 +71,20 @@
    }

    /**
     * 二维码
     */
    @PostMapping("/QrCode")
    public ResponseVO<Object> QrCode(@RequestBody C3ChargingParam c3ChargingParam) {
        String result = c3ChargingService.QrCode(c3ChargingParam.getC3Mac(), c3ChargingParam.getQrCodeData());

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

    /**
     * 查询版本
     */
    @PostMapping("/QueryVersion")