From 8901dfad20797c5696abf51995c41f3f5e3352ca Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 28 七月 2022 11:31:46 +0800
Subject: [PATCH] 优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 2d25ffd..e784c19 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
@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.ximon.admin.dto.ErrorMsgDto;
+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.springframework.stereotype.Service;
@@ -23,8 +25,9 @@
private final LightReportErrorService lightReportErrorService;
- private final C3mReportErrorService c3mReportErrorService;
private final LightService lightService;
+ private final C3mReportErrorService c3mReportErrorService;
+ private final C3ChargingService c3ChargingService;
public List<ErrorMsgDto> listMsg(BaseConditionVO baseConditionVO) {
@@ -38,7 +41,7 @@
errorMsgDto.setErrorCode(lightReportError.getErrorCode());
errorMsgDto.setErrorDesc(lightReportError.getErrorMsg());
errorMsgDto.setErrorTime(lightReportError.getCreateTime());
- errorMsgDto.setDeviceType(0);
+ errorMsgDto.setDeviceType(1);
Light one = lightService.getOne(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, lightReportError.getDeviceCode()));
if (one != null) {
errorMsgDto.setDeviceJson(JSON.toJSONString(one));
@@ -48,7 +51,24 @@
}
//鍏呯數妗╂晠闅滄暟鎹�
+ List<C3ReportErrorBo> c3ReportErrorBos = c3mReportErrorService.listReportError(baseConditionVO);
+ if (!c3ReportErrorBos.isEmpty()) {
+ c3ReportErrorBos.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);
+ C3mCharging one = c3ChargingService.getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3ReportError.getC3Mac()));
+ if (one != null) {
+ errorMsgDto.setDeviceJson(JSON.toJSONString(one));
+ }
+ errorMsgDtos.add(errorMsgDto);
+ });
+ }
+ //澶ф皵鏁呴殰鏁版嵁
//瀵筫rrorMsgDtos鎸夊垱寤烘椂闂村�掑彊
errorMsgDtos.sort((a, b) -> b.getErrorTime().compareTo(a.getErrorTime()));
--
Gitblit v1.9.3