From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java | 58 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 16 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 e784c19..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
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.sandu.common.domain.CommonPage;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.ximon.admin.dto.ErrorMsgDto;
import com.sandu.ximon.dao.bo.C3ReportErrorBo;
@@ -30,12 +31,18 @@
private final C3ChargingService c3ChargingService;
- public List<ErrorMsgDto> listMsg(BaseConditionVO baseConditionVO) {
- List<ErrorMsgDto> errorMsgDtos = new ArrayList<>();
+ /**
+ * 鍗曠伅
+ *
+ * @param baseConditionVO
+ * @return
+ */
+ public CommonPage lightListMsg(BaseConditionVO baseConditionVO) {
+ List<ErrorMsgDto> errorMsgDtoList = new ArrayList<>();
//鍗曠伅鏁呴殰鏁版嵁
- 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());
@@ -43,38 +50,57 @@
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("绯荤粺鏈壘鍒拌澶囨暟鎹�");
}
- errorMsgDtos.add(errorMsgDto);
+ errorMsgDtoList.add(errorMsgDto);
}
}
+ commonPage.setList(errorMsgDtoList);
+ 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);
C3mCharging one = c3ChargingService.getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3ReportError.getC3Mac()));
if (one != null) {
errorMsgDto.setDeviceJson(JSON.toJSONString(one));
+ }else {
+ errorMsgDto.setDeviceJson("绯荤粺鏈壘鍒拌澶囨暟鎹�");
}
- errorMsgDtos.add(errorMsgDto);
+ errorMsgDtoList.add(errorMsgDto);
});
}
-
- //澶ф皵鏁呴殰鏁版嵁
-
- //瀵筫rrorMsgDtos鎸夊垱寤烘椂闂村�掑彊
- 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;
}
+ /**
+ * 澶ф皵
+ *
+ * @param baseConditionVO
+ * @return
+ */
+ public List<ErrorMsgDto> atmosphereListMsg(BaseConditionVO baseConditionVO) {
+ return new ArrayList<>();
+ }
}
--
Gitblit v1.9.3