From 0a86cfc623812431f41bc0255e9e6e7730e60df0 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 28 九月 2022 16:54:39 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java | 101 ++++++++++++++++++++++++++++++--------------------
1 files changed, 61 insertions(+), 40 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 d088869..f138605 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,13 +2,17 @@
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;
@@ -30,49 +34,66 @@
private final C3ChargingService c3ChargingService;
- public List<ErrorMsgDto> listMsg(BaseConditionVO baseConditionVO) {
- List<ErrorMsgDto> errorMsgDtos = new ArrayList<>();
- //鍗曠伅鏁呴殰鏁版嵁
- List<LightReportErrorBo> lightReportErrors = lightReportErrorService.queryErrorCode(baseConditionVO);
- if (!lightReportErrors.isEmpty()) {
- for (LightReportErrorBo lightReportError : lightReportErrors) {
- ErrorMsgDto errorMsgDto = new ErrorMsgDto();
- errorMsgDto.setMac(lightReportError.getDeviceCode());
- errorMsgDto.setErrorCode(lightReportError.getErrorCode());
- errorMsgDto.setErrorDesc(lightReportError.getErrorMsg());
- errorMsgDto.setErrorTime(lightReportError.getCreateTime());
- errorMsgDto.setDeviceType(1);
- Light one = lightService.getOne(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, lightReportError.getDeviceCode()));
- if (one != null) {
- errorMsgDto.setDeviceJson(JSON.toJSONString(one));
- }
- errorMsgDtos.add(errorMsgDto);
- }
+ public CommonPage listMsg(BaseConditionVO baseConditionVO, String type) {
+ if (StringUtils.isEmpty(type)) {
+ throw new BusinessException("璁惧鏁呴殰绫诲瀷涓嶈兘涓虹┖锛�");
}
-
- //鍏呯數妗╂晠闅滄暟鎹�
- List<C3ReportErrorBo> c3ReportErrorBos = c3mReportErrorService.listReportError(baseConditionVO);
- if (!c3ReportErrorBos.isEmpty()) {
- c3ReportErrorBos.forEach(c3ReportError -> {
- ErrorMsgDto errorMsgDto = new ErrorMsgDto();
- errorMsgDto.setMac(c3ReportError.getC3Mac());
- 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));
+ CommonPage commonPage = null;
+ switch (type) {
+ case "鍗曠伅鏁呴殰":
+ //鍗曠伅鏁呴殰鏁版嵁
+ 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());
+ errorMsgDto.setErrorDesc(lightReportError.getErrorMsg());
+ errorMsgDto.setErrorTime(lightReportError.getCreateTime());
+ errorMsgDto.setDeviceType(1);
+ Light one = lightService.getOne(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, lightReportError.getDeviceCode()));
+ if (one != null) {
+ errorMsgDto.setDeviceJson(JSON.toJSONString(one));
+ }
+ }
}
- errorMsgDtos.add(errorMsgDto);
- });
+ break;
+ case "鍏呯數妗╂晠闅�":
+ //鍏呯數妗╂晠闅滄暟鎹�
+ List<C3ReportErrorBo> c3ReportErrorBos = c3mReportErrorService.listReportError(baseConditionVO);
+ if (!c3ReportErrorBos.isEmpty()) {
+ List<C3ReportErrorBo> list = c3ReportErrorBos;
+ list.forEach(c3ReportError -> {
+ ErrorMsgDto errorMsgDto = new ErrorMsgDto();
+ errorMsgDto.setMac(c3ReportError.getC3Mac());
+ 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));
+ }
+ });
+ commonPage = new CommonPage();
+ commonPage.setList(c3ReportErrorBos);
+ }
+
+ break;
+ case "澶ф皵鏁呴殰":
+ //澶ф皵鏁呴殰鏁版嵁 todo 鏆傛棤
+
+ break;
+ default:
+ throw new BusinessException("绫诲瀷涓嶆纭紝璇风‘璁わ紒");
}
-
- //澶ф皵鏁呴殰鏁版嵁
-
- //瀵筫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());
+//
+//
+// //瀵筫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());
+// ListPagingUtils.pages(errorMsgDtos, baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ return commonPage;
}
--
Gitblit v1.9.3