changes

liuhaonan

2022-10-25 dda268997ca8f8a364f7c19b45d7a43a50a98efe

 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;
@@ -53,10 +50,13 @@
                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));
                    errorMsgDtoList.add(errorMsgDto);
                } else {
                    errorMsgDto.setDeviceJson("系统未找到设备数据");
                }
                errorMsgDtoList.add(errorMsgDto);
            }
        }
        commonPage.setList(errorMsgDtoList);
@@ -84,6 +84,8 @@
                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);
            });
@@ -93,6 +95,7 @@

    /**
     * 大气
     *
     * @param baseConditionVO
     * @return
     */