Merge remote-tracking branch 'origin/master'

liuhaonan

2022-08-12 798400ebc4769a6afec56ebbf8198e87e6c1a683

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

@@ -1,11 +1,17 @@
package com.sandu.ximon.admin.controller;

import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
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;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.C3ChargingService;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

/**
@@ -19,16 +25,29 @@
@RequestMapping("/v1/admin/C3Charging")
public class C3ChargingController {
    private C3ChargingService c3ChargingService;
    private PermissionConfig permissionConfig;


    @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
            , @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.success(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam, order, seq));
    }

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

    /**
     * 充电结束
     * 充电结束——小程序用户结束，不需要token，需要openId
     */
    @PostMapping("/finishCharging")
    public ResponseVO<Object> finishCharging(@RequestBody C3ChargingParam c3ChargingParam) {
        String result = c3ChargingService.finishCharging(c3ChargingParam.getC3Mac());
        if (c3ChargingParam.getC3Mac() == null || c3ChargingParam.getOpenId() == null) {
            throw new BusinessException("参数错误！");
        }
        String result = c3ChargingService.finishCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getOpenId());

        if ("操作成功".equals(result)) {
            return ResponseUtil.success(result);
@@ -67,6 +89,21 @@
            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);
//        }
//    }

    /**
     * 查询版本
@@ -104,14 +141,89 @@
    @PostMapping("/QueryAddress")
    public ResponseVO<Object> QueryAddress(@RequestBody C3ChargingParam c3ChargingParam) {
        String result = c3ChargingService.QueryAddress(c3ChargingParam.getC3Mac());

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

    /**
     * 查询故障码
     */
    @PostMapping("/QueryFaultCode")
    public ResponseVO<Object> QueryFaultCode(@RequestBody C3ChargingParam c3ChargingParam) {
        String result = c3ChargingService.QueryFaultCode(c3ChargingParam.getC3Mac());
        return ResponseUtil.success(result);
    }

    /**
     * 读心跳包
     */
    @PostMapping("/ReadTheHeartbeatPackage")
    public ResponseVO<Object> ReadTheHeartbeatPackage(@RequestBody C3ChargingParam c3ChargingParam) {
        return ResponseUtil.success(c3ChargingService.ReadTheHeartbeatPackage(c3ChargingParam.getC3Mac()));
    }

    /**
     * 设置心跳包间隔时间(秒）-充电状态时
     */
    @PostMapping("/SetHeartbeatPacketTimeCharging")
    public ResponseVO<Object> SetHeartbeatPacketTimeCharging(@RequestBody @Validated C3ChargingParam c3ChargingParam) {

        return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getTime(), true));
    }

    /**
     * 设置心跳包间隔时间(秒）-非充电状态时
     */
    @PostMapping("/SetHeartbeatPacketTimeNotCharging")
    public ResponseVO<Object> SetHeartbeatPacketTimeNotCharging(@RequestBody @Validated C3ChargingParam c3ChargingParam) {

        return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getTime(), false));
    }

    /**
     * 设置电压/电流常数(各一字节)(默认值0xBC64)
     */
    @PostMapping("/SetConstant")
    public ResponseVO<Object> SetConstant(@RequestBody @Validated C3ChargingParam c3ChargingParam) {

        return ResponseUtil.success(c3ChargingService.SetConstant(c3ChargingParam.getC3Mac(), c3ChargingParam.getConstant()));
    }

    /**
     * 设置地址
     */
    @PostMapping("/SetAddress")
    public ResponseVO<Object> SetAddress(@RequestBody @Validated C3ChargingParam c3ChargingParam) {

        return ResponseUtil.success(c3ChargingService.SetAddress(c3ChargingParam.getC3Mac(), c3ChargingParam.getAddress()));
    }

    /**
     * 设置日历（同心跳包中的6字节日期时间）
     */
    @PostMapping("/SetCalendar")
    public ResponseVO<Object> SetCalendar(@RequestBody @Validated C3ChargingParam c3ChargingParam) {

        return ResponseUtil.success(c3ChargingService.SetCalendar(c3ChargingParam.getC3Mac()
                , c3ChargingParam.getYear(), c3ChargingParam.getMonth(), c3ChargingParam.getDay(), c3ChargingParam.getHour(), c3ChargingParam.getMin(), c3ChargingParam.getSec()));
    }

    /**
     * 故障码上报清除
     */
    @PostMapping("/ClearedFaultCode")
    public ResponseVO<Object> ClearedFaultCode(@RequestBody @Validated C3ChargingParam c3ChargingParam) {

        return ResponseUtil.success(c3ChargingService.ClearedFaultCode(c3ChargingParam.getC3Mac()));
    }

    /**
     * 恢复出厂值
     */
    @PostMapping("/RestoreFactoryValue")
    public ResponseVO<Object> RestoreFactoryValue(@RequestBody @Validated C3ChargingParam c3ChargingParam) {

        return ResponseUtil.success(c3ChargingService.RestoreFactoryValue(c3ChargingParam.getC3Mac()));
    }

    /**
     * 软重启
@@ -126,4 +238,36 @@
            return ResponseUtil.fail(result);
        }
    }

    /**
     * 添加充电桩硬件设备
     *
     * @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("/updateC3ChargingName")
    public ResponseVO<Object> updateC3ChargingName(@RequestBody C3ChargingAddParam c3ChargingAddParam) {
        boolean flag = c3ChargingService.updateC3ChargingName(c3ChargingAddParam);
        if (flag) {
            return ResponseUtil.success("修改充电桩硬件设备名称成功！");
        } else {
            return ResponseUtil.fail("修改充电桩硬件设备名称失败！");
        }
    }
}