fix

zhanzhiqin

2022-09-28 a0d2c6cd651c547fd07fb3639a23ca700d3b2091

fix

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

@@ -24,9 +24,16 @@
    private final ErrorMsgService errorMsgService;

    @AnonymousAccess
    @GetMapping("/listMsg")
    public ResponseVO<Object> list(BaseConditionVO conditionVO, @RequestParam(value = "type", required = false) String type) {
    @GetMapping("/lightListMsg")
    public ResponseVO<Object> lightListMsg(BaseConditionVO conditionVO) {

        return ResponseUtil.success(errorMsgService.listMsg(conditionVO, type));
        return ResponseUtil.success(errorMsgService.lightListMsg(conditionVO));
    }

    @AnonymousAccess
    @GetMapping("/C3ListMsg")
    public ResponseVO<Object> C3ListMsg(BaseConditionVO conditionVO) {

        return ResponseUtil.success(errorMsgService.C3ListMsg(conditionVO));
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java

@@ -34,15 +34,15 @@
    private final C3ChargingService c3ChargingService;


    public CommonPage listMsg(BaseConditionVO baseConditionVO, String type) {
        if (StringUtils.isEmpty(type)) {
            throw new BusinessException("设备故障类型不能为空！");
        }
        CommonPage commonPage = null;
        switch (type) {
            case "单灯故障":
    /**
     * 单灯
     *
     * @param baseConditionVO
     * @return
     */
    public CommonPage lightListMsg(BaseConditionVO baseConditionVO) {
                //单灯故障数据
                commonPage = lightReportErrorService.queryErrorCode(baseConditionVO);
        CommonPage commonPage = lightReportErrorService.queryErrorCode(baseConditionVO);
                if (!commonPage.getList().isEmpty()) {
                    for (LightReportErrorBo lightReportError : (List<LightReportErrorBo>) commonPage.getList()) {
                        ErrorMsgDto errorMsgDto = new ErrorMsgDto();
@@ -57,8 +57,17 @@
                        }
                    }
                }
                break;
            case "充电桩故障":
        return commonPage;
    }

    /**
     * 充电桩
     *
     * @param baseConditionVO
     * @return
     */
    public List<ErrorMsgDto> C3ListMsg(BaseConditionVO baseConditionVO) {
        List<ErrorMsgDto> errorMsgDtoList = new ArrayList<>();
                //充电桩故障数据
                List<C3ReportErrorBo> c3ReportErrorBos = c3mReportErrorService.listReportError(baseConditionVO);
                if (!c3ReportErrorBos.isEmpty()) {
@@ -73,19 +82,23 @@
                        if (one != null) {
                            errorMsgDto.setDeviceJson(JSON.toJSONString(one));
                        }
                errorMsgDtoList.add(errorMsgDto);
                    });
                    commonPage = new CommonPage();
                    commonPage.setList(c3ReportErrorBos);
                }

                break;
            case "大气故障":
                //大气故障数据  todo 暂无

                break;
            default:
                throw new BusinessException("类型不正确，请确认！");
        return errorMsgDtoList;
        }
//                break;
//            case "充电桩故障":

//
//                break;
//            case "大气故障":
//                //大气故障数据  todo 暂无
//
//                break;
//            default:
//                throw new BusinessException("类型不正确，请确认！");
//        }
//
//
//        //对errorMsgDtos按创建时间倒叙
@@ -93,8 +106,6 @@
//        //手动分页  baseConditionVO.getPageNo() 当前页 baseConditionVO.getPageSize() 每页条数
////        return errorMsgDtos.subList((baseConditionVO.getPageNo() - 1) * baseConditionVO.getPageSize(), baseConditionVO.getPageNo() * baseConditionVO.getPageSize());
//        ListPagingUtils.pages(errorMsgDtos, baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        return commonPage;
    }


}