From a36535db12500082c443ef86a0c53bc039f5b615 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 26 九月 2022 18:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java | 3 +--
1 files changed, 1 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 e784c19..3f01ba0 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
@@ -56,7 +56,6 @@
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);
@@ -68,7 +67,7 @@
});
}
- //澶ф皵鏁呴殰鏁版嵁
+ //澶ф皵鏁呴殰鏁版嵁 todo 鏆傛棤
//瀵筫rrorMsgDtos鎸夊垱寤烘椂闂村�掑彊
errorMsgDtos.sort((a, b) -> b.getErrorTime().compareTo(a.getErrorTime()));
--
Gitblit v1.9.3