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/C3mReportErrorService.java | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mReportErrorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mReportErrorService.java
index 34c2f0a..22d333e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mReportErrorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mReportErrorService.java
@@ -1,6 +1,7 @@
package com.sandu.ximon.admin.service;
import com.github.pagehelper.PageHelper;
+import com.sandu.common.domain.CommonPage;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3ErrorCodeReportInnerFrame;
@@ -32,27 +33,18 @@
public void saveReportError(A5C3ErrorCodeReportInnerFrame codeRespInnerFrame) {
C3mReportError c3MReportError = new C3mReportError();
c3MReportError.setC3Mac(codeRespInnerFrame.getDestinationAddress());
- c3MReportError.setErrorCode(codeRespInnerFrame.getErrorCode());
-
- StringBuilder sb = new StringBuilder();
- Integer errorCode = codeRespInnerFrame.getErrorCode();
- C3ErrorEnum[] values = C3ErrorEnum.values();
- for (C3ErrorEnum value : values) {
- if ((value.getCode() & errorCode) > 0) {
- sb.append(value.getMessage());
- }
- }
- c3MReportError.setErrorMsg(sb.toString());
+ c3MReportError.setErrorMsg(codeRespInnerFrame.getErrorMessage());
save(c3MReportError);
}
public List<C3ReportErrorBo> listReportError(BaseConditionVO baseConditionVO) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
List<C3ReportErrorBo> c3ReportErrorBos;
//涓簄ull鐨勮瘽鏄秴绠�
if (SecurityUtils.getClientId() == null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
c3ReportErrorBos = baseMapper.listReportError(null);
} else {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
c3ReportErrorBos = baseMapper.listReportError(SecurityUtils.getUserId());
}
--
Gitblit v1.9.3