2021与蓝度共同重构项目,服务端
zhanzhiqin
2022-03-18 54bcf9baf8af717dc9c6e28409592a38c348a619
C3充电桩
已修改3个文件
25 ■■■■■ 文件已修改
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3QueryReportInnerFrame.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
@@ -104,12 +104,7 @@
    @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);
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3QueryReportInnerFrame.java
@@ -26,6 +26,8 @@
    private String IntervalTime;
    //查询电压/电流常数
    private String constant;
    //查询地址(暂时不用到)
    private String address;
    @Override
    public A5C3QueryReportInnerFrame transformFrame(String hex) {
@@ -83,6 +85,16 @@
            }
            setConstant("电压常数:" + parseVal(hex, 0, 2) + " ;电流常数:" + parseVal(hex, 2, 4));
        }
        /**
         * 查询地址(暂时不用到)
         */
        if (functionCode.equals(C3ChargingEnum.QueryAddress.getCode())) {
            if (hex.length() != 4) {
                throw new BusinessException("数据错误,请重新请求!");
            }
            setAddress(hex);
        }
    }
    private Integer parseVal(String frame, int start, int end) {
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -234,10 +234,10 @@
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC("32313243305008ff0a04ffff", a5Frame);
        System.out.println(commonFrame + "            -----commonFrame");
        A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(commonFrame.getPayload());
        A5C3QueryReportInnerFrame queryReportInnerFrame = new A5C3QueryReportInnerFrame().transformFrame(commonFrame.getPayload());
        if (operationReportInnerFrame.isValidate()) {
            return operationReportInnerFrame.getState();
        if (queryReportInnerFrame.isValidate()) {
            return queryReportInnerFrame.getAddress();
        } else {
            throw new BusinessException("数据校验错误,请重新请求");
        }