fix

zhanzhiqin

2022-09-28 f1a8f55f73c79a457bdfdcb799df63fbd8eaa3cd

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

@@ -41,6 +41,7 @@
     * @return
     */
    public CommonPage lightListMsg(BaseConditionVO baseConditionVO) {
        List<ErrorMsgDto> errorMsgDtoList = new ArrayList<>();
        //单灯故障数据
        CommonPage commonPage = lightReportErrorService.queryErrorCode(baseConditionVO);
        if (!commonPage.getList().isEmpty()) {
@@ -54,9 +55,11 @@
                Light one = lightService.getOne(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, lightReportError.getDeviceCode()));
                if (one != null) {
                    errorMsgDto.setDeviceJson(JSON.toJSONString(one));
                    errorMsgDtoList.add(errorMsgDto);
                }
            }
        }
        commonPage.setList(errorMsgDtoList);
        return commonPage;
    }

@@ -87,25 +90,14 @@
        }
        return errorMsgDtoList;
    }
//                break;
//            case "充电桩故障":

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

    /**
     * 大气
     * @param baseConditionVO
     * @return
     */
    public List<ErrorMsgDto> atmosphereListMsg(BaseConditionVO baseConditionVO) {
        return new ArrayList<>();
    }

}