fix

zhanzhiqin

2022-09-28 a0d2c6cd651c547fd07fb3639a23ca700d3b2091

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

@@ -2,13 +2,17 @@

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.domain.CommonPage;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.ximon.admin.dto.ErrorMsgDto;
import com.sandu.ximon.admin.utils.ListPagingUtils;
import com.sandu.ximon.dao.bo.C3ReportErrorBo;
import com.sandu.ximon.dao.bo.LightReportErrorBo;
import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.Light;
import lombok.AllArgsConstructor;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
@@ -30,12 +34,17 @@
    private final C3ChargingService c3ChargingService;


    public List<ErrorMsgDto> listMsg(BaseConditionVO baseConditionVO) {
        List<ErrorMsgDto> errorMsgDtos = new ArrayList<>();
    /**
     * 单灯
     *
     * @param baseConditionVO
     * @return
     */
    public CommonPage lightListMsg(BaseConditionVO baseConditionVO) {
        //单灯故障数据
        List<LightReportErrorBo> lightReportErrors = lightReportErrorService.queryErrorCode(baseConditionVO);
        if (!lightReportErrors.isEmpty()) {
            for (LightReportErrorBo lightReportError : lightReportErrors) {
        CommonPage commonPage = lightReportErrorService.queryErrorCode(baseConditionVO);
        if (!commonPage.getList().isEmpty()) {
            for (LightReportErrorBo lightReportError : (List<LightReportErrorBo>) commonPage.getList()) {
                ErrorMsgDto errorMsgDto = new ErrorMsgDto();
                errorMsgDto.setMac(lightReportError.getDeviceCode());
                errorMsgDto.setErrorCode(lightReportError.getErrorCode());
@@ -46,17 +55,26 @@
                if (one != null) {
                    errorMsgDto.setDeviceJson(JSON.toJSONString(one));
                }
                errorMsgDtos.add(errorMsgDto);
            }
        }
        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()) {
            c3ReportErrorBos.forEach(c3ReportError -> {
            List<C3ReportErrorBo> list = c3ReportErrorBos;
            list.forEach(c3ReportError -> {
                ErrorMsgDto errorMsgDto = new ErrorMsgDto();
                errorMsgDto.setMac(c3ReportError.getC3Mac());
                errorMsgDto.setErrorCode(c3ReportError.getErrorCode());
                errorMsgDto.setErrorDesc(c3ReportError.getErrorMsg());
                errorMsgDto.setErrorTime(c3ReportError.getCreateTime());
                errorMsgDto.setDeviceType(3);
@@ -64,17 +82,30 @@
                if (one != null) {
                    errorMsgDto.setDeviceJson(JSON.toJSONString(one));
                }
                errorMsgDtos.add(errorMsgDto);
                errorMsgDtoList.add(errorMsgDto);
            });
        }

        //大气故障数据  todo 暂无

        //对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());
        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());


}