Merge remote-tracking branch 'origin/master'

liuhaonan

2022-06-30 ae2e17d478f444a5c9c054dc13b83a0dbdd750bd

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

@@ -2,6 +2,7 @@

import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.C3ChargingAddParam;
import com.sandu.ximon.admin.param.C3ChargingParam;
@@ -34,24 +35,25 @@
        return ResponseUtil.successPage(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
    }

    @AnonymousAccess
    @GetMapping("/chargingInfo")
    public ResponseVO<Object> getChargingInfo(@RequestParam(required = false, value = "poleId") String poleId) {
        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);
        }

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

    /**
     * 充电结束
@@ -81,20 +83,20 @@
        }
    }

    /**
     * 二维码
     */
    @PostMapping("/QrCode")
    public ResponseVO<Object> QrCode(@RequestBody C3ChargingParam c3ChargingParam) {
        //String testUrl = "http://www.ximonsmart.com/charge/#/charge/" +streetlightId+"/"+System.currentTimeMillis();
        String result = c3ChargingService.QrCode(c3ChargingParam.getC3Mac(), c3ChargingParam.getQrCodeData());

        if ("操作成功".equals(result)) {
            return ResponseUtil.success(result);
        } else {
            return ResponseUtil.fail(result);
        }
    }
//    /**
//     * 二维码
//     */
//    @PostMapping("/QrCode")
//    public ResponseVO<Object> QrCode(@RequestBody C3ChargingParam c3ChargingParam) {
//        //String testUrl = "http://www.ximonsmart.com/charge/#/charge/" +streetlightId+"/"+System.currentTimeMillis();
//        String result = c3ChargingService.QrCode(c3ChargingParam.getC3Mac(), c3ChargingParam.getQrCodeData());
//
//        if ("操作成功".equals(result)) {
//            return ResponseUtil.success(result);
//        } else {
//            return ResponseUtil.fail(result);
//        }
//    }

    /**
     * 查询版本