From a0d2c6cd651c547fd07fb3639a23ca700d3b2091 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 28 九月 2022 17:03:39 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java | 62 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 15 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..8c557ae 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,12 +34,17 @@
private final C3ChargingService c3ChargingService;
- public List<ErrorMsgDto> listMsg(BaseConditionVO baseConditionVO) {
- List<ErrorMsgDto> errorMsgDtos = new ArrayList<>();
+ /**
+ * 鍗曠伅
+ *
+ * @param baseConditionVO
+ * @return
+ */
+ public CommonPage lightListMsg(BaseConditionVO baseConditionVO) {
//鍗曠伅鏁呴殰鏁版嵁
- 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());
@@ -46,14 +55,24 @@
if (one != null) {
errorMsgDto.setDeviceJson(JSON.toJSONString(one));
}
- errorMsgDtos.add(errorMsgDto);
}
}
+ 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.setErrorDesc(c3ReportError.getErrorMsg());
@@ -63,17 +82,30 @@
if (one != null) {
errorMsgDto.setDeviceJson(JSON.toJSONString(one));
}
- 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;
}
+// break;
+// case "鍏呯數妗╂晠闅�":
+
+//
+// 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());
+// ListPagingUtils.pages(errorMsgDtos, baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
}
--
Gitblit v1.9.3