From 4e76b9737e036c18e8a9e840dc443615ffcec348 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 20 十月 2022 12:20:18 +0800
Subject: [PATCH] 大气农耕
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mReportErrorService.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 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 419af4e..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,12 +1,21 @@
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;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3ErrorEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.LightErrorEnum;
+import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.dao.bo.C3ReportErrorBo;
+import com.sandu.ximon.dao.bo.LightReportErrorBo;
import com.sandu.ximon.dao.domain.C3mReportError;
import com.sandu.ximon.dao.mapper.C3mReportErrorMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* @author LiuHaoNan
@@ -24,17 +33,21 @@
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) {
+ 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());
+ }
+
+ return c3ReportErrorBos;
+ }
}
--
Gitblit v1.9.3