changes

liuhaonan

2022-10-25 350608105f300c6c629d743dc9896feca2f22e8d

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

@@ -3,16 +3,13 @@
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;
@@ -41,6 +38,7 @@
     * @return
     */
    public CommonPage lightListMsg(BaseConditionVO baseConditionVO) {
        List<ErrorMsgDto> errorMsgDtoList = new ArrayList<>();
        //单灯故障数据
        CommonPage commonPage = lightReportErrorService.queryErrorCode(baseConditionVO);
        if (!commonPage.getList().isEmpty()) {
@@ -52,11 +50,16 @@
                errorMsgDto.setErrorTime(lightReportError.getCreateTime());
                errorMsgDto.setDeviceType(1);
                Light one = lightService.getOne(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, lightReportError.getDeviceCode()));
                System.out.println(lightReportError.getDeviceCode() + " ---code ");
                if (one != null) {
                    errorMsgDto.setDeviceJson(JSON.toJSONString(one));
                } else {
                    errorMsgDto.setDeviceJson("系统未找到设备数据");
                }
                errorMsgDtoList.add(errorMsgDto);
            }
        }
        commonPage.setList(errorMsgDtoList);
        return commonPage;
    }

@@ -81,31 +84,23 @@
                C3mCharging one = c3ChargingService.getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3ReportError.getC3Mac()));
                if (one != null) {
                    errorMsgDto.setDeviceJson(JSON.toJSONString(one));
                }else {
                    errorMsgDto.setDeviceJson("系统未找到设备数据");
                }
                errorMsgDtoList.add(errorMsgDto);
            });
        }
        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<>();
    }

}