From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java
index 050165f..f124b6f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java
+++ b/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
*/
--
Gitblit v1.9.3