From f1a8f55f73c79a457bdfdcb799df63fbd8eaa3cd Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 28 九月 2022 17:31:22 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 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 8c557ae..050165f 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
@@ -41,6 +41,7 @@
* @return
*/
public CommonPage lightListMsg(BaseConditionVO baseConditionVO) {
+ List<ErrorMsgDto> errorMsgDtoList = new ArrayList<>();
//鍗曠伅鏁呴殰鏁版嵁
CommonPage commonPage = lightReportErrorService.queryErrorCode(baseConditionVO);
if (!commonPage.getList().isEmpty()) {
@@ -54,9 +55,11 @@
Light one = lightService.getOne(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, lightReportError.getDeviceCode()));
if (one != null) {
errorMsgDto.setDeviceJson(JSON.toJSONString(one));
+ errorMsgDtoList.add(errorMsgDto);
}
}
}
+ commonPage.setList(errorMsgDtoList);
return commonPage;
}
@@ -87,25 +90,14 @@
}
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());
-
+ /**
+ * 澶ф皵
+ * @param baseConditionVO
+ * @return
+ */
+ public List<ErrorMsgDto> atmosphereListMsg(BaseConditionVO baseConditionVO) {
+ return new ArrayList<>();
+ }
}
--
Gitblit v1.9.3